Fix a merge error
authorMatt Caswell <matt@openssl.org>
Fri, 17 Feb 2017 14:33:30 +0000 (14:33 +0000)
committerMatt Caswell <matt@openssl.org>
Fri, 17 Feb 2017 14:42:59 +0000 (14:42 +0000)
Fix an error code clash due to a merge

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

include/openssl/ssl.h

index 5b8a0bb..1c58dcc 100644 (file)
@@ -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