From: Bodo Möller <bodo@openssl.org>
Date: Fri, 21 Sep 2001 00:03:00 +0000 (+0000)
Subject: Bugfix: correct cleanup after sending a HelloRequest
X-Git-Tag: OpenSSL_0_9_6c~106
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3f98e1dd1114fef4cdd4756f384bb646221fa12a;p=oweals%2Fopenssl.git

Bugfix: correct cleanup after sending a HelloRequest
---

diff --git a/CHANGES b/CHANGES
index 7a9f94f2d7..20f60e3c00 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,10 +4,13 @@
 
  Changes between 0.9.6b and 0.9.6c  [XX xxx XXXX]
 
-  *) Fix ssl3_accept (ssl/s3_srvr.c): Do not call ssl_init_wbio_buffer()
-     when just sending a HelloRequest as this could interfere with
-     application data writes (and is totally unnecessary).
-     [Bodo Moeller; bug pointed out by Eric Rescorla <ekr@rtfm.com>]
+  *) 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.
+
+     Also avoid some overhead by not calling ssl_init_wbio_buffer()
+     before just sending a HelloRequest.
+     [Bodo Moeller]
 
   *) Fix ssl/s3_enc.c, ssl/t1_enc.c and ssl/s3_pkt.c so that we don't
      reveal whether illegal block cipher padding was found or a MAC
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index 7a2007040e..6da6a6eac9 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -270,9 +270,7 @@ int ssl3_accept(SSL *s)
 
 		case SSL3_ST_SW_HELLO_REQ_C:
 			s->state=SSL_ST_OK;
-			ret=1;
-			goto end;
-			/* break; */
+			break;
 
 		case SSL3_ST_SR_CLNT_HELLO_A:
 		case SSL3_ST_SR_CLNT_HELLO_B: