[openssl-commits] [openssl] OpenSSL_1_1_1-stable update

[yang.yang at baishancloud.com]

The branch OpenSSL_1_1_1-stable has been updated
       via  3ccccb91ae1c07a4310778b3d7ba74ff4ff787f0 (commit)
      from  e587e8e36a0279674882f4b8bdba81ed1b10e1a6 (commit)


- Log -----------------------------------------------------------------
commit 3ccccb91ae1c07a4310778b3d7ba74ff4ff787f0
Author: Paul Yang <yang.yang at baishancloud.com>
Date:   Wed Nov 21 13:16:27 2018 +0800

    Fix wrong return value in ssl3_ctx_ctrl
    
    This fixes issue #7677
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/7678)

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

Summary of changes:
 ssl/s3_lib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 866ca4d..99ae481 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -3781,7 +3781,7 @@ long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
                                   EVP_PKEY_security_bits(pkdh), 0, pkdh)) {
                 SSLerr(SSL_F_SSL3_CTX_CTRL, SSL_R_DH_KEY_TOO_SMALL);
                 EVP_PKEY_free(pkdh);
-                return 1;
+                return 0;
             }
             EVP_PKEY_free(ctx->cert->dh_tmp);
             ctx->cert->dh_tmp = pkdh;