[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Matt Caswell]

The branch OpenSSL_1_0_2-stable has been updated
       via  b6adfa043fcd33960c277a75984701e87d06fa33 (commit)
      from  78e9e3f945935c91d8dfe0e832a95d6ea8d05f34 (commit)


- Log -----------------------------------------------------------------
commit b6adfa043fcd33960c277a75984701e87d06fa33
Author: Matt Caswell <matt at openssl.org>
Date:   Sun Dec 10 09:55:08 2017 +0000

    Fix a switch statement fallthrough
    
    SSL_trace() has a case which was inadvertently falling through.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4888)
    
    (cherry picked from commit 5bfb357a0d2046fc75daf67a5bc019eb87443729)

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

Summary of changes:
 ssl/t1_trce.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ssl/t1_trce.c b/ssl/t1_trce.c
index c5e21df..dc62df8 100644
--- a/ssl/t1_trce.c
+++ b/ssl/t1_trce.c
@@ -1247,13 +1247,15 @@ void SSL_trace(int write_p, int version, int content_type,
         break;
 
     case SSL3_RT_ALERT:
-        if (msglen != 2)
+        if (msglen != 2) {
             BIO_puts(bio, "    Illegal Alert Length\n");
-        else {
+        } else {
             BIO_printf(bio, "    Level=%s(%d), description=%s(%d)\n",
                        SSL_alert_type_string_long(msg[0] << 8),
                        msg[0], SSL_alert_desc_string_long(msg[1]), msg[1]);
         }
+        break;
+
     case TLS1_RT_HEARTBEAT:
         ssl_print_heartbeat(bio, 4, msg, msglen);
         break;