From: Matt Caswell Date: Wed, 15 Feb 2017 09:44:46 +0000 (+0000) Subject: Fix merge issue X-Git-Tag: OpenSSL_1_1_1-pre1~2392 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=bb90d02a71c60bc16389fba4ff06965714b1826f;p=oweals%2Fopenssl.git Fix merge issue Causes make update to fail. Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/2634) --- diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index f2b6198972..89b4514cfb 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -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