The branch master has been updated
via 69b4c01fd26e6eb72b156ed3014522c3295a7669 (commit)
from 7193f8723e42e9b392bb1a60f423e593c8c79be9 (commit)
- Log -----------------------------------------------------------------
commit 69b4c01fd26e6eb72b156ed3014522c3295a7669
Author: Richard Levitte <[email protected]>
Date: Thu May 11 17:29:47 2017 +0200
Unclash clashing reason codes in ssl.h
Reviewed-by: Rich Salz <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/3441)
-----------------------------------------------------------------------
Summary of changes:
include/openssl/ssl.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 4558b17..18f3140 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -2650,7 +2650,7 @@ int ERR_load_SSL_strings(void);
# define SSL_R_INAPPROPRIATE_FALLBACK 373
# define SSL_R_INCONSISTENT_COMPRESSION 340
# define SSL_R_INCONSISTENT_EXTMS 104
-# define SSL_R_INVALID_ALERT 205
+# define SSL_R_INVALID_ALERT 209
# define SSL_R_INVALID_COMMAND 280
# define SSL_R_INVALID_COMPRESSION_ALGORITHM 341
# define SSL_R_INVALID_CONFIGURATION_NAME 113
@@ -2675,7 +2675,7 @@ int ERR_load_SSL_strings(void);
# define SSL_R_MISSING_RSA_SIGNING_CERT 170
# define SSL_R_MISSING_SIGALGS_EXTENSION 112
# define SSL_R_MISSING_SRP_PARAM 358
-# define SSL_R_MISSING_SUPPORTED_GROUPS_EXTENSION 209
+# define SSL_R_MISSING_SUPPORTED_GROUPS_EXTENSION 214
# define SSL_R_MISSING_TMP_DH_KEY 171
# define SSL_R_MISSING_TMP_ECDH_KEY 311
# define SSL_R_NOT_ON_RECORD_BOUNDARY 182
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
