Bugfix: correct cleanup after sending a HelloRequest

diff --git a/CHANGES b/CHANGES
index 7a9f94f2d71ca8effcc98f578cf57f252f45e398..20f60e3c00ad8b1fd0deabf5c99a93521438594c 100644 (file)
--- 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 7a2007040e4776b730cac93fcbaf1cc2a4517fc9..6da6a6eac9d6144510bcfcda2bd672fe323a4880 100644 (file)
--- 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: