Commit a47f0a85 authored by Matt Caswell's avatar Matt Caswell
Browse files

Fix error number clash 



Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6511)
parent 8263e6cb

crypto/err/openssl.txt

+2 −2
Original line number Diff line number Diff line
@@ -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

include/openssl/evperr.h

+2 −2
Original line number Diff line number Diff line
@@ -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