From: Daniel Black <daniel.black@openquery.com>
Date: Thu, 4 Feb 2016 01:04:10 +0000 (-0500)
Subject: RT2887: Add more packet and handshake types
X-Git-Tag: OpenSSL_1_1_0-pre3~283
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7429b3989d21a259ee0da00d9c626a09730aad8b;p=oweals%2Fopenssl.git

RT2887: Add more packet and handshake types

Reviewed-by: Matt Caswell <matt@openssl.org>
---

diff --git a/apps/s_cb.c b/apps/s_cb.c
index dd4aa929c2..b8e1ccc1f2 100644
--- a/apps/s_cb.c
+++ b/apps/s_cb.c
@@ -596,6 +596,7 @@ static STRINT_PAIR handshakes[] = {
     {", ClientHello", 1},
     {", ServerHello", 2},
     {", HelloVerifyRequest", 3},
+    {", NewSessionTicket", 4},
     {", Certificate", 11},
     {", ServerKeyExchange", 12},
     {", CertificateRequest", 13},
@@ -603,6 +604,9 @@ static STRINT_PAIR handshakes[] = {
     {", CertificateVerify", 15},
     {", ClientKeyExchange", 16},
     {", Finished", 20},
+    {", CertificateUrl", 21},
+    {", CertificateStatus", 22},
+    {", SupplementalData", 23},
     {NULL}
 };
 
@@ -645,6 +649,9 @@ void msg_cb(int write_p, int version, int content_type, const void *buf,
             if (len > 0)
                 str_details1 = lookup((int)bp[0], handshakes, "???");
             break;
+        case 23:
+            str_content_type = "ApplicationData";
+            break;
 #ifndef OPENSSL_NO_HEARTBEATS
         case 24:
             str_details1 = ", Heartbeat";