Commit 979689aa authored by Bodo Möller's avatar Bodo Möller
Browse files

Fix SSL handshake functions and SSL_clear() such that SSL_clear() 

never resets s->method to s->ctx->method when called from within
one of the SSL handshake functions.
parent a3faebd1

CHANGES

+5 −0
Changes for CHANGES: 5 added lines, 0 removed lines.
Original line number Original line Diff line number Diff line
@@ -12,6 +12,11 @@ 
         *) applies to 0.9.6a/0.9.6b/0.9.6c and 0.9.7

         *) applies to 0.9.6a/0.9.6b/0.9.6c and 0.9.7

         +) applies to 0.9.7 only

         +) applies to 0.9.7 only





  *) Fix SSL handshake functions and SSL_clear() such that SSL_clear()

     never resets s->method to s->ctx->method when called from within

     one of the SSL handshake functions.

     [Bodo Moeller; problem pointed out by Niko Baric]



  +) Test for certificates which contain unsupported critical extensions.

  +) Test for certificates which contain unsupported critical extensions.

     If such a certificate is found during a verify operation it is 

     If such a certificate is found during a verify operation it is 

     rejected by default: this behaviour can be overridden by either

     rejected by default: this behaviour can be overridden by either

ssl/s23_clnt.c

+1 −1
Changes for ssl/s23_clnt.c: 1 added line, 1 removed line.
Original line number Original line Diff line number Diff line
@@ -113,8 +113,8 @@ int ssl23_connect(SSL *s) 
	else if (s->ctx->info_callback != NULL)

	else if (s->ctx->info_callback != NULL)

		cb=s->ctx->info_callback;

		cb=s->ctx->info_callback;

	

	

	if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s); 

	s->in_handshake++;

	s->in_handshake++;

	if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s); 





	for (;;)

	for (;;)

		{

		{

ssl/s23_srvr.c

+1 −1
Changes for ssl/s23_srvr.c: 1 added line, 1 removed line.
Original line number Original line Diff line number Diff line
@@ -165,8 +165,8 @@ int ssl23_accept(SSL *s) 
	else if (s->ctx->info_callback != NULL)

	else if (s->ctx->info_callback != NULL)

		cb=s->ctx->info_callback;

		cb=s->ctx->info_callback;

	

	

	if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s); 

	s->in_handshake++;

	s->in_handshake++;

	if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s); 





	for (;;)

	for (;;)

		{

		{

ssl/s2_clnt.c

+1 −1
Changes for ssl/s2_clnt.c: 1 added line, 1 removed line.
Original line number Original line Diff line number Diff line
@@ -118,8 +118,8 @@ int ssl2_connect(SSL *s) 
		cb=s->ctx->info_callback;

		cb=s->ctx->info_callback;





	/* init things to blank */

	/* init things to blank */

	if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s);

	s->in_handshake++;

	s->in_handshake++;

	if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s);





	for (;;)

	for (;;)

		{

		{

ssl/s2_srvr.c

+1 −1
Changes for ssl/s2_srvr.c: 1 added line, 1 removed line.
Original line number Original line Diff line number Diff line
@@ -119,8 +119,8 @@ int ssl2_accept(SSL *s) 
		cb=s->ctx->info_callback;

		cb=s->ctx->info_callback;





	/* init things to blank */

	/* init things to blank */

	if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s);

	s->in_handshake++;

	s->in_handshake++;

	if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s);





	if (s->cert == NULL)

	if (s->cert == NULL)

		{

		{