Skip to content

Commit e58e8d7

Browse files
RafaelGSSRafaelGSS
committed
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: nodejs/node#45286
1 parent 85f4548 commit e58e8d7

File tree

369 files changed

+5926
-49779
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

369 files changed

+5926
-49779
lines changed

‎deps/openssl/config/archs/BSD-x86/asm/configdata.pm

Lines changed: 83 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ our %config = (
156156
],
157157
"dynamic_engines" => "0",
158158
"ex_libs" => [],
159-
"full_version" => "3.0.5+quic",
159+
"full_version" => "3.0.7+quic",
160160
"includes" => [],
161161
"lflags" => [],
162162
"lib_defines" => [
@@ -203,7 +203,7 @@ our %config = (
203203
"openssl_sys_defines" => [],
204204
"openssldir" => "",
205205
"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",
206-
"patch" => "5",
206+
"patch" => "7",
207207
"perl_archname" => "x86_64-linux-gnu-thread-multi",
208208
"perl_cmd" => "/usr/bin/perl",
209209
"perl_version" => "5.30.0",
@@ -255,11 +255,11 @@ our %config = (
255255
"prerelease" => "",
256256
"processor" => "",
257257
"rc4_int" => "unsigned int",
258-
"release_date" => "5 Jul 2022",
258+
"release_date" => "1 Nov 2022",
259259
"shlib_version" => "81.3",
260260
"sourcedir" => ".",
261261
"target" => "BSD-x86",
262-
"version" => "3.0.5"
262+
"version" => "3.0.7"
263263
);
264264
our %target = (
265265
"AR" => "ar",
@@ -1266,12 +1266,18 @@ our %unified_info = (
12661266
"test/exptest" => {
12671267
"noinst" => "1"
12681268
},
1269+
"test/ext_internal_test" => {
1270+
"noinst" => "1"
1271+
},
12691272
"test/fatalerrtest" => {
12701273
"noinst" => "1"
12711274
},
12721275
"test/ffc_internal_test" => {
12731276
"noinst" => "1"
12741277
},
1278+
"test/fips_version_test" => {
1279+
"noinst" => "1"
1280+
},
12751281
"test/gmdifftest" => {
12761282
"noinst" => "1"
12771283
},
@@ -1386,6 +1392,9 @@ our %unified_info = (
13861392
"test/provider_test" => {
13871393
"noinst" => "1"
13881394
},
1395+
"test/punycode_test" => {
1396+
"noinst" => "1"
1397+
},
13891398
"test/rand_status_test" => {
13901399
"noinst" => "1"
13911400
},
@@ -1603,8 +1612,12 @@ our %unified_info = (
16031612
],
16041613
"providers/libdefault.a" => [
16051614
"AES_ASM",
1615+
"ECP_NISTZ256_ASM",
16061616
"OPENSSL_CPUID_OBJ",
16071617
"OPENSSL_IA32_SSE2",
1618+
"SHA1_ASM",
1619+
"SHA256_ASM",
1620+
"SHA512_ASM",
16081621
"VPAES_ASM"
16091622
],
16101623
"providers/libfips.a" => [
@@ -2873,6 +2886,9 @@ our %unified_info = (
28732886
"doc/html/man3/OPENSSL_fork_prepare.html" => [
28742887
"doc/man3/OPENSSL_fork_prepare.pod"
28752888
],
2889+
"doc/html/man3/OPENSSL_gmtime.html" => [
2890+
"doc/man3/OPENSSL_gmtime.pod"
2891+
],
28762892
"doc/html/man3/OPENSSL_hexchar2int.html" => [
28772893
"doc/man3/OPENSSL_hexchar2int.pod"
28782894
],
@@ -5219,6 +5235,9 @@ our %unified_info = (
52195235
"doc/man/man3/OPENSSL_fork_prepare.3" => [
52205236
"doc/man3/OPENSSL_fork_prepare.pod"
52215237
],
5238+
"doc/man/man3/OPENSSL_gmtime.3" => [
5239+
"doc/man3/OPENSSL_gmtime.pod"
5240+
],
52225241
"doc/man/man3/OPENSSL_hexchar2int.3" => [
52235242
"doc/man3/OPENSSL_hexchar2int.pod"
52245243
],
@@ -7652,6 +7671,11 @@ our %unified_info = (
76527671
"libcrypto",
76537672
"test/libtestutil.a"
76547673
],
7674+
"test/ext_internal_test" => [
7675+
"libcrypto.a",
7676+
"libssl.a",
7677+
"test/libtestutil.a"
7678+
],
76557679
"test/fatalerrtest" => [
76567680
"libcrypto",
76577681
"libssl",
@@ -7661,6 +7685,10 @@ our %unified_info = (
76617685
"libcrypto.a",
76627686
"test/libtestutil.a"
76637687
],
7688+
"test/fips_version_test" => [
7689+
"libcrypto",
7690+
"test/libtestutil.a"
7691+
],
76647692
"test/gmdifftest" => [
76657693
"libcrypto",
76667694
"test/libtestutil.a"
@@ -7816,6 +7844,10 @@ our %unified_info = (
78167844
"libcrypto.a",
78177845
"test/libtestutil.a"
78187846
],
7847+
"test/punycode_test" => [
7848+
"libcrypto.a",
7849+
"test/libtestutil.a"
7850+
],
78197851
"test/rand_status_test" => [
78207852
"libcrypto",
78217853
"test/libtestutil.a"
@@ -9897,6 +9929,7 @@ our %unified_info = (
98979929
"providers/implementations/digests/libdefault-lib-md5_prov.o",
98989930
"providers/implementations/digests/libdefault-lib-md5_sha1_prov.o",
98999931
"providers/implementations/digests/libdefault-lib-null_prov.o",
9932+
"providers/implementations/digests/libdefault-lib-ripemd_prov.o",
99009933
"providers/implementations/digests/libdefault-lib-sha2_prov.o",
99019934
"providers/implementations/digests/libdefault-lib-sha3_prov.o",
99029935
"providers/implementations/digests/libdefault-lib-sm3_prov.o",
@@ -11803,6 +11836,9 @@ our %unified_info = (
1180311836
"doc/html/man3/OPENSSL_fork_prepare.html" => [
1180411837
"doc/man3/OPENSSL_fork_prepare.pod"
1180511838
],
11839+
"doc/html/man3/OPENSSL_gmtime.html" => [
11840+
"doc/man3/OPENSSL_gmtime.pod"
11841+
],
1180611842
"doc/html/man3/OPENSSL_hexchar2int.html" => [
1180711843
"doc/man3/OPENSSL_hexchar2int.pod"
1180811844
],
@@ -14149,6 +14185,9 @@ our %unified_info = (
1414914185
"doc/man/man3/OPENSSL_fork_prepare.3" => [
1415014186
"doc/man3/OPENSSL_fork_prepare.pod"
1415114187
],
14188+
"doc/man/man3/OPENSSL_gmtime.3" => [
14189+
"doc/man3/OPENSSL_gmtime.pod"
14190+
],
1415214191
"doc/man/man3/OPENSSL_hexchar2int.3" => [
1415314192
"doc/man3/OPENSSL_hexchar2int.pod"
1415414193
],
@@ -16458,6 +16497,7 @@ our %unified_info = (
1645816497
"doc/html/man3/OPENSSL_LH_stats.html",
1645916498
"doc/html/man3/OPENSSL_config.html",
1646016499
"doc/html/man3/OPENSSL_fork_prepare.html",
16500+
"doc/html/man3/OPENSSL_gmtime.html",
1646116501
"doc/html/man3/OPENSSL_hexchar2int.html",
1646216502
"doc/html/man3/OPENSSL_ia32cap.html",
1646316503
"doc/html/man3/OPENSSL_init_crypto.html",
@@ -18557,6 +18597,11 @@ our %unified_info = (
1855718597
"include",
1855818598
"apps/include"
1855918599
],
18600+
"test/ext_internal_test" => [
18601+
".",
18602+
"include",
18603+
"apps/include"
18604+
],
1856018605
"test/fatalerrtest" => [
1856118606
"include",
1856218607
"apps/include"
@@ -18566,6 +18611,10 @@ our %unified_info = (
1856618611
"include",
1856718612
"apps/include"
1856818613
],
18614+
"test/fips_version_test" => [
18615+
"include",
18616+
"apps/include"
18617+
],
1856918618
"test/gmdifftest" => [
1857018619
"include",
1857118620
"apps/include"
@@ -18856,6 +18905,10 @@ our %unified_info = (
1885618905
"apps/include",
1885718906
"."
1885818907
],
18908+
"test/punycode_test" => [
18909+
"include",
18910+
"apps/include"
18911+
],
1885918912
"test/rand_status_test" => [
1886018913
"include",
1886118914
"apps/include"
@@ -19402,6 +19455,7 @@ our %unified_info = (
1940219455
"doc/man/man3/OPENSSL_LH_stats.3",
1940319456
"doc/man/man3/OPENSSL_config.3",
1940419457
"doc/man/man3/OPENSSL_fork_prepare.3",
19458+
"doc/man/man3/OPENSSL_gmtime.3",
1940519459
"doc/man/man3/OPENSSL_hexchar2int.3",
1940619460
"doc/man/man3/OPENSSL_ia32cap.3",
1940719461
"doc/man/man3/OPENSSL_init_crypto.3",
@@ -20040,8 +20094,10 @@ our %unified_info = (
2004020094
"test/evp_test",
2004120095
"test/exdatatest",
2004220096
"test/exptest",
20097+
"test/ext_internal_test",
2004320098
"test/fatalerrtest",
2004420099
"test/ffc_internal_test",
20100+
"test/fips_version_test",
2004520101
"test/gmdifftest",
2004620102
"test/hexstr_test",
2004720103
"test/hmactest",
@@ -20080,6 +20136,7 @@ our %unified_info = (
2008020136
"test/provider_pkey_test",
2008120137
"test/provider_status_test",
2008220138
"test/provider_test",
20139+
"test/punycode_test",
2008320140
"test/rand_status_test",
2008420141
"test/rand_test",
2008520142
"test/rc2test",
@@ -24626,6 +24683,9 @@ our %unified_info = (
2462624683
"providers/implementations/digests/libdefault-lib-null_prov.o" => [
2462724684
"providers/implementations/digests/null_prov.c"
2462824685
],
24686+
"providers/implementations/digests/libdefault-lib-ripemd_prov.o" => [
24687+
"providers/implementations/digests/ripemd_prov.c"
24688+
],
2462924689
"providers/implementations/digests/libdefault-lib-sha2_prov.o" => [
2463024690
"providers/implementations/digests/sha2_prov.c"
2463124691
],
@@ -25048,6 +25108,7 @@ our %unified_info = (
2504825108
"providers/implementations/digests/libdefault-lib-md5_prov.o",
2504925109
"providers/implementations/digests/libdefault-lib-md5_sha1_prov.o",
2505025110
"providers/implementations/digests/libdefault-lib-null_prov.o",
25111+
"providers/implementations/digests/libdefault-lib-ripemd_prov.o",
2505125112
"providers/implementations/digests/libdefault-lib-sha2_prov.o",
2505225113
"providers/implementations/digests/libdefault-lib-sha3_prov.o",
2505325114
"providers/implementations/digests/libdefault-lib-sm3_prov.o",
@@ -26469,6 +26530,12 @@ our %unified_info = (
2646926530
"test/exptest-bin-exptest.o" => [
2647026531
"test/exptest.c"
2647126532
],
26533+
"test/ext_internal_test" => [
26534+
"test/ext_internal_test-bin-ext_internal_test.o"
26535+
],
26536+
"test/ext_internal_test-bin-ext_internal_test.o" => [
26537+
"test/ext_internal_test.c"
26538+
],
2647226539
"test/fatalerrtest" => [
2647326540
"test/fatalerrtest-bin-fatalerrtest.o",
2647426541
"test/helpers/fatalerrtest-bin-ssltestlib.o"
@@ -26482,6 +26549,12 @@ our %unified_info = (
2648226549
"test/ffc_internal_test-bin-ffc_internal_test.o" => [
2648326550
"test/ffc_internal_test.c"
2648426551
],
26552+
"test/fips_version_test" => [
26553+
"test/fips_version_test-bin-fips_version_test.o"
26554+
],
26555+
"test/fips_version_test-bin-fips_version_test.o" => [
26556+
"test/fips_version_test.c"
26557+
],
2648526558
"test/gmdifftest" => [
2648626559
"test/gmdifftest-bin-gmdifftest.o"
2648726560
],
@@ -26828,6 +26901,12 @@ our %unified_info = (
2682826901
"test/provider_test-bin-provider_test.o" => [
2682926902
"test/provider_test.c"
2683026903
],
26904+
"test/punycode_test" => [
26905+
"test/punycode_test-bin-punycode_test.o"
26906+
],
26907+
"test/punycode_test-bin-punycode_test.o" => [
26908+
"test/punycode_test.c"
26909+
],
2683126910
"test/rand_status_test" => [
2683226911
"test/rand_status_test-bin-rand_status_test.o"
2683326912
],

‎deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212

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

1616
/*
1717
* Generate compiler_flags as an array of individual characters. This is a

‎deps/openssl/config/archs/BSD-x86/asm/include/openssl/bio.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -819,6 +819,7 @@ void BIO_copy_next_retry(BIO *b);
819819

820820
# define ossl_bio__attr__(x)
821821
# if defined(__GNUC__) && defined(__STDC_VERSION__) \
822+
&& !defined(__MINGW32__) && !defined(__MINGW64__) \
822823
&& !defined(__APPLE__)
823824
/*
824825
* Because we support the 'z' modifier, which made its appearance in C99,

‎deps/openssl/config/archs/BSD-x86/asm/include/openssl/err.h

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
2+
* Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
33
*
44
* Licensed under the Apache License 2.0 (the "License"). You may not use
55
* 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)
323323
# define ERR_R_DSA_LIB (ERR_LIB_DSA/* 10 */ | ERR_RFLAG_COMMON)
324324
# define ERR_R_X509_LIB (ERR_LIB_X509/* 11 */ | ERR_RFLAG_COMMON)
325325
# define ERR_R_ASN1_LIB (ERR_LIB_ASN1/* 13 */ | ERR_RFLAG_COMMON)
326+
# define ERR_R_CONF_LIB (ERR_LIB_CONF/* 14 */ | ERR_RFLAG_COMMON)
326327
# define ERR_R_CRYPTO_LIB (ERR_LIB_CRYPTO/* 15 */ | ERR_RFLAG_COMMON)
327328
# define ERR_R_EC_LIB (ERR_LIB_EC/* 16 */ | ERR_RFLAG_COMMON)
329+
# define ERR_R_SSL_LIB (ERR_LIB_SSL/* 20 */ | ERR_RFLAG_COMMON)
328330
# define ERR_R_BIO_LIB (ERR_LIB_BIO/* 32 */ | ERR_RFLAG_COMMON)
329331
# define ERR_R_PKCS7_LIB (ERR_LIB_PKCS7/* 33 */ | ERR_RFLAG_COMMON)
330332
# define ERR_R_X509V3_LIB (ERR_LIB_X509V3/* 34 */ | ERR_RFLAG_COMMON)
333+
# define ERR_R_PKCS12_LIB (ERR_LIB_PKCS12/* 35 */ | ERR_RFLAG_COMMON)
334+
# define ERR_R_RAND_LIB (ERR_LIB_RAND/* 36 */ | ERR_RFLAG_COMMON)
335+
# define ERR_R_DSO_LIB (ERR_LIB_DSO/* 37 */ | ERR_RFLAG_COMMON)
331336
# define ERR_R_ENGINE_LIB (ERR_LIB_ENGINE/* 38 */ | ERR_RFLAG_COMMON)
332337
# define ERR_R_UI_LIB (ERR_LIB_UI/* 40 */ | ERR_RFLAG_COMMON)
333338
# define ERR_R_ECDSA_LIB (ERR_LIB_ECDSA/* 42 */ | ERR_RFLAG_COMMON)
334339
# define ERR_R_OSSL_STORE_LIB (ERR_LIB_OSSL_STORE/* 44 */ | ERR_RFLAG_COMMON)
340+
# define ERR_R_CMS_LIB (ERR_LIB_CMS/* 46 */ | ERR_RFLAG_COMMON)
341+
# define ERR_R_TS_LIB (ERR_LIB_TS/* 47 */ | ERR_RFLAG_COMMON)
342+
# define ERR_R_CT_LIB (ERR_LIB_CT/* 50 */ | ERR_RFLAG_COMMON)
343+
# define ERR_R_PROV_LIB (ERR_LIB_PROV/* 57 */ | ERR_RFLAG_COMMON)
344+
# define ERR_R_ESS_LIB (ERR_LIB_ESS/* 54 */ | ERR_RFLAG_COMMON)
345+
# define ERR_R_CMP_LIB (ERR_LIB_CMP/* 58 */ | ERR_RFLAG_COMMON)
346+
# define ERR_R_OSSL_ENCODER_LIB (ERR_LIB_OSSL_ENCODER/* 59 */ | ERR_RFLAG_COMMON)
335347
# define ERR_R_OSSL_DECODER_LIB (ERR_LIB_OSSL_DECODER/* 60 */ | ERR_RFLAG_COMMON)
336348

337349
/* Other common error codes, range 256..2^ERR_RFLAGS_OFFSET-1 */

‎deps/openssl/config/archs/BSD-x86/asm/include/openssl/opensslv.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ extern "C" {
2929
*/
3030
# define OPENSSL_VERSION_MAJOR 3
3131
# define OPENSSL_VERSION_MINOR 0
32-
# define OPENSSL_VERSION_PATCH 5
32+
# define OPENSSL_VERSION_PATCH 7
3333

3434
/*
3535
* Additional version information
@@ -74,21 +74,21 @@ extern "C" {
7474
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
7575
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
7676
*/
77-
# define OPENSSL_VERSION_STR "3.0.5"
78-
# define OPENSSL_FULL_VERSION_STR "3.0.5+quic"
77+
# define OPENSSL_VERSION_STR "3.0.7"
78+
# define OPENSSL_FULL_VERSION_STR "3.0.7+quic"
7979

8080
/*
8181
* SECTION 3: ADDITIONAL METADATA
8282
*
8383
* These strings are defined separately to allow them to be parsable.
8484
*/
85-
# define OPENSSL_RELEASE_DATE "5 Jul 2022"
85+
# define OPENSSL_RELEASE_DATE "1 Nov 2022"
8686

8787
/*
8888
* SECTION 4: BACKWARD COMPATIBILITY
8989
*/
9090

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

9393
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
9494
# ifdef OPENSSL_VERSION_PRE_RELEASE

‎deps/openssl/config/archs/BSD-x86/asm/openssl.gypi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -831,6 +831,7 @@
831831
'openssl/providers/implementations/digests/md5_prov.c',
832832
'openssl/providers/implementations/digests/md5_sha1_prov.c',
833833
'openssl/providers/implementations/digests/null_prov.c',
834+
'openssl/providers/implementations/digests/ripemd_prov.c',
834835
'openssl/providers/implementations/digests/sha2_prov.c',
835836
'openssl/providers/implementations/digests/sha3_prov.c',
836837
'openssl/providers/implementations/digests/sm3_prov.c',

0 commit comments

Comments
 (0)