diff options
| author | Matt Caswell <matt@openssl.org> | 2017-01-25 15:17:42 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-01-25 15:30:27 +0000 |
| commit | b1531d8e6cc95837e38b10d875ae64144c6fdf7a (patch) | |
| tree | 1e34b95af72b6458236e7ea99fbebb7cbfc5752c /include | |
| parent | b153f0921bea38127de0b9440b0487db3004330d (diff) | |
Fix a merge error
Clashing function code values in evp.h
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2285)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/evp.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 |