projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a collision in function err numbers
[openssl.git]
/
include
/
openssl
/
evperr.h
diff --git
a/include/openssl/evperr.h
b/include/openssl/evperr.h
index b5064fdffe42de1b97011df554b1371def3b6085..fff78cc47345c568cb92e2236da89cc5c6ba9cfd 100644
(file)
--- 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_PKCS5_V2_SCRYPT_KEYIVGEN 180
# define EVP_F_PKEY_MAC_INIT 214
# define EVP_F_PKEY_SET_TYPE 158
-# define EVP_F_POLY1305_CTRL 21
5
+# define EVP_F_POLY1305_CTRL 21
6
# define EVP_F_RC2_MAGIC_TO_METH 109
# define EVP_F_RC5_CTRL 125
# define EVP_F_S390X_AES_GCM_CTRL 201
# define EVP_F_RC2_MAGIC_TO_METH 109
# define EVP_F_RC5_CTRL 125
# define EVP_F_S390X_AES_GCM_CTRL 201