From: Dr. Stephen Henson <steve@openssl.org>
Date: Mon, 4 Feb 2013 14:53:47 +0000 (+0000)
Subject: Fix for trace code: SSL3 doesn't include a length value for
X-Git-Tag: master-post-reformat~1461
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ea34a58385058748c51037bfb2c3208ee639f5f1;p=oweals%2Fopenssl.git

Fix for trace code: SSL3 doesn't include a length value for
encrypted premaster secret value.
---

diff --git a/ssl/t1_trce.c b/ssl/t1_trce.c
index b8651641a3..c603134821 100644
--- a/ssl/t1_trce.c
+++ b/ssl/t1_trce.c
@@ -843,10 +843,19 @@ static int ssl_print_client_keyex(BIO *bio, int indent, SSL *ssl,
 		{
 
 	case SSL_kRSA:
-		if (!ssl_print_hexbuf(bio, indent + 2,
+		if (TLS1_get_version(ssl) == SSL3_VERSION)
+			{
+			ssl_print_hex(bio, indent + 2,
+						"EncyptedPreMasterSecret",
+						msg, msglen);
+			}
+		else
+			{
+			if (!ssl_print_hexbuf(bio, indent + 2,
 						"EncyptedPreMasterSecret", 2,
 						&msg, &msglen))
 				return 0;
+			}
 		break;
 
 		/* Implicit parameters only allowed for static DH */