[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  b48357d9953decc43333979ca11ebc1500040f4e (commit)
      from  4c42ebd2f39ee30bf44cd016a3a838ab2efe8c08 (commit)


- Log -----------------------------------------------------------------
commit b48357d9953decc43333979ca11ebc1500040f4e
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>

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

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

diff --git a/apps/s_cb.c b/apps/s_cb.c
index 2a18f74..07ce997 100644
--- a/apps/s_cb.c
+++ b/apps/s_cb.c
@@ -711,6 +711,10 @@ static STRINT_PAIR tlsext_types[] = {
 #ifdef TLSEXT_TYPE_encrypt_then_mac
     {"encrypt-then-mac", TLSEXT_TYPE_encrypt_then_mac},
 #endif
+#ifdef TLSEXT_TYPE_application_layer_protocol_negotiation
+    {"application layer protocol negotiation",
+     TLSEXT_TYPE_application_layer_protocol_negotiation},
+#endif
     {NULL}
 };