aboutsummaryrefslogtreecommitdiff
path: root/ssl/ssl_ciph.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2017-02-04 03:17:32 +0000
committerDr. Stephen Henson <steve@openssl.org>2017-02-08 02:16:26 +0000
commite5c4bf93a9b65652138ca0433b2d37d5113da5dd (patch)
tree4578020c484b6e6a4c97469b9b8133defb021185 /ssl/ssl_ciph.c
parente9681f8314c64c6802b11997c471bd763de38c8c (diff)
downloadopenssl-e5c4bf93a9b65652138ca0433b2d37d5113da5dd.zip
openssl-e5c4bf93a9b65652138ca0433b2d37d5113da5dd.tar.gz
openssl-e5c4bf93a9b65652138ca0433b2d37d5113da5dd.tar.bz2
Add SSL_kANY and SSL_aANY
Add SSL_kANY and SSL_aANY contants for TLS 1.3 ciphersuites. Return appropriate text strings when they are used. Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2550)
Diffstat (limited to 'ssl/ssl_ciph.c')
-rw-r--r--ssl/ssl_ciph.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index 88b99cc..20ff37a 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -1576,6 +1576,9 @@ char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
case SSL_kGOST:
kx = "GOST";
break;
+ case SSL_kANY:
+ kx = "any";
+ break;
default:
kx = "unknown";
}
@@ -1606,6 +1609,9 @@ char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
case (SSL_aGOST12 | SSL_aGOST01):
au = "GOST12";
break;
+ case SSL_aANY:
+ au = "any";
+ break;
default:
au = "unknown";
break;