Fix a collision in function err numbers
authorPaul Yang <yang.yang@baishancloud.com>
Mon, 5 Nov 2018 15:08:34 +0000 (23:08 +0800)
committerPaul Yang <yang.yang@baishancloud.com>
Mon, 5 Nov 2018 15:08:34 +0000 (23:08 +0800)
'make update' complains about this

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7571)

crypto/err/openssl.txt
include/openssl/evperr.h

index b5a441a..49e4875 100644 (file)
@@ -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
index b5064fd..fff78cc 100644 (file)
@@ -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