mirror of
https://github.com/openssl/openssl.git
synced 2025-01-12 13:36:28 +08:00
Fix DH key generation.
Contributed by: Anonymous <nobody@replay.com>
This commit is contained in:
parent
c13d4799dd
commit
6fa89f94c4
4
CHANGES
4
CHANGES
@ -5,6 +5,10 @@
|
||||
|
||||
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.
|
||||
[Bodo Moeller <3moeller@informatik.uni-hamburg.de>]
|
||||
|
||||
|
@ -953,13 +953,16 @@ SSL *s;
|
||||
}
|
||||
|
||||
s->s3->tmp.dh=dh;
|
||||
if (((dhp->pub_key == NULL) ||
|
||||
(dhp->priv_key == NULL) ||
|
||||
(s->options & SSL_OP_SINGLE_DH_USE)) &&
|
||||
(!DH_generate_key(dh)))
|
||||
if ((dhp->pub_key == NULL ||
|
||||
dhp->priv_key == NULL ||
|
||||
(s->options & SSL_OP_SINGLE_DH_USE)))
|
||||
{
|
||||
SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_R_DH_LIB);
|
||||
goto err;
|
||||
if(!DH_generate_key(dh))
|
||||
{
|
||||
SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,
|
||||
ERR_R_DH_LIB);
|
||||
goto err;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user