From: Dr. Stephen Henson <steve@openssl.org>
Date: Sun, 28 Jun 2015 16:07:41 +0000 (+0100)
Subject: new PSK text constants
X-Git-Tag: OpenSSL_1_1_0-pre1~894
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8baac6a224ec194036b43e47b36b642248257b56;p=oweals%2Fopenssl.git

new PSK text constants

Reviewed-by: Matt Caswell <matt@openssl.org>
---

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;