Commit e5c4bf93 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

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: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2550)
parent e9681f83

ssl/ssl_ciph.c

+6 −0
Original line number Diff line number Diff line
@@ -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;

ssl/ssl_locl.h

+5 −0
Original line number Diff line number Diff line
@@ -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