projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c723820
)
PSK trace keyex fixes.
author
Dr. Stephen Henson
<steve@openssl.org>
Wed, 17 Jun 2015 13:47:27 +0000
(14:47 +0100)
committer
Dr. Stephen Henson
<steve@openssl.org>
Tue, 23 Jun 2015 21:25:20 +0000
(22:25 +0100)
Reviewed-by: Matt Caswell <matt@openssl.org>
ssl/t1_trce.c
patch
|
blob
|
history
diff --git
a/ssl/t1_trce.c
b/ssl/t1_trce.c
index 97170cddce36bb7d70e192ccbd281a40b6b165d1..40c5bebd5b7c93e2d2dde9cf191601be2a13c58c 100644
(file)
--- 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);
}