From: Matt Caswell Date: Mon, 18 Jun 2018 12:13:20 +0000 (+0100) Subject: Fix error number clash X-Git-Tag: OpenSSL_1_1_1-pre8~17 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a47f0a8507e054f8707129bf33455effd7201358;p=oweals%2Fopenssl.git Fix error number clash Reviewed-by: Andy Polyakov (Merged from https://github.com/openssl/openssl/pull/6511) --- diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt index 2a9804c5db..4b8e8c4ac7 100644 --- a/crypto/err/openssl.txt +++ b/crypto/err/openssl.txt @@ -716,11 +716,11 @@ EVP_F_DES_EDE3_WRAP_CIPHER:171:des_ede3_wrap_cipher EVP_F_DO_SIGVER_INIT:161:do_sigver_init EVP_F_ENC_NEW:199:enc_new EVP_F_EVP_CIPHERINIT_EX:123:EVP_CipherInit_ex -EVP_F_EVP_CIPHER_ASN1_TO_PARAM:202:EVP_CIPHER_asn1_to_param +EVP_F_EVP_CIPHER_ASN1_TO_PARAM:204:EVP_CIPHER_asn1_to_param EVP_F_EVP_CIPHER_CTX_COPY:163:EVP_CIPHER_CTX_copy EVP_F_EVP_CIPHER_CTX_CTRL:124:EVP_CIPHER_CTX_ctrl EVP_F_EVP_CIPHER_CTX_SET_KEY_LENGTH:122:EVP_CIPHER_CTX_set_key_length -EVP_F_EVP_CIPHER_PARAM_TO_ASN1:203:EVP_CIPHER_param_to_asn1 +EVP_F_EVP_CIPHER_PARAM_TO_ASN1:205:EVP_CIPHER_param_to_asn1 EVP_F_EVP_DECRYPTFINAL_EX:101:EVP_DecryptFinal_ex EVP_F_EVP_DECRYPTUPDATE:166:EVP_DecryptUpdate EVP_F_EVP_DIGESTFINALXOF:174:EVP_DigestFinalXOF diff --git a/include/openssl/evperr.h b/include/openssl/evperr.h index c742ea54f0..8ab1765659 100644 --- a/include/openssl/evperr.h +++ b/include/openssl/evperr.h @@ -38,11 +38,11 @@ int ERR_load_EVP_strings(void); # define EVP_F_DO_SIGVER_INIT 161 # define EVP_F_ENC_NEW 199 # define EVP_F_EVP_CIPHERINIT_EX 123 -# define EVP_F_EVP_CIPHER_ASN1_TO_PARAM 202 +# define EVP_F_EVP_CIPHER_ASN1_TO_PARAM 204 # define EVP_F_EVP_CIPHER_CTX_COPY 163 # define EVP_F_EVP_CIPHER_CTX_CTRL 124 # define EVP_F_EVP_CIPHER_CTX_SET_KEY_LENGTH 122 -# define EVP_F_EVP_CIPHER_PARAM_TO_ASN1 203 +# define EVP_F_EVP_CIPHER_PARAM_TO_ASN1 205 # define EVP_F_EVP_DECRYPTFINAL_EX 101 # define EVP_F_EVP_DECRYPTUPDATE 166 # define EVP_F_EVP_DIGESTFINALXOF 174