From 8285ccd8fcbf489c46cd95c0331c243a76a2447d Mon Sep 17 00:00:00 2001 From: David Benjamin Date: Tue, 15 Jan 2019 15:21:44 -0600 Subject: [PATCH] Fix SSL_R_TOO_MUCH_READ_EARLY_DATA. https://boringssl-review.googlesource.com/15164 allocated a new error code by hand, rather than using the make_errors.go script, which caused it to clobber the error space reserved for alerts. Change-Id: Ife92c45da2c1d3c5506439bd5781ae91240d16d8 Reviewed-on: https://boringssl-review.googlesource.com/c/34307 Commit-Queue: David Benjamin Commit-Queue: Adam Langley Reviewed-by: Adam Langley --- crypto/err/ssl.errordata | 2 +- include/openssl/ssl.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crypto/err/ssl.errordata b/crypto/err/ssl.errordata index 171b9c703..202d9b835 100644 --- a/crypto/err/ssl.errordata +++ b/crypto/err/ssl.errordata @@ -193,7 +193,7 @@ SSL,218,TLS_RSA_ENCRYPTED_VALUE_LENGTH_IS_WRONG SSL,219,TOO_MANY_EMPTY_FRAGMENTS SSL,260,TOO_MANY_KEY_UPDATES SSL,220,TOO_MANY_WARNING_ALERTS -SSL,1117,TOO_MUCH_READ_EARLY_DATA +SSL,300,TOO_MUCH_READ_EARLY_DATA SSL,270,TOO_MUCH_SKIPPED_EARLY_DATA SSL,221,UNABLE_TO_FIND_ECDH_PARAMETERS SSL,293,UNCOMPRESSED_CERT_TOO_LARGE diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index a011e0f67..f09ffa4ba 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -4932,6 +4932,7 @@ BSSL_NAMESPACE_END #define SSL_R_TLS13_DOWNGRADE 297 #define SSL_R_QUIC_INTERNAL_ERROR 298 #define SSL_R_WRONG_ENCRYPTION_LEVEL_RECEIVED 299 +#define SSL_R_TOO_MUCH_READ_EARLY_DATA 300 #define SSL_R_SSLV3_ALERT_CLOSE_NOTIFY 1000 #define SSL_R_SSLV3_ALERT_UNEXPECTED_MESSAGE 1010 #define SSL_R_SSLV3_ALERT_BAD_RECORD_MAC 1020 @@ -4964,6 +4965,5 @@ BSSL_NAMESPACE_END #define SSL_R_TLSV1_BAD_CERTIFICATE_HASH_VALUE 1114 #define SSL_R_TLSV1_UNKNOWN_PSK_IDENTITY 1115 #define SSL_R_TLSV1_CERTIFICATE_REQUIRED 1116 -#define SSL_R_TOO_MUCH_READ_EARLY_DATA 1117 #endif // OPENSSL_HEADER_SSL_H