commit 024f543c15e70acb57a80067c3b32227f87bfe5f
author Matt Caswell <matt@openssl.org> Thu Oct 22 13:57:18 2015 +0100
committer Matt Caswell <matt@openssl.org> Fri Oct 30 08:39:47 2015 +0000
tree 72bc8530d31b4fae449df9270f516d9637be31e3
parent 20dbe585772a18952b730b71cd6722ce62dfe88b

Move in_handshake into STATEM

The SSL variable |in_handshake| seems misplaced. It would be better to have
it in the STATEM structure.

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>

ssl/s3_lib.c

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 2112475..39d08a0 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -5085,11 +5085,11 @@
          * makes sense here; so disable handshake processing and try to read
          * application data again.
          */
-        s->in_handshake++;
+        ossl_statem_set_in_handshake(s, 1);
         ret =
             s->method->ssl_read_bytes(s, SSL3_RT_APPLICATION_DATA, NULL, buf,
                                       len, peek);
-        s->in_handshake--;
+        ossl_statem_set_in_handshake(s, 0);
     } else
         s->s3->in_read_app_data = 0;