PR: 1991

Submitted by: Michael Tuexen <tuexen@fh-muenster.de>
Approved by: steve@openssl.org

Print DTLS message types out with -msg arg.

diff --git a/apps/s_cb.c b/apps/s_cb.c
index a512589e8c87d92b80fdc84751d02b7e9f91923c..974ed5d0a5986620bf2248a911445729b224d220 100644 (file)
--- a/apps/s_cb.c
+++ b/apps/s_cb.c
@@ -338,6 +338,12 @@ void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void *
                break;
        default:
                str_version = "???";
+       case DTLS1_VERSION:
+               str_version = "DTLS 1.0 ";
+               break;
+       case DTLS1_BAD_VER:
+               str_version = "DTLS 1.0 (bad) ";
+               break;
                }
 
        if (version == SSL2_VERSION)
@@ -401,7 +407,10 @@ void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void *
                        }
                }
 
-       if (version == SSL3_VERSION || version == TLS1_VERSION)
+       if (version == SSL3_VERSION ||
+           version == TLS1_VERSION ||
+           version == DTLS1_VERSION ||
+           version == DTLS1_BAD_VER)
                {
                switch (content_type)
                        {
@@ -540,6 +549,9 @@ void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void *
                                case 15:
                                        str_details1 = ", CertificateVerify";
                                        break;
+                               case 3:
+                                       str_details1 = ", HelloVerifyRequest";
+                                       break;
                                case 16:
                                        str_details1 = ", ClientKeyExchange";
                                        break;