Tidy up ssl3_digest_cached_records logic.

[openssl.git] / ssl / d1_srvr.c

diff --git a/ssl/d1_srvr.c b/ssl/d1_srvr.c
index dfdc573d6424fcfa0fd8c16392edbf02e4c9ff33..7a40d66a1490ad70800fee75632766174fa846db 100644 (file)
--- a/ssl/d1_srvr.c
+++ b/ssl/d1_srvr.c
@@ -640,12 +640,9 @@ int dtls1_accept(SSL *s)
                  * For sigalgs freeze the handshake buffer. If we support
                  * extms we've done this already.
                  */
                  * For sigalgs freeze the handshake buffer. If we support
                  * extms we've done this already.
                  */

-                if (!(s->s3->flags & SSL_SESS_FLAG_EXTMS)) {
-                    s->s3->flags |= TLS1_FLAGS_KEEP_HANDSHAKE;
-                    if (!ssl3_digest_cached_records(s)) {
-                        s->state = SSL_ST_ERR;
-                        return -1;
-                    }
+                if (!ssl3_digest_cached_records(s, 1)) {
+                    s->state = SSL_ST_ERR;
+                    return -1;

                 }
             } else {
                 s->state = SSL3_ST_SR_CERT_VRFY_A;
                 }
             } else {
                 s->state = SSL3_ST_SR_CERT_VRFY_A;