From: Matt Caswell Date: Thu, 20 Oct 2022 16:12:20 +0000 (+0100) Subject: Fix make update X-Git-Tag: openssl-3.2.0-alpha1~1870 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c153d8722d52ac6faa0d98873060272e5f160ea;p=thirdparty%2Fopenssl.git Fix make update The recent DTLS write record layer code and the certificate compression code both added new SSL_R_ reason codes. The numbers are conflicting due to rebase issues and causing make update to fail. Reviewed-by: Hugo Landau Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/19457) --- diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt index 9cf7cb881bf..86a38e56705 100644 --- a/crypto/err/openssl.txt +++ b/crypto/err/openssl.txt @@ -1271,7 +1271,7 @@ SSL_R_AT_LEAST_TLS_1_2_NEEDED_IN_SUITEB_MODE:158:\ at least (D)TLS 1.2 needed in Suite B mode SSL_R_BAD_CHANGE_CIPHER_SPEC:103:bad change cipher spec SSL_R_BAD_CIPHER:186:bad cipher -SSL_R_BAD_COMPRESSION_ALGORITHM:326:bad compression algorithm +SSL_R_BAD_COMPRESSION_ALGORITHM:327:bad compression algorithm SSL_R_BAD_DATA:390:bad data SSL_R_BAD_DATA_RETURNED_BY_CALLBACK:106:bad data returned by callback SSL_R_BAD_DECOMPRESSION:107:bad decompression diff --git a/include/openssl/sslerr.h b/include/openssl/sslerr.h index 080aa241504..8c5d1be86ab 100644 --- a/include/openssl/sslerr.h +++ b/include/openssl/sslerr.h @@ -239,7 +239,7 @@ # define SSL_R_REQUIRED_COMPRESSION_ALGORITHM_MISSING 342 # define SSL_R_SCSV_RECEIVED_WHEN_RENEGOTIATING 345 # define SSL_R_SCT_VERIFICATION_FAILED 208 -# define SSL_R_SEQUENCE_CTR_WRAPPED 326 +# define SSL_R_SEQUENCE_CTR_WRAPPED 327 # define SSL_R_SERVERHELLO_TLSEXT 275 # define SSL_R_SESSION_ID_CONTEXT_UNINITIALIZED 277 # define SSL_R_SHUTDOWN_WHILE_IN_INIT 407