From: Matt Caswell Date: Fri, 17 Feb 2017 14:33:30 +0000 (+0000) Subject: Fix a merge error X-Git-Tag: OpenSSL_1_1_1-pre1~2350 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=331c16d95f442a19a77ae087afdf26b67c8468f0;p=oweals%2Fopenssl.git Fix a merge error Fix an error code clash due to a merge Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/2665) --- diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index 5b8a0bbd68..1c58dcc855 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -2377,7 +2377,7 @@ int ERR_load_SSL_strings(void); # define SSL_F_TLS_PROCESS_HELLO_RETRY_REQUEST 511 # define SSL_F_TLS_PROCESS_INITIAL_SERVER_FLIGHT 442 # define SSL_F_TLS_PROCESS_KEY_EXCHANGE 365 -# define SSL_F_TLS_PROCESS_KEY_UPDATE 513 +# define SSL_F_TLS_PROCESS_KEY_UPDATE 518 # define SSL_F_TLS_PROCESS_NEW_SESSION_TICKET 366 # define SSL_F_TLS_PROCESS_NEXT_PROTO 383 # define SSL_F_TLS_PROCESS_SERVER_CERTIFICATE 367