Skip to content

Commit

Permalink
deps: update archs files for quictls/openssl-3.0.7+quic
Browse files Browse the repository at this point in the history 
After an OpenSSL source update, all the config files need to be
regenerated and committed by:
    $ make -C deps/openssl/config clean
    $ make -C deps/openssl/config
    $ git add deps/openssl/config/archs
    $ git add deps/openssl/openssl
    $ git commit

CVE-ID: CVE-2022-3602, CVE-2022-3786
PR-URL: #45286
  • Loading branch information
@RafaelGSS @juanarbol
RafaelGSS authored and juanarbol committed Nov 3, 2022
1 parent 8021812 commit 39f8a67
Show file tree
Hide file tree
Showing 369 changed files with 5,926 additions and 49,779 deletions.
87 changes: 83 additions & 4 deletions deps/openssl/config/archs/BSD-x86/asm/configdata.pm
View file
Expand Up @@ -156,7 +156,7 @@ our %config = (
],
"dynamic_engines" => "0",
"ex_libs" => [],
"full_version" => "3.0.5+quic",
"full_version" => "3.0.7+quic",
"includes" => [],
"lflags" => [],
"lib_defines" => [
Expand Down Expand Up @@ -203,7 +203,7 @@ our %config = (
"openssl_sys_defines" => [],
"openssldir" => "",
"options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic",
"patch" => "5",
"patch" => "7",
"perl_archname" => "x86_64-linux-gnu-thread-multi",
"perl_cmd" => "/usr/bin/perl",
"perl_version" => "5.30.0",
Expand Down Expand Up @@ -255,11 +255,11 @@ our %config = (
"prerelease" => "",
"processor" => "",
"rc4_int" => "unsigned int",
"release_date" => "5 Jul 2022",
"release_date" => "1 Nov 2022",
"shlib_version" => "81.3",
"sourcedir" => ".",
"target" => "BSD-x86",
"version" => "3.0.5"
"version" => "3.0.7"
);
our %target = (
"AR" => "ar",
Expand Down Expand Up @@ -1266,12 +1266,18 @@ our %unified_info = (
"test/exptest" => {
"noinst" => "1"
},
"test/ext_internal_test" => {
"noinst" => "1"
},
"test/fatalerrtest" => {
"noinst" => "1"
},
"test/ffc_internal_test" => {
"noinst" => "1"
},
"test/fips_version_test" => {
"noinst" => "1"
},
"test/gmdifftest" => {
"noinst" => "1"
},
Expand Down Expand Up @@ -1386,6 +1392,9 @@ our %unified_info = (
"test/provider_test" => {
"noinst" => "1"
},
"test/punycode_test" => {
"noinst" => "1"
},
"test/rand_status_test" => {
"noinst" => "1"
},
Expand Down Expand Up @@ -1603,8 +1612,12 @@ our %unified_info = (
],
"providers/libdefault.a" => [
"AES_ASM",
"ECP_NISTZ256_ASM",
"OPENSSL_CPUID_OBJ",
"OPENSSL_IA32_SSE2",
"SHA1_ASM",
"SHA256_ASM",
"SHA512_ASM",
"VPAES_ASM"
],
"providers/libfips.a" => [
Expand Down Expand Up @@ -2873,6 +2886,9 @@ our %unified_info = (
"doc/html/man3/OPENSSL_fork_prepare.html" => [
"doc/man3/OPENSSL_fork_prepare.pod"
],
"doc/html/man3/OPENSSL_gmtime.html" => [
"doc/man3/OPENSSL_gmtime.pod"
],
"doc/html/man3/OPENSSL_hexchar2int.html" => [
"doc/man3/OPENSSL_hexchar2int.pod"
],
Expand Down Expand Up @@ -5219,6 +5235,9 @@ our %unified_info = (
"doc/man/man3/OPENSSL_fork_prepare.3" => [
"doc/man3/OPENSSL_fork_prepare.pod"
],
"doc/man/man3/OPENSSL_gmtime.3" => [
"doc/man3/OPENSSL_gmtime.pod"
],
"doc/man/man3/OPENSSL_hexchar2int.3" => [
"doc/man3/OPENSSL_hexchar2int.pod"
],
Expand Down Expand Up @@ -7652,6 +7671,11 @@ our %unified_info = (
"libcrypto",
"test/libtestutil.a"
],
"test/ext_internal_test" => [
"libcrypto.a",
"libssl.a",
"test/libtestutil.a"
],
"test/fatalerrtest" => [
"libcrypto",
"libssl",
Expand All @@ -7661,6 +7685,10 @@ our %unified_info = (
"libcrypto.a",
"test/libtestutil.a"
],
"test/fips_version_test" => [
"libcrypto",
"test/libtestutil.a"
],
"test/gmdifftest" => [
"libcrypto",
"test/libtestutil.a"
Expand Down Expand Up @@ -7816,6 +7844,10 @@ our %unified_info = (
"libcrypto.a",
"test/libtestutil.a"
],
"test/punycode_test" => [
"libcrypto.a",
"test/libtestutil.a"
],
"test/rand_status_test" => [
"libcrypto",
"test/libtestutil.a"
Expand Down Expand Up @@ -9897,6 +9929,7 @@ our %unified_info = (
"providers/implementations/digests/libdefault-lib-md5_prov.o",
"providers/implementations/digests/libdefault-lib-md5_sha1_prov.o",
"providers/implementations/digests/libdefault-lib-null_prov.o",
"providers/implementations/digests/libdefault-lib-ripemd_prov.o",
"providers/implementations/digests/libdefault-lib-sha2_prov.o",
"providers/implementations/digests/libdefault-lib-sha3_prov.o",
"providers/implementations/digests/libdefault-lib-sm3_prov.o",
Expand Down Expand Up @@ -11803,6 +11836,9 @@ our %unified_info = (
"doc/html/man3/OPENSSL_fork_prepare.html" => [
"doc/man3/OPENSSL_fork_prepare.pod"
],
"doc/html/man3/OPENSSL_gmtime.html" => [
"doc/man3/OPENSSL_gmtime.pod"
],
"doc/html/man3/OPENSSL_hexchar2int.html" => [
"doc/man3/OPENSSL_hexchar2int.pod"
],
Expand Down Expand Up @@ -14149,6 +14185,9 @@ our %unified_info = (
"doc/man/man3/OPENSSL_fork_prepare.3" => [
"doc/man3/OPENSSL_fork_prepare.pod"
],
"doc/man/man3/OPENSSL_gmtime.3" => [
"doc/man3/OPENSSL_gmtime.pod"
],
"doc/man/man3/OPENSSL_hexchar2int.3" => [
"doc/man3/OPENSSL_hexchar2int.pod"
],
Expand Down Expand Up @@ -16458,6 +16497,7 @@ our %unified_info = (
"doc/html/man3/OPENSSL_LH_stats.html",
"doc/html/man3/OPENSSL_config.html",
"doc/html/man3/OPENSSL_fork_prepare.html",
"doc/html/man3/OPENSSL_gmtime.html",
"doc/html/man3/OPENSSL_hexchar2int.html",
"doc/html/man3/OPENSSL_ia32cap.html",
"doc/html/man3/OPENSSL_init_crypto.html",
Expand Down Expand Up @@ -18557,6 +18597,11 @@ our %unified_info = (
"include",
"apps/include"
],
"test/ext_internal_test" => [
".",
"include",
"apps/include"
],
"test/fatalerrtest" => [
"include",
"apps/include"
Expand All @@ -18566,6 +18611,10 @@ our %unified_info = (
"include",
"apps/include"
],
"test/fips_version_test" => [
"include",
"apps/include"
],
"test/gmdifftest" => [
"include",
"apps/include"
Expand Down Expand Up @@ -18856,6 +18905,10 @@ our %unified_info = (
"apps/include",
"."
],
"test/punycode_test" => [
"include",
"apps/include"
],
"test/rand_status_test" => [
"include",
"apps/include"
Expand Down Expand Up @@ -19402,6 +19455,7 @@ our %unified_info = (
"doc/man/man3/OPENSSL_LH_stats.3",
"doc/man/man3/OPENSSL_config.3",
"doc/man/man3/OPENSSL_fork_prepare.3",
"doc/man/man3/OPENSSL_gmtime.3",
"doc/man/man3/OPENSSL_hexchar2int.3",
"doc/man/man3/OPENSSL_ia32cap.3",
"doc/man/man3/OPENSSL_init_crypto.3",
Expand Down Expand Up @@ -20040,8 +20094,10 @@ our %unified_info = (
"test/evp_test",
"test/exdatatest",
"test/exptest",
"test/ext_internal_test",
"test/fatalerrtest",
"test/ffc_internal_test",
"test/fips_version_test",
"test/gmdifftest",
"test/hexstr_test",
"test/hmactest",
Expand Down Expand Up @@ -20080,6 +20136,7 @@ our %unified_info = (
"test/provider_pkey_test",
"test/provider_status_test",
"test/provider_test",
"test/punycode_test",
"test/rand_status_test",
"test/rand_test",
"test/rc2test",
Expand Down Expand Up @@ -24626,6 +24683,9 @@ our %unified_info = (
"providers/implementations/digests/libdefault-lib-null_prov.o" => [
"providers/implementations/digests/null_prov.c"
],
"providers/implementations/digests/libdefault-lib-ripemd_prov.o" => [
"providers/implementations/digests/ripemd_prov.c"
],
"providers/implementations/digests/libdefault-lib-sha2_prov.o" => [
"providers/implementations/digests/sha2_prov.c"
],
Expand Down Expand Up @@ -25048,6 +25108,7 @@ our %unified_info = (
"providers/implementations/digests/libdefault-lib-md5_prov.o",
"providers/implementations/digests/libdefault-lib-md5_sha1_prov.o",
"providers/implementations/digests/libdefault-lib-null_prov.o",
"providers/implementations/digests/libdefault-lib-ripemd_prov.o",
"providers/implementations/digests/libdefault-lib-sha2_prov.o",
"providers/implementations/digests/libdefault-lib-sha3_prov.o",
"providers/implementations/digests/libdefault-lib-sm3_prov.o",
Expand Down Expand Up @@ -26469,6 +26530,12 @@ our %unified_info = (
"test/exptest-bin-exptest.o" => [
"test/exptest.c"
],
"test/ext_internal_test" => [
"test/ext_internal_test-bin-ext_internal_test.o"
],
"test/ext_internal_test-bin-ext_internal_test.o" => [
"test/ext_internal_test.c"
],
"test/fatalerrtest" => [
"test/fatalerrtest-bin-fatalerrtest.o",
"test/helpers/fatalerrtest-bin-ssltestlib.o"
Expand All @@ -26482,6 +26549,12 @@ our %unified_info = (
"test/ffc_internal_test-bin-ffc_internal_test.o" => [
"test/ffc_internal_test.c"
],
"test/fips_version_test" => [
"test/fips_version_test-bin-fips_version_test.o"
],
"test/fips_version_test-bin-fips_version_test.o" => [
"test/fips_version_test.c"
],
"test/gmdifftest" => [
"test/gmdifftest-bin-gmdifftest.o"
],
Expand Down Expand Up @@ -26828,6 +26901,12 @@ our %unified_info = (
"test/provider_test-bin-provider_test.o" => [
"test/provider_test.c"
],
"test/punycode_test" => [
"test/punycode_test-bin-punycode_test.o"
],
"test/punycode_test-bin-punycode_test.o" => [
"test/punycode_test.c"
],
"test/rand_status_test" => [
"test/rand_status_test-bin-rand_status_test.o"
],
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h
View file
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86"
#define DATE "built on: Fri Jul 8 16:43:57 2022 UTC"
#define DATE "built on: Thu Nov 3 02:13:54 2022 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
1 change: 1 addition & 0 deletions deps/openssl/config/archs/BSD-x86/asm/include/openssl/bio.h
View file
Expand Up @@ -819,6 +819,7 @@ void BIO_copy_next_retry(BIO *b);

# define ossl_bio__attr__(x)
# if defined(__GNUC__) && defined(__STDC_VERSION__) \
&& !defined(__MINGW32__) && !defined(__MINGW64__) \
&& !defined(__APPLE__)
/*
* Because we support the 'z' modifier, which made its appearance in C99,
Expand Down
14 changes: 13 additions & 1 deletion deps/openssl/config/archs/BSD-x86/asm/include/openssl/err.h
View file
@@ -1,5 +1,5 @@
/*
* Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
Expand Down Expand Up @@ -323,15 +323,27 @@ static ossl_unused ossl_inline int ERR_COMMON_ERROR(unsigned long errcode)
# define ERR_R_DSA_LIB (ERR_LIB_DSA/* 10 */ | ERR_RFLAG_COMMON)
# define ERR_R_X509_LIB (ERR_LIB_X509/* 11 */ | ERR_RFLAG_COMMON)
# define ERR_R_ASN1_LIB (ERR_LIB_ASN1/* 13 */ | ERR_RFLAG_COMMON)
# define ERR_R_CONF_LIB (ERR_LIB_CONF/* 14 */ | ERR_RFLAG_COMMON)
# define ERR_R_CRYPTO_LIB (ERR_LIB_CRYPTO/* 15 */ | ERR_RFLAG_COMMON)
# define ERR_R_EC_LIB (ERR_LIB_EC/* 16 */ | ERR_RFLAG_COMMON)
# define ERR_R_SSL_LIB (ERR_LIB_SSL/* 20 */ | ERR_RFLAG_COMMON)
# define ERR_R_BIO_LIB (ERR_LIB_BIO/* 32 */ | ERR_RFLAG_COMMON)
# define ERR_R_PKCS7_LIB (ERR_LIB_PKCS7/* 33 */ | ERR_RFLAG_COMMON)
# define ERR_R_X509V3_LIB (ERR_LIB_X509V3/* 34 */ | ERR_RFLAG_COMMON)
# define ERR_R_PKCS12_LIB (ERR_LIB_PKCS12/* 35 */ | ERR_RFLAG_COMMON)
# define ERR_R_RAND_LIB (ERR_LIB_RAND/* 36 */ | ERR_RFLAG_COMMON)
# define ERR_R_DSO_LIB (ERR_LIB_DSO/* 37 */ | ERR_RFLAG_COMMON)
# define ERR_R_ENGINE_LIB (ERR_LIB_ENGINE/* 38 */ | ERR_RFLAG_COMMON)
# define ERR_R_UI_LIB (ERR_LIB_UI/* 40 */ | ERR_RFLAG_COMMON)
# define ERR_R_ECDSA_LIB (ERR_LIB_ECDSA/* 42 */ | ERR_RFLAG_COMMON)
# define ERR_R_OSSL_STORE_LIB (ERR_LIB_OSSL_STORE/* 44 */ | ERR_RFLAG_COMMON)
# define ERR_R_CMS_LIB (ERR_LIB_CMS/* 46 */ | ERR_RFLAG_COMMON)
# define ERR_R_TS_LIB (ERR_LIB_TS/* 47 */ | ERR_RFLAG_COMMON)
# define ERR_R_CT_LIB (ERR_LIB_CT/* 50 */ | ERR_RFLAG_COMMON)
# define ERR_R_PROV_LIB (ERR_LIB_PROV/* 57 */ | ERR_RFLAG_COMMON)
# define ERR_R_ESS_LIB (ERR_LIB_ESS/* 54 */ | ERR_RFLAG_COMMON)
# define ERR_R_CMP_LIB (ERR_LIB_CMP/* 58 */ | ERR_RFLAG_COMMON)
# define ERR_R_OSSL_ENCODER_LIB (ERR_LIB_OSSL_ENCODER/* 59 */ | ERR_RFLAG_COMMON)
# define ERR_R_OSSL_DECODER_LIB (ERR_LIB_OSSL_DECODER/* 60 */ | ERR_RFLAG_COMMON)

/* Other common error codes, range 256..2^ERR_RFLAGS_OFFSET-1 */
Expand Down
10 changes: 5 additions & 5 deletions deps/openssl/config/archs/BSD-x86/asm/include/openssl/opensslv.h
View file
Expand Up @@ -29,7 +29,7 @@ extern "C" {
*/
# define OPENSSL_VERSION_MAJOR 3
# define OPENSSL_VERSION_MINOR 0
# define OPENSSL_VERSION_PATCH 5
# define OPENSSL_VERSION_PATCH 7

/*
* Additional version information
Expand Down Expand Up @@ -74,21 +74,21 @@ extern "C" {
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
*/
# define OPENSSL_VERSION_STR "3.0.5"
# define OPENSSL_FULL_VERSION_STR "3.0.5+quic"
# define OPENSSL_VERSION_STR "3.0.7"
# define OPENSSL_FULL_VERSION_STR "3.0.7+quic"

/*
* SECTION 3: ADDITIONAL METADATA
*
* These strings are defined separately to allow them to be parsable.
*/
# define OPENSSL_RELEASE_DATE "5 Jul 2022"
# define OPENSSL_RELEASE_DATE "1 Nov 2022"

/*
* SECTION 4: BACKWARD COMPATIBILITY
*/

# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.5+quic 5 Jul 2022"
# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.7+quic 1 Nov 2022"

/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
# ifdef OPENSSL_VERSION_PRE_RELEASE
Expand Down
1 change: 1 addition & 0 deletions deps/openssl/config/archs/BSD-x86/asm/openssl.gypi
View file
Expand Up @@ -831,6 +831,7 @@
'openssl/providers/implementations/digests/md5_prov.c',
'openssl/providers/implementations/digests/md5_sha1_prov.c',
'openssl/providers/implementations/digests/null_prov.c',
'openssl/providers/implementations/digests/ripemd_prov.c',
'openssl/providers/implementations/digests/sha2_prov.c',
'openssl/providers/implementations/digests/sha3_prov.c',
'openssl/providers/implementations/digests/sm3_prov.c',
Expand Down

0 comments on commit 39f8a67

Please sign in to comment.