From: Dr. Stephen Henson <steve@openssl.org>
Date: Fri, 24 Jul 2009 11:17:10 +0000 (+0000)
Subject: Update from 0.9.8-stable
X-Git-Tag: OpenSSL-fips-2_0-rc1~1590
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=bdfa4ff9478aabb5661a51ed93ae61ad139cf924;p=oweals%2Fopenssl.git

Update from 0.9.8-stable
---

diff --git a/apps/s_cb.c b/apps/s_cb.c
index 41f789af48..3fc73a27aa 100644
--- 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 *
 	case TLS1_VERSION:
 		str_version = "TLS 1.0 ";
 		break;
+	case DTLS1_VERSION:
+		str_version = "DTLS 1.0 ";
+		break;
+	case DTLS1_BAD_VER:
+		str_version = "DTLS 1.0 (bad) ";
+		break;
 	default:
 		str_version = "???";
 		}
@@ -403,7 +409,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)
 			{
@@ -542,6 +551,9 @@ void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void *
 				case 2:
 					str_details1 = ", ServerHello";
 					break;
+				case 3:
+					str_details1 = ", HelloVerifyRequest";
+					break;
 				case 11:
 					str_details1 = ", Certificate";
 					break;