diff options
| author | Dmitry Belyavskiy <beldmit@gmail.com> | 2020-03-30 18:04:07 +0300 |
|---|---|---|
| committer | Dmitry Belyavskiy <beldmit@gmail.com> | 2020-05-19 13:02:43 +0300 |
| commit | 092a5c71f1cba1173f17c2cd4ff5607069b0d3bb (patch) | |
| tree | 89437b4df54b4d9ac802cb5fd0c68a4f7e22839b /include | |
| parent | 5a29b6286f8ccafc2ed9a026b0e8d4bd6d0396e6 (diff) | |
Constants for new GOST TLS 1.2 ciphersuites
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11442)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/evp.h | 3 | ||||
| -rw-r--r-- | include/openssl/ssl.h | 3 | ||||
| -rw-r--r-- | include/openssl/sslerr.h | 4 |
3 files changed, 9 insertions, 1 deletions
diff --git a/include/openssl/evp.h b/include/openssl/evp.h index fe2e440a8b..ea305c2cf0 100644 --- a/include/openssl/evp.h +++ b/include/openssl/evp.h @@ -153,6 +153,7 @@ int (*EVP_MD_meth_get_ctrl(const EVP_MD *md))(EVP_MD_CTX *ctx, int cmd, # define EVP_MD_CTRL_DIGALGID 0x1 # define EVP_MD_CTRL_MICALG 0x2 # define EVP_MD_CTRL_XOF_LEN 0x3 +# define EVP_MD_CTRL_TLSTREE 0x4 /* Minimum Algorithm specific ctrl value */ @@ -382,6 +383,8 @@ int (*EVP_CIPHER_meth_get_ctrl(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *, # define EVP_CTRL_PROCESS_UNPROTECTED 0x28 /* Get the supplementary wrap cipher */ #define EVP_CTRL_GET_WRAP_CIPHER 0x29 +/* TLSTREE key diversification */ +#define EVP_CTRL_TLSTREE 0x2A /* Padding modes */ #define EVP_PADDING_PKCS7 1 diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index 74d4e305e1..05755b014d 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -87,6 +87,7 @@ extern "C" { # define SSL_TXT_kECDHEPSK "kECDHEPSK" # define SSL_TXT_kDHEPSK "kDHEPSK" # define SSL_TXT_kGOST "kGOST" +# define SSL_TXT_kGOST18 "kGOST18" # define SSL_TXT_kSRP "kSRP" # define SSL_TXT_aRSA "aRSA" @@ -933,6 +934,8 @@ __owur int SSL_extension_supported(unsigned int ext_type); # define SSL_MAC_FLAG_READ_MAC_STREAM 1 # define SSL_MAC_FLAG_WRITE_MAC_STREAM 2 +# define SSL_MAC_FLAG_READ_MAC_TLSTREE 4 +# define SSL_MAC_FLAG_WRITE_MAC_TLSTREE 8 /* * A callback for logging out TLS key material. This callback should log out diff --git a/include/openssl/sslerr.h b/include/openssl/sslerr.h index 47667f9a0a..bbce792c72 100644 --- a/include/openssl/sslerr.h +++ b/include/openssl/sslerr.h @@ -298,6 +298,7 @@ int ERR_load_SSL_strings(void); # define SSL_F_TLS_CONSTRUCT_CKE_DHE 0 # define SSL_F_TLS_CONSTRUCT_CKE_ECDHE 0 # define SSL_F_TLS_CONSTRUCT_CKE_GOST 0 +# define SSL_F_TLS_CONSTRUCT_CKE_GOST18 0 # define SSL_F_TLS_CONSTRUCT_CKE_PSK_PREAMBLE 0 # define SSL_F_TLS_CONSTRUCT_CKE_RSA 0 # define SSL_F_TLS_CONSTRUCT_CKE_SRP 0 @@ -422,6 +423,7 @@ int ERR_load_SSL_strings(void); # define SSL_F_TLS_PROCESS_CKE_DHE 0 # define SSL_F_TLS_PROCESS_CKE_ECDHE 0 # define SSL_F_TLS_PROCESS_CKE_GOST 0 +# define SSL_F_TLS_PROCESS_CKE_GOST18 0 # define SSL_F_TLS_PROCESS_CKE_PSK_PREAMBLE 0 # define SSL_F_TLS_PROCESS_CKE_RSA 0 # define SSL_F_TLS_PROCESS_CKE_SRP 0 @@ -457,6 +459,7 @@ int ERR_load_SSL_strings(void); /* * SSL reason codes. */ +# define SSL_R_ALGORITHM_FETCH_FAILED 295 # define SSL_R_APPLICATION_DATA_AFTER_CLOSE_NOTIFY 291 # define SSL_R_APP_DATA_IN_HANDSHAKE 100 # define SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT 272 @@ -556,7 +559,6 @@ int ERR_load_SSL_strings(void); # define SSL_R_EXTRA_DATA_IN_MESSAGE 153 # define SSL_R_EXT_LENGTH_MISMATCH 163 # define SSL_R_FAILED_TO_INIT_ASYNC 405 -# define SSL_R_ALGORITHM_FETCH_FAILED 295 # define SSL_R_FRAGMENTED_CLIENT_HELLO 401 # define SSL_R_GOT_A_FIN_BEFORE_A_CCS 154 # define SSL_R_HTTPS_PROXY_REQUEST 155 |