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

[Rich Salz]

The branch OpenSSL_1_0_2-stable has been updated
       via  2d07f60a025df7cb34efce9f5122c8f682bbc070 (commit)
      from  2f2295a5961f942d0e1f5676166513fa57a1903b (commit)


- Log -----------------------------------------------------------------
commit 2d07f60a025df7cb34efce9f5122c8f682bbc070
Author: Alessandro Ghedini <alessandro at ghedini.me>
Date:   Wed Aug 19 17:12:31 2015 +0200

    GH371: Print debug info for ALPN extension
    
    Also known as RT 4106
    Signed-off-by: Rich Salz <rsalz at akamai.com>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    
    (cherry picked from commit b48357d9953decc43333979ca11ebc1500040f4e)

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

Summary of changes:
 apps/s_cb.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/s_cb.c b/apps/s_cb.c
index dd3aa74..5b5e711 100644
--- a/apps/s_cb.c
+++ b/apps/s_cb.c
@@ -981,6 +981,11 @@ void MS_CALLBACK tlsext_cb(SSL *s, int client_server, int type,
         extname = "next protocol";
         break;
 #endif
+#ifdef TLSEXT_TYPE_application_layer_protocol_negotiation
+    case TLSEXT_TYPE_application_layer_protocol_negotiation:
+        extname = "application layer protocol negotiation";
+        break;
+#endif
 
     case TLSEXT_TYPE_padding:
         extname = "TLS padding";