From: Matt Caswell Date: Wed, 25 Jan 2017 15:17:42 +0000 (+0000) Subject: Fix a merge error X-Git-Tag: OpenSSL_1_1_1-pre1~2606 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b1531d8e6cc95837e38b10d875ae64144c6fdf7a;p=oweals%2Fopenssl.git Fix a merge error Clashing function code values in evp.h Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/2285) --- diff --git a/include/openssl/evp.h b/include/openssl/evp.h index 8252e25780..7f4b2d7488 100644 --- a/include/openssl/evp.h +++ b/include/openssl/evp.h @@ -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