diff options
| author | Matt Caswell <matt@openssl.org> | 2018-03-14 11:27:45 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2018-03-14 11:27:45 +0000 |
| commit | 346149c164605cf0e1b930d3f42a1f28f3babcae (patch) | |
| tree | 9344f13addcb9652bc7b01a1befa8d3c578a46a8 | |
| parent | fa25763b5528b56b448d64bfbaeac54905b0c80d (diff) | |
Fix an error number clash
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5616)
| -rw-r--r-- | crypto/err/openssl.txt | 2 | ||||
| -rw-r--r-- | include/openssl/sslerr.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt index 606f2b1552..3f6169ee1c 100644 --- a/crypto/err/openssl.txt +++ b/crypto/err/openssl.txt @@ -986,7 +986,7 @@ SSL_F_ADD_CLIENT_KEY_SHARE_EXT:438:* SSL_F_ADD_KEY_SHARE:512:add_key_share SSL_F_BYTES_TO_CIPHER_LIST:519:bytes_to_cipher_list SSL_F_CHECK_SUITEB_CIPHER_LIST:331:check_suiteb_cipher_list -SSL_F_CIPHERSUITE_CB:621:ciphersuite_cb +SSL_F_CIPHERSUITE_CB:622:ciphersuite_cb SSL_F_CONSTRUCT_CA_NAMES:552:construct_ca_names SSL_F_CONSTRUCT_KEY_EXCHANGE_TBS:553:construct_key_exchange_tbs SSL_F_CREATE_SYNTHETIC_MESSAGE_HASH:539:create_synthetic_message_hash diff --git a/include/openssl/sslerr.h b/include/openssl/sslerr.h index 77db8717cf..0f390a8b89 100644 --- a/include/openssl/sslerr.h +++ b/include/openssl/sslerr.h @@ -23,7 +23,7 @@ int ERR_load_SSL_strings(void); # define SSL_F_ADD_KEY_SHARE 512 # define SSL_F_BYTES_TO_CIPHER_LIST 519 # define SSL_F_CHECK_SUITEB_CIPHER_LIST 331 -# define SSL_F_CIPHERSUITE_CB 621 +# define SSL_F_CIPHERSUITE_CB 622 # define SSL_F_CONSTRUCT_CA_NAMES 552 # define SSL_F_CONSTRUCT_KEY_EXCHANGE_TBS 553 # define SSL_F_CREATE_SYNTHETIC_MESSAGE_HASH 539 |