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/d1_lib.c

diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c
index a6f0632..f8a6a37 100644
--- a/ssl/d1_lib.c
+++ b/ssl/d1_lib.c
@@ -1017,7 +1017,7 @@
     }
 
     /* ...and no handshake in progress. */
-    if (SSL_in_init(s) || s->in_handshake) {
+    if (SSL_in_init(s) || ossl_statem_get_in_handshake(s)) {
         SSLerr(SSL_F_DTLS1_HEARTBEAT, SSL_R_UNEXPECTED_MESSAGE);
         return -1;
     }