Commit 3b0b5aba authored by Bodo Möller's avatar Bodo Möller
Browse files

bugfix: handle HelloRequest received during handshake correctly

parent b49124f6

CHANGES

+4 −0
Original line number Diff line number Diff line
@@ -12,6 +12,10 @@ 
         *) applies to 0.9.6a/0.9.6b/0.9.6c and 0.9.7

         +) applies to 0.9.7 only



  *) Avoid infinite loop in ssl3_get_message (ssl/s3_both.c) if a

     client receives HelloRequest while in a handshake.

     [Bodo Moeller; bug noticed by Andy Schneider <andy.schneider@bjss.co.uk>]



  +) New function SSL_renegotiate_pending().  This returns true once

     renegotiation has been requested (either SSL_renegotiate() call

     or HelloRequest/ClientHello receveived from the peer) and becomes

ssl/s3_both.c

+4 −0
Original line number Diff line number Diff line
@@ -387,8 +387,12 @@ long ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok) 
					 * if their format is correct. Does not count for

					 * 'Finished' MAC. */

					if (p[1] == 0 && p[2] == 0 &&p[3] == 0)

						{

						s->init_num = 0;

						skip_message = 1;

						}

			

			}

		while (skip_message);



		/* s->init_num == 4 */