[openssl-commits] [openssl] master update

[bernd.edlinger at hotmail.de]

The branch master has been updated
       via  6839a7a7f4973a3fc2f87b12664c26d524bef1f4 (commit)
      from  8e8fe187f1559a7fc9f50cc4af7f880273a4eea2 (commit)


- Log -----------------------------------------------------------------
commit 6839a7a7f4973a3fc2f87b12664c26d524bef1f4
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Tue Sep 11 11:44:13 2018 +0200

    Fix a possible recursion in SSLfatal handling
    
    Fixes: #7161 (hopefully)
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/7175)

-----------------------------------------------------------------------

Summary of changes:
 ssl/statem/statem.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ssl/statem/statem.c b/ssl/statem/statem.c
index d75f9ea..f76c0e4 100644
--- a/ssl/statem/statem.c
+++ b/ssl/statem/statem.c
@@ -118,11 +118,12 @@ void ossl_statem_set_renegotiate(SSL *s)
 void ossl_statem_fatal(SSL *s, int al, int func, int reason, const char *file,
                        int line)
 {
+    ERR_put_error(ERR_LIB_SSL, func, reason, file, line);
     /* We shouldn't call SSLfatal() twice. Once is enough */
-    assert(s->statem.state != MSG_FLOW_ERROR);
+    if (s->statem.in_init && s->statem.state == MSG_FLOW_ERROR)
+      return;
     s->statem.in_init = 1;
     s->statem.state = MSG_FLOW_ERROR;
-    ERR_put_error(ERR_LIB_SSL, func, reason, file, line);
     if (al != SSL_AD_NO_ALERT
             && s->statem.enc_write_state != ENC_WRITE_STATE_INVALID)
         ssl3_send_alert(s, SSL3_AL_FATAL, al);