Commit 904de6e4 authored by Bodo Möller's avatar Bodo Möller
Browse files

Bugfix: larger message size in ssl3_get_key_exchange() because 

ServerKeyExchange message may be skipped.

Submitted by:  Petr Lampa <lampa@fee.vutbr.cz>
parent 65ce21da

CHANGES

+6 −0
Original line number Diff line number Diff line
@@ -4,6 +4,12 @@ 


 Changes between 0.9.6b and 0.9.6c  [XX xxx XXXX]



  *) In ssl3_get_key_exchange (ssl/s3_clnt.c), call ssl3_get_message()

     with the same message size as in ssl3_get_certificate_request().

     Otherwise, if no ServerKeyExchange message occurs, CertificateRequest

     messages might inadvertently be reject as too long.

     [Petr Lampa <lampa@fee.vutbr.cz>]



  *) Modified SSL library such that the verify_callback that has been set

     specificly for an SSL object with SSL_set_verify() is actually being

     used. Before the change, a verify_callback set with this function was

ssl/s3_clnt.c

+7 −1
Original line number Diff line number Diff line
@@ -849,11 +849,17 @@ static int ssl3_get_key_exchange(SSL *s) 
	DH *dh=NULL;

#endif



	/* use same message size as in ssl3_get_certificate_request()

	 * as ServerKeyExchange message may be skipped */

	n=ssl3_get_message(s,

		SSL3_ST_CR_KEY_EXCH_A,

		SSL3_ST_CR_KEY_EXCH_B,

		-1,

		1024*8, /* ?? */

#if defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_WIN32)

		1024*30,  /* 30k max cert list :-) */

#else

		1024*100, /* 100k max cert list :-) */

#endif

		&ok);



	if (!ok) return((int)n);