summaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2015-06-17 14:47:27 +0100
committerDr. Stephen Henson <steve@openssl.org>2015-06-23 22:25:20 +0100
commit52f782698df6970e0b56373c3fb4e357f2deb04f (patch)
tree9cf0809dc954a17c29f03ffc5b0fcca95929b58c /ssl
parentc72382048f8e6bfea1fbe1b2e25a0423182bb4f0 (diff)
PSK trace keyex fixes.
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'ssl')
-rw-r--r--ssl/t1_trce.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/ssl/t1_trce.c b/ssl/t1_trce.c
index 97170cddce..40c5bebd5b 100644
--- a/ssl/t1_trce.c
+++ b/ssl/t1_trce.c
@@ -986,6 +986,13 @@ static int ssl_print_client_keyex(BIO *bio, int indent, SSL *ssl,
if (!ssl_print_hexbuf(bio, indent + 2, "ecdh_Yc", 1, &msg, &msglen))
return 0;
break;
+
+ case SSL_kPSK:
+ if (!ssl_print_hexbuf(bio, indent + 2,
+ "psk_identity", 2, &msg, &msglen))
+ return 0;
+ break;
+
}
return 1;
@@ -1049,6 +1056,13 @@ static int ssl_print_server_keyex(BIO *bio, int indent, SSL *ssl,
return 0;
}
break;
+
+ case SSL_kPSK:
+ if (!ssl_print_hexbuf(bio, indent + 2,
+ "psk_identity_hint", 2, &msg, &msglen))
+ return 0;
+ /* No signature */
+ return 1;
}
return ssl_print_signature(bio, indent, ssl, &msg, &msglen);
}