diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2017-02-04 13:42:57 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2017-02-08 03:16:26 +0100 |
| commit | 7114af3054c005d9ff587b78f193d75e4ddf1775 (patch) | |
| tree | 30895b5e949d9f273a1bf2ebb4500077ccb22e65 /ssl/ssl_ciph.c | |
| parent | Add SSL_kANY and SSL_aANY (diff) | |
| download | openssl-7114af3054c005d9ff587b78f193d75e4ddf1775.tar.xz openssl-7114af3054c005d9ff587b78f193d75e4ddf1775.zip | |
Add NID_auth_any and NID_kx_any NIDs.
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.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c index 20ff37a6db..3149c39f5f 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c @@ -153,7 +153,8 @@ static const ssl_cipher_table ssl_cipher_table_kx[] = { {SSL_kRSAPSK, NID_kx_rsa_psk}, {SSL_kPSK, NID_kx_psk}, {SSL_kSRP, NID_kx_srp}, - {SSL_kGOST, NID_kx_gost} + {SSL_kGOST, NID_kx_gost}, + {SSL_kANY, NID_kx_any} }; static const ssl_cipher_table ssl_cipher_table_auth[] = { @@ -164,7 +165,8 @@ static const ssl_cipher_table ssl_cipher_table_auth[] = { {SSL_aGOST01, NID_auth_gost01}, {SSL_aGOST12, NID_auth_gost12}, {SSL_aSRP, NID_auth_srp}, - {SSL_aNULL, NID_auth_null} + {SSL_aNULL, NID_auth_null}, + {SSL_aANY, NID_auth_any} }; /* *INDENT-ON* */ |