diff options
| author | Bob Beck <beck@cvs.openbsd.org> | 2016-01-27 02:06:17 +0000 |
|---|---|---|
| committer | Bob Beck <beck@cvs.openbsd.org> | 2016-01-27 02:06:17 +0000 |
| commit | 16439e6af7c0d48df527267ffab8953f9311a570 (patch) | |
| tree | da9462607a6e8f9219874aac1f871e4159b694c6 /lib/libssl/s3_lib.c | |
| parent | 51ba3d277d2aaf6c936db2ad0155291df06e0d4e (diff) | |
deprecate SSL_OP_SINGLE_DH_USE
ok jsing@
Diffstat (limited to 'lib/libssl/s3_lib.c')
| -rw-r--r-- | lib/libssl/s3_lib.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/lib/libssl/s3_lib.c b/lib/libssl/s3_lib.c index ce383bb209f..e7f71d6b6f4 100644 --- a/lib/libssl/s3_lib.c +++ b/lib/libssl/s3_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s3_lib.c,v 1.106 2015/09/12 16:10:07 doug Exp $ */ +/* $OpenBSD: s3_lib.c,v 1.107 2016/01/27 02:06:16 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -2141,14 +2141,6 @@ ssl3_ctrl(SSL *s, int cmd, long larg, void *parg) ERR_R_DH_LIB); return (ret); } - if (!(s->options & SSL_OP_SINGLE_DH_USE)) { - if (!DH_generate_key(dh)) { - DH_free(dh); - SSLerr(SSL_F_SSL3_CTRL, - ERR_R_DH_LIB); - return (ret); - } - } DH_free(s->cert->dh_tmp); s->cert->dh_tmp = dh; ret = 1; @@ -2332,14 +2324,6 @@ ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg) ERR_R_DH_LIB); return 0; } - if (!(ctx->options & SSL_OP_SINGLE_DH_USE)) { - if (!DH_generate_key(new)) { - SSLerr(SSL_F_SSL3_CTX_CTRL, - ERR_R_DH_LIB); - DH_free(new); - return 0; - } - } DH_free(cert->dh_tmp); cert->dh_tmp = new; return 1; |