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:
dcbd506
)
new PSK text constants
author
Dr. Stephen Henson
<steve@openssl.org>
Sun, 28 Jun 2015 16:07:41 +0000
(17:07 +0100)
committer
Dr. Stephen Henson
<steve@openssl.org>
Thu, 30 Jul 2015 13:43:35 +0000
(14:43 +0100)
Reviewed-by: Matt Caswell <matt@openssl.org>
ssl/ssl_ciph.c
patch
|
blob
|
history
diff --git
a/ssl/ssl_ciph.c
b/ssl/ssl_ciph.c
index 32245b085e1d5ccb40520174f116853ab75e6f19..dd325bbaa0b5f380090a6decad3386832c62d50c 100644
(file)
--- a/
ssl/ssl_ciph.c
+++ b/
ssl/ssl_ciph.c
@@
-1629,6
+1629,15
@@
char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
case SSL_kPSK:
kx = "PSK";
break;
+ case SSL_kRSAPSK:
+ kx = "RSAPSK";
+ break;
+ case SSL_kECDHEPSK:
+ kx = "ECDHEPSK";
+ break;
+ case SSL_kDHEPSK:
+ kx = "DHEPSK";
+ break;
case SSL_kSRP:
kx = "SRP";
break;