The branch master has been updated
via 331c16d95f442a19a77ae087afdf26b67c8468f0 (commit)
from 73540f4729bb856ab066c6e7a57513a97e3ca36f (commit)
- Log -----------------------------------------------------------------
commit 331c16d95f442a19a77ae087afdf26b67c8468f0
Author: Matt Caswell <m...@openssl.org>
Date: Fri Feb 17 14:33:30 2017 +0000
Fix a merge error
Fix an error code clash due to a merge
Reviewed-by: Richard Levitte <levi...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2665)
-----------------------------------------------------------------------
Summary of changes:
include/openssl/ssl.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 5b8a0bb..1c58dcc 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
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
