summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2013-02-04 14:53:47 +0000
committerDr. Stephen Henson <steve@openssl.org>2013-02-04 15:14:00 +0000
commitc867d871806db349ce660eb265f26c7397dcc536 (patch)
treeb8e73a35bea152c41335939986ef13b67600c526
parentf8435919a1f83f364348890477021f4481924f08 (diff)
Fix for trace code: SSL3 doesn't include a length value for
encrypted premaster secret value. (cherry picked from commit ea34a58385058748c51037bfb2c3208ee639f5f1)
-rw-r--r--ssl/t1_trce.c11
1 files changed, 10 insertions, 1 deletions
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 */