Commit 029dfa64 authored by Bodo Möller's avatar Bodo Möller
Browse files

bugfix: handle HelloRequest received during handshake correctly

parent f8845509

CHANGES

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


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



  *) 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>]



  *) Bugfix in ssl3_accept (ssl/s3_srvr.c): Case SSL3_ST_SW_HELLO_REQ_C

     should end in 'break', not 'goto end' which circuments various

     cleanups done in state SSL_ST_OK.   But session related stuff

ssl/s3_both.c

+4 −0
Original line number Diff line number Diff line
@@ -383,8 +383,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 */