[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  47eaa32d2671c1b608200afb97cc2f0040053686 (commit)
      from  adf652436a42a5132e708f8003b7621647f0a404 (commit)


- Log -----------------------------------------------------------------
commit 47eaa32d2671c1b608200afb97cc2f0040053686
Author: Todd Short <tshort at akamai.com>
Date:   Fri May 18 14:54:01 2018 -0400

    Fix no-sm2 with clang
    
    Return immediately upon discovery of bad message digest.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6298)

-----------------------------------------------------------------------

Summary of changes:
 crypto/ec/ec_pmeth.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/ec/ec_pmeth.c b/crypto/ec/ec_pmeth.c
index 5be2923..2fde4f7 100644
--- a/crypto/ec/ec_pmeth.c
+++ b/crypto/ec/ec_pmeth.c
@@ -124,7 +124,7 @@ static int pkey_ec_sign(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
 
     if (ec_nid == NID_sm2) {
 #if defined(OPENSSL_NO_SM2)
-        ret = -1;
+        return -1;
 #else
         ret = SM2_sign(type, tbs, tbslen, sig, &sltmp, ec);
 #endif