From: Paul Yang Date: Mon, 5 Nov 2018 15:08:34 +0000 (+0800) Subject: Fix a collision in function err numbers X-Git-Tag: openssl-3.0.0-alpha1~2945 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=41eac6122a9db8ef29ed6115c20f2de4c9232b9b;p=oweals%2Fopenssl.git Fix a collision in function err numbers 'make update' complains about this Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/7571) --- diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt index b5a441a24b..49e487523e 100644 --- a/crypto/err/openssl.txt +++ b/crypto/err/openssl.txt @@ -810,7 +810,7 @@ EVP_F_PKCS5_V2_PBKDF2_KEYIVGEN:164:PKCS5_v2_PBKDF2_keyivgen EVP_F_PKCS5_V2_SCRYPT_KEYIVGEN:180:PKCS5_v2_scrypt_keyivgen EVP_F_PKEY_MAC_INIT:214:pkey_mac_init EVP_F_PKEY_SET_TYPE:158:pkey_set_type -EVP_F_POLY1305_CTRL:215:poly1305_ctrl +EVP_F_POLY1305_CTRL:216:poly1305_ctrl EVP_F_RC2_MAGIC_TO_METH:109:rc2_magic_to_meth EVP_F_RC5_CTRL:125:rc5_ctrl EVP_F_S390X_AES_GCM_CTRL:201:s390x_aes_gcm_ctrl diff --git a/include/openssl/evperr.h b/include/openssl/evperr.h index b5064fdffe..fff78cc473 100644 --- a/include/openssl/evperr.h +++ b/include/openssl/evperr.h @@ -120,7 +120,7 @@ int ERR_load_EVP_strings(void); # define EVP_F_PKCS5_V2_SCRYPT_KEYIVGEN 180 # define EVP_F_PKEY_MAC_INIT 214 # define EVP_F_PKEY_SET_TYPE 158 -# define EVP_F_POLY1305_CTRL 215 +# define EVP_F_POLY1305_CTRL 216 # define EVP_F_RC2_MAGIC_TO_METH 109 # define EVP_F_RC5_CTRL 125 # define EVP_F_S390X_AES_GCM_CTRL 201