aboutsummaryrefslogtreecommitdiffstats
path: root/ssl/ssl_ciph.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2015-06-28 17:07:41 +0100
committerDr. Stephen Henson <steve@openssl.org>2015-07-30 14:43:35 +0100
commit8baac6a224ec194036b43e47b36b642248257b56 (patch)
tree97e65fc8178dfd010db6bf3ff49b997882573a30 /ssl/ssl_ciph.c
parentdcbd50608a44277f84f2a9323726a84f6f9d68ca (diff)
downloadopenssl-8baac6a224ec194036b43e47b36b642248257b56.tar.gz
new PSK text constants
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'ssl/ssl_ciph.c')
-rw-r--r--ssl/ssl_ciph.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index 32245b085e..dd325bbaa0 100644
--- 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;