mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-01-18 13:44:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix DH key generation.

Browse Source 
Contributed by: Anonymous <nobody@replay.com>
This commit is contained in:
Ben Laurie 1999-01-07 00:37:01 +00:00
parent c13d4799dd
commit 6fa89f94c4
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@ -5,6 +5,10 @@
Changes between 0.9.1c and 0.9.2 Changes between 0.9.1c and 0.9.2
*) If a DH key is generated in s3_srvr.c, don't blow it by trying to use
NULL pointers.
[Anonymous <nobody@replay.com>]
*) s_server should send the CAfile as acceptable CAs, not its own cert. *) s_server should send the CAfile as acceptable CAs, not its own cert.
[Bodo Moeller <3moeller@informatik.uni-hamburg.de>] [Bodo Moeller <3moeller@informatik.uni-hamburg.de>]

13
ssl/s3_srvr.c
View File

@ -953,14 +953,17 @@ SSL *s;
} }
s->s3->tmp.dh=dh; s->s3->tmp.dh=dh;
if (((dhp->pub_key == NULL) || if ((dhp->pub_key == NULL ||
(dhp->priv_key == NULL) || dhp->priv_key == NULL ||
(s->options & SSL_OP_SINGLE_DH_USE)) && (s->options & SSL_OP_SINGLE_DH_USE)))
(!DH_generate_key(dh)))
{ {
SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_R_DH_LIB); if(!DH_generate_key(dh))
{
SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,
ERR_R_DH_LIB);
goto err; goto err;
} }
}
else else
{ {
dh->pub_key=BN_dup(dhp->pub_key); dh->pub_key=BN_dup(dhp->pub_key);