Commit 41eac612 authored by Paul Yang's avatar Paul Yang
Browse files

Fix a collision in function err numbers 



'make update' complains about this

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7571)
parent 75d47db4

crypto/err/openssl.txt

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

include/openssl/evperr.h

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