[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  b1531d8e6cc95837e38b10d875ae64144c6fdf7a (commit)
      from  b153f0921bea38127de0b9440b0487db3004330d (commit)


- Log -----------------------------------------------------------------
commit b1531d8e6cc95837e38b10d875ae64144c6fdf7a
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Jan 25 15:17:42 2017 +0000

    Fix a merge error
    
    Clashing function code values in evp.h
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2285)

-----------------------------------------------------------------------

Summary of changes:
 include/openssl/evp.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/openssl/evp.h b/include/openssl/evp.h
index 8252e25..7f4b2d7 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