The branch master has been updated
via bb90d02a71c60bc16389fba4ff06965714b1826f (commit)
from a34a9df0712ac27256ec48e6f88c61064613ac08 (commit)
- Log -----------------------------------------------------------------
commit bb90d02a71c60bc16389fba4ff06965714b1826f
Author: Matt Caswell <m...@openssl.org>
Date: Wed Feb 15 09:44:46 2017 +0000
Fix merge issue
Causes make update to fail.
Reviewed-by: Richard Levitte <levi...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2634)
-----------------------------------------------------------------------
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 f2b6198..89b4514 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
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
