From e5c4bf93a9b65652138ca0433b2d37d5113da5dd Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Sat, 4 Feb 2017 03:17:32 +0000 Subject: [PATCH] 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 (Merged from https://github.com/openssl/openssl/pull/2550) --- ssl/ssl_ciph.c | 6 ++++++ ssl/ssl_locl.h | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c index 88b99cca14..20ff37a6db 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; diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index d0c4eb91a5..b868813e0e 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -229,6 +229,9 @@ # define SSL_PSK (SSL_kPSK | SSL_kRSAPSK | SSL_kECDHEPSK | SSL_kDHEPSK) +/* Any appropriate key exchange algorithm (for TLS 1.3 ciphersuites) */ +# define SSL_kANY 0x00000000U + /* Bits for algorithm_auth (server authentication) */ /* RSA auth */ # define SSL_aRSA 0x00000001U @@ -246,6 +249,8 @@ # define SSL_aSRP 0x00000040U /* GOST R 34.10-2012 signature auth */ # define SSL_aGOST12 0x00000080U +/* Any appropriate signature auth (for TLS 1.3 ciphersuites) */ +# define SSL_aANY 0x00000000U /* Bits for algorithm_enc (symmetric encryption) */ # define SSL_DES 0x00000001U