Commit 5b00115a authored by Ben Laurie's avatar Ben Laurie
Browse files

Fix export tests.

parent f8c3c05d

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -5,6 +5,9 @@ 


 Changes between 0.9.1c and 0.9.2



  *) Temp key "for export" tests were wrong in s3_srvr.c.

     [Anonymous <nobody@replay.com>]



  *) Add prototype for temp key callback functions

     SSL_CTX_set_tmp_{rsa,dh}_callback().

     [Ben Laurie]

ssl/s3_srvr.c

+4 −4
Original line number Diff line number Diff line
@@ -915,8 +915,8 @@ SSL *s; 
			if ((rsa == NULL) && (s->ctx->default_cert->rsa_tmp_cb != NULL))

				{

				rsa=s->ctx->default_cert->rsa_tmp_cb(s,

					(s->s3->tmp.new_cipher->algorithms|

					SSL_NOT_EXP)?0:1);

					!(s->s3->tmp.new_cipher->algorithms

					  &SSL_NOT_EXP));

				CRYPTO_add(&rsa->references,1,CRYPTO_LOCK_RSA);

				cert->rsa_tmp=rsa;

				}
@@ -938,8 +938,8 @@ SSL *s; 
			dhp=cert->dh_tmp;

			if ((dhp == NULL) && (cert->dh_tmp_cb != NULL))

				dhp=cert->dh_tmp_cb(s,

					(s->s3->tmp.new_cipher->algorithms|

					SSL_NOT_EXP)?0:1);

					!(s->s3->tmp.new_cipher->algorithms

					  &SSL_NOT_EXP));

			if (dhp == NULL)

				{

				al=SSL_AD_HANDSHAKE_FAILURE;