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>
diff --git a/ssl/d1_msg.c b/ssl/d1_msg.c index 40152c2..4a2f0dc 100644 --- a/ssl/d1_msg.c +++ b/ssl/d1_msg.c
@@ -125,11 +125,11 @@ * Check if we have to continue an interrupted handshake for reading * belated app data with SCTP. */ - if ((SSL_in_init(s) && !s->in_handshake) || + if ((SSL_in_init(s) && !ossl_statem_get_in_handshake(s)) || (BIO_dgram_is_sctp(SSL_get_wbio(s)) && ossl_statem_in_sctp_read_sock(s))) #else - if (SSL_in_init(s) && !s->in_handshake) + if (SSL_in_init(s) && !ossl_statem_get_in_handshake(s)) #endif { i = s->handshake_func(s);