diff options
| author | Matt Caswell <matt@openssl.org> | 2017-02-17 14:33:30 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-02-17 14:42:59 +0000 |
| commit | 331c16d95f442a19a77ae087afdf26b67c8468f0 (patch) | |
| tree | 0a15b657ecc9c2b0ca7ef4a1d4a0376d2a4557b2 | |
| parent | 73540f4729bb856ab066c6e7a57513a97e3ca36f (diff) | |
| download | openssl-331c16d95f442a19a77ae087afdf26b67c8468f0.tar.gz | |
Fix a merge error
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)
| -rw-r--r-- | include/openssl/ssl.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 |