Commit 6fa89f94 authored by Ben Laurie's avatar Ben Laurie
Browse files

Fix DH key generation. 

Contributed by: Anonymous <nobody@replay.com>
parent c13d4799

CHANGES

+4 −0
Original line number Diff line number Diff line
@@ -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>]

ssl/s3_srvr.c

+9 −6
Original line number Diff line number Diff line
@@ -953,14 +953,17 @@ 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);

				if(!DH_generate_key(dh))

				    {

				    SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,

					   ERR_R_DH_LIB);

				    goto err;

				    }

				}

			else

				{

				dh->pub_key=BN_dup(dhp->pub_key);