From 39f8a672e31888e8c617577a1fa5d2f9c382aa20 Mon Sep 17 00:00:00 2001 From: RafaelGSS Date: Wed, 2 Nov 2022 13:39:49 -0300 Subject: deps: update archs files for quictls/openssl-3.0.7+quic 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: https://github.com/nodejs/node/pull/45286 --- .../archs/linux-aarch64/asm_avx2/configdata.pm | 88 +++++++++++++++++++++- .../linux-aarch64/asm_avx2/crypto/aes/aesv8-armx.S | 30 ++++---- .../archs/linux-aarch64/asm_avx2/crypto/buildinf.h | 2 +- .../linux-aarch64/asm_avx2/include/openssl/bio.h | 1 + .../linux-aarch64/asm_avx2/include/openssl/err.h | 14 +++- .../asm_avx2/include/openssl/opensslv.h | 10 +-- .../archs/linux-aarch64/asm_avx2/openssl.gypi | 1 + 7 files changed, 120 insertions(+), 26 deletions(-) (limited to 'deps/openssl/config/archs/linux-aarch64/asm_avx2') diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux-aarch64/asm_avx2/configdata.pm index 4fa41af5960..cfa0bd9470f 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/configdata.pm @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.5+quic", + "full_version" => "3.0.7+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,7 +207,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-devcryptoeng 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", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "5 Jul 2022", + "release_date" => "1 Nov 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux-aarch64", - "version" => "3.0.5" + "version" => "3.0.7" ); our %target = ( "AR" => "ar", @@ -1275,12 +1275,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" }, @@ -1395,6 +1401,9 @@ our %unified_info = ( "test/provider_test" => { "noinst" => "1" }, + "test/punycode_test" => { + "noinst" => "1" + }, "test/rand_status_test" => { "noinst" => "1" }, @@ -1595,7 +1604,12 @@ our %unified_info = ( "OPENSSL_CPUID_OBJ" ], "providers/libdefault.a" => [ + "ECP_NISTZ256_ASM", + "KECCAK1600_ASM", "OPENSSL_CPUID_OBJ", + "SHA1_ASM", + "SHA256_ASM", + "SHA512_ASM", "VPAES_ASM" ], "providers/libfips.a" => [ @@ -2854,6 +2868,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" ], @@ -5200,6 +5217,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" ], @@ -7633,6 +7653,11 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/ext_internal_test" => [ + "libcrypto.a", + "libssl.a", + "test/libtestutil.a" + ], "test/fatalerrtest" => [ "libcrypto", "libssl", @@ -7642,6 +7667,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/fips_version_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/gmdifftest" => [ "libcrypto", "test/libtestutil.a" @@ -7797,6 +7826,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" @@ -9875,6 +9908,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", @@ -11781,6 +11815,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" ], @@ -14127,6 +14164,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" ], @@ -16436,6 +16476,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", @@ -18598,6 +18639,11 @@ our %unified_info = ( "include", "apps/include" ], + "test/ext_internal_test" => [ + ".", + "include", + "apps/include" + ], "test/fatalerrtest" => [ "include", "apps/include" @@ -18607,6 +18653,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/fips_version_test" => [ + "include", + "apps/include" + ], "test/gmdifftest" => [ "include", "apps/include" @@ -18897,6 +18947,10 @@ our %unified_info = ( "apps/include", "." ], + "test/punycode_test" => [ + "include", + "apps/include" + ], "test/rand_status_test" => [ "include", "apps/include" @@ -19443,6 +19497,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", @@ -20081,8 +20136,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", @@ -20121,6 +20178,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", @@ -24657,6 +24715,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" ], @@ -25079,6 +25140,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", @@ -26498,6 +26560,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" @@ -26511,6 +26579,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" ], @@ -26857,6 +26931,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" ], diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/aes/aesv8-armx.S b/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/aes/aesv8-armx.S index 2b68366d757..cd9cac97ca6 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/aes/aesv8-armx.S +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/aes/aesv8-armx.S @@ -1530,18 +1530,18 @@ aes_v8_ctr32_encrypt_blocks: #ifndef __ARMEB__ rev w8, w8 #endif + orr v1.16b,v0.16b,v0.16b add w10, w8, #1 + orr v18.16b,v0.16b,v0.16b + add w8, w8, #2 orr v6.16b,v0.16b,v0.16b rev w10, w10 - mov v6.s[3],w10 - add w8, w8, #2 - orr v1.16b,v6.16b,v6.16b + mov v1.s[3],w10 b.ls .Lctr32_tail rev w12, w8 - mov v6.s[3],w12 sub x2,x2,#3 // bias - orr v18.16b,v6.16b,v6.16b - cmp x2,#2 + mov v18.s[3],w12 + cmp x2,#32 b.lo .Loop3x_ctr32 add w13,w8,#1 @@ -1732,11 +1732,11 @@ aes_v8_ctr32_encrypt_blocks: aese v1.16b,v16.16b aesmc v5.16b,v1.16b ld1 {v2.16b},[x0],#16 - add w9,w8,#1 + orr v0.16b,v6.16b,v6.16b aese v18.16b,v16.16b aesmc v18.16b,v18.16b ld1 {v3.16b},[x0],#16 - rev w9,w9 + orr v1.16b,v6.16b,v6.16b aese v4.16b,v17.16b aesmc v4.16b,v4.16b aese v5.16b,v17.16b @@ -1745,6 +1745,8 @@ aes_v8_ctr32_encrypt_blocks: mov x7,x3 aese v18.16b,v17.16b aesmc v17.16b,v18.16b + orr v18.16b,v6.16b,v6.16b + add w9,w8,#1 aese v4.16b,v20.16b aesmc v4.16b,v4.16b aese v5.16b,v20.16b @@ -1760,22 +1762,20 @@ aes_v8_ctr32_encrypt_blocks: aese v5.16b,v21.16b aesmc v5.16b,v5.16b eor v19.16b,v19.16b,v7.16b - mov v6.s[3], w9 + rev w9,w9 aese v17.16b,v21.16b aesmc v17.16b,v17.16b - orr v0.16b,v6.16b,v6.16b + mov v0.s[3], w9 rev w10,w10 aese v4.16b,v22.16b aesmc v4.16b,v4.16b - mov v6.s[3], w10 - rev w12,w8 aese v5.16b,v22.16b aesmc v5.16b,v5.16b - orr v1.16b,v6.16b,v6.16b - mov v6.s[3], w12 + mov v1.s[3], w10 + rev w12,w8 aese v17.16b,v22.16b aesmc v17.16b,v17.16b - orr v18.16b,v6.16b,v6.16b + mov v18.s[3], w12 subs x2,x2,#3 aese v4.16b,v23.16b aese v5.16b,v23.16b diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/buildinf.h index 9ca81a17b33..a49687eca44 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-aarch64" -#define DATE "built on: Fri Jul 8 16:46:28 2022 UTC" +#define DATE "built on: Thu Nov 3 02:16:16 2022 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/bio.h b/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/bio.h index 7e527184b76..e16cf622c69 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/bio.h @@ -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, diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/err.h b/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/err.h index 3c7299dbbcf..2abf2483488 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/err.h +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/err.h @@ -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 @@ -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 */ diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/opensslv.h index 4af88bb2704..2089e479290 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/opensslv.h @@ -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 @@ -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 diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux-aarch64/asm_avx2/openssl.gypi index 42280002d20..78f30b0023f 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/openssl.gypi @@ -841,6 +841,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', -- cgit v1.2.3