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

Fix a merge error 

Clashing function code values in evp.h

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2285)
parent b153f092

include/openssl/evp.h

+1 −1
Changes for include/openssl/evp.h: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -1512,7 +1512,7 @@ int ERR_load_EVP_strings(void); 
# define EVP_F_EVP_PKEY_GET0_DSA                          120

# define EVP_F_EVP_PKEY_GET0_EC_KEY                       131

# define EVP_F_EVP_PKEY_GET0_HMAC                         183

# define EVP_F_EVP_PKEY_GET0_POLY1305                     169

# define EVP_F_EVP_PKEY_GET0_POLY1305                     184

# define EVP_F_EVP_PKEY_GET0_RSA                          121

# define EVP_F_EVP_PKEY_KEYGEN                            146

# define EVP_F_EVP_PKEY_KEYGEN_INIT                       147