diff options
author | jsing <> | 2017-08-09 14:58:11 +0000 |
---|---|---|
committer | jsing <> | 2017-08-09 14:58:11 +0000 |
commit | 97327c8a4345fa3619bf86e6029a3fb3bf095174 (patch) | |
tree | 5e67a1e109cef2c60edcaaa2a2facef7e3d22a6a /src/lib | |
parent | 26d59fa67d3fdc2efc57cc6bb4b7fc3e870462e0 (diff) | |
download | openbsd-97327c8a4345fa3619bf86e6029a3fb3bf095174.tar.gz openbsd-97327c8a4345fa3619bf86e6029a3fb3bf095174.tar.bz2 openbsd-97327c8a4345fa3619bf86e6029a3fb3bf095174.zip |
Fix conditionals for DH controls.
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/libssl/s3_lib.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c index 6486b468c9..654ef6a274 100644 --- a/src/lib/libssl/s3_lib.c +++ b/src/lib/libssl/s3_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: s3_lib.c,v 1.145 2017/07/15 17:40:53 jsing Exp $ */ | 1 | /* $OpenBSD: s3_lib.c,v 1.146 2017/08/09 14:58:11 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -1778,7 +1778,7 @@ ssl3_ctrl(SSL *s, int cmd, long larg, void *parg) | |||
1778 | { | 1778 | { |
1779 | int ret = 0; | 1779 | int ret = 0; |
1780 | 1780 | ||
1781 | if (cmd == SSL_CTRL_SET_TMP_DH || cmd == SSL_CTRL_SET_TMP_DH_CB) { | 1781 | if (cmd == SSL_CTRL_SET_TMP_DH || cmd == SSL_CTRL_SET_TMP_ECDH) { |
1782 | if (!ssl_cert_inst(&s->cert)) { | 1782 | if (!ssl_cert_inst(&s->cert)) { |
1783 | SSLerror(s, ERR_R_MALLOC_FAILURE); | 1783 | SSLerror(s, ERR_R_MALLOC_FAILURE); |
1784 | return (0); | 1784 | return (0); |
@@ -1981,7 +1981,7 @@ ssl3_callback_ctrl(SSL *s, int cmd, void (*fp)(void)) | |||
1981 | { | 1981 | { |
1982 | int ret = 0; | 1982 | int ret = 0; |
1983 | 1983 | ||
1984 | if (cmd == SSL_CTRL_SET_TMP_DH_CB) { | 1984 | if (cmd == SSL_CTRL_SET_TMP_DH_CB || cmd == SSL_CTRL_SET_TMP_ECDH_CB) { |
1985 | if (!ssl_cert_inst(&s->cert)) { | 1985 | if (!ssl_cert_inst(&s->cert)) { |
1986 | SSLerror(s, ERR_R_MALLOC_FAILURE); | 1986 | SSLerror(s, ERR_R_MALLOC_FAILURE); |
1987 | return (0); | 1987 | return (0); |