[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  61cd0c946b34b6ae690882b334d77093e063d47c (commit)
      from  3fa2812f32bdb922d47b84ab7b5a98a807d838c0 (commit)


- Log -----------------------------------------------------------------
commit 61cd0c946b34b6ae690882b334d77093e063d47c
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Mar 12 16:08:31 2018 +0000

    Fix enable-ssl-trace
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5600)

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

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

diff --git a/ssl/t1_trce.c b/ssl/t1_trce.c
index 601ab02..3186b98 100644
--- a/ssl/t1_trce.c
+++ b/ssl/t1_trce.c
@@ -480,12 +480,12 @@ static const ssl_trace_tbl ssl_exts_tbl[] = {
     {TLSEXT_TYPE_cookie, "cookie_ext"},
     {TLSEXT_TYPE_psk_kex_modes, "psk_key_exchange_modes"},
     {TLSEXT_TYPE_certificate_authorities, "certificate_authorities"},
-    {TLSEXT_TYPE_post_handshake_auth, "post_handshake_auth"}
-    {TLSEXT_TYPE_signature_algorithms_cert, "signature_algorithms_cert"}
+    {TLSEXT_TYPE_post_handshake_auth, "post_handshake_auth"},
+    {TLSEXT_TYPE_signature_algorithms_cert, "signature_algorithms_cert"},
     {TLSEXT_TYPE_key_share, "key_share"},
-    {TLSEXT_TYPE_renegotiate, "renegotiate"}
+    {TLSEXT_TYPE_renegotiate, "renegotiate"},
 # ifndef OPENSSL_NO_NEXTPROTONEG
-    , {TLSEXT_TYPE_next_proto_neg, "next_proto_neg"}
+    {TLSEXT_TYPE_next_proto_neg, "next_proto_neg"},
 # endif
 };