diff options
| author | Nikolay Morozov <nmorozoff77@yandex.ru> | 2020-04-16 18:55:36 +0300 |
|---|---|---|
| committer | Dmitry Belyavskiy <beldmit@gmail.com> | 2020-04-18 13:32:49 +0300 |
| commit | 7a417606677c646d33d65de2fd298bc93d943edf (patch) | |
| tree | 9931530190c09f82aa6a8ca11be7e5889ff0afba /include | |
| parent | ccb47dbf47b36da849301aae38c32ed019e75a21 (diff) | |
GOST2012 TLS ClientCertificateType Identifiers support
For GOST2012-GOST8912-GOST8912 IANA introduce ClientCertificateType Identifiers
https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#tls-parameters-2
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/11558)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/ssl3.h | 2 | ||||
| -rw-r--r-- | include/openssl/tls1.h | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/include/openssl/ssl3.h b/include/openssl/ssl3.h index efef3ccfeb..261545f23f 100644 --- a/include/openssl/ssl3.h +++ b/include/openssl/ssl3.h @@ -270,7 +270,7 @@ extern "C" { * SSL3_CT_NUMBER is used to size arrays and it must be large enough to * contain all of the cert types defined for *either* SSLv3 and TLSv1. */ -# define SSL3_CT_NUMBER 10 +# define SSL3_CT_NUMBER 12 # if defined(TLS_CT_NUMBER) # if TLS_CT_NUMBER != SSL3_CT_NUMBER diff --git a/include/openssl/tls1.h b/include/openssl/tls1.h index 9181e0d2c1..d0dbf17d63 100644 --- a/include/openssl/tls1.h +++ b/include/openssl/tls1.h @@ -1116,14 +1116,16 @@ int SSL_CTX_set_tlsext_ticket_key_evp_cb # define TLS_CT_RSA_FIXED_ECDH 65 # define TLS_CT_ECDSA_FIXED_ECDH 66 # define TLS_CT_GOST01_SIGN 22 -# define TLS_CT_GOST12_SIGN 238 -# define TLS_CT_GOST12_512_SIGN 239 +# define TLS_CT_GOST12_IANA_SIGN 67 +# define TLS_CT_GOST12_IANA_512_SIGN 68 +# define TLS_CT_GOST12_LEGACY_SIGN 238 +# define TLS_CT_GOST12_LEGACY_512_SIGN 239 /* * when correcting this number, correct also SSL3_CT_NUMBER in ssl3.h (see * comment there) */ -# define TLS_CT_NUMBER 10 +# define TLS_CT_NUMBER 12 # if defined(SSL3_CT_NUMBER) # if TLS_CT_NUMBER != SSL3_CT_NUMBER |