Fix merge issue
authorMatt Caswell <matt@openssl.org>
Wed, 15 Feb 2017 09:44:46 +0000 (09:44 +0000)
committerMatt Caswell <matt@openssl.org>
Wed, 15 Feb 2017 10:50:39 +0000 (10:50 +0000)
Causes make update to fail.

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2634)

include/openssl/ssl.h

index f2b6198..89b4514 100644 (file)
@@ -2259,7 +2259,7 @@ int ERR_load_SSL_strings(void);
 # define SSL_F_TLS1_PRF                                   284
 # define SSL_F_TLS1_SETUP_KEY_BLOCK                       211
 # define SSL_F_TLS1_SET_SERVER_SIGALGS                    335
-# define SSL_F_TLS_CHOOSE_SIGALG                          510
+# define SSL_F_TLS_CHOOSE_SIGALG                          513
 # define SSL_F_TLS_CLIENT_KEY_EXCHANGE_POST_WORK          354
 # define SSL_F_TLS_COLLECT_EXTENSIONS                     435
 # define SSL_F_TLS_CONSTRUCT_CERTIFICATE_REQUEST          372