projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e587e8e
)
Fix wrong return value in ssl3_ctx_ctrl
author
Paul Yang
<yang.yang@baishancloud.com>
Wed, 21 Nov 2018 05:16:27 +0000
(13:16 +0800)
committer
Paul Yang
<yang.yang@baishancloud.com>
Wed, 21 Nov 2018 17:05:43 +0000
(
01:05
+0800)
This fixes issue #7677
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7678)
ssl/s3_lib.c
patch
|
blob
|
history
diff --git
a/ssl/s3_lib.c
b/ssl/s3_lib.c
index 866ca4dfa9b0672d5fd07e7278e1993fce63a6bc..99ae48199c2d32eb91255a76e6b9b9cbc53c325c 100644
(file)
--- 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;