Skip to content

Commit 35fe144

Browse files
richardlaudanielleadams
richardlau
authored and
danielleadams
committed
deps: update archs files for quictls/openssl-3.0.1+quic
After an OpenSSL source update, all the config files need to be regenerated and committed by: $ make -C deps/openssl/config $ git add deps/openssl/config/archs $ git add deps/openssl/openssl $ git commit PR-URL: #41177 Refs: quictls/openssl#69 Refs: https://mta.openssl.org/pipermail/openssl-announce/2021-December/000212.html Reviewed-By: Danielle Adams <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: Derek Lewis <[email protected]>
1 parent 0b21034 commit 35fe144

File tree

301 files changed

+5200
-2531
lines changed

Some content is hidden

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

301 files changed

+5200
-2531
lines changed

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

+69-23
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.0+quic",
159+
"full_version" => "3.0.1+quic",
160160
"includes" => [],
161161
"lflags" => [],
162162
"lib_defines" => [
@@ -203,10 +203,10 @@ 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" => "0",
207-
"perl_archname" => "x86_64-linux-thread-multi",
206+
"patch" => "1",
207+
"perl_archname" => "x86_64-linux-gnu-thread-multi",
208208
"perl_cmd" => "/usr/bin/perl",
209-
"perl_version" => "5.32.1",
209+
"perl_version" => "5.30.0",
210210
"perlargv" => [
211211
"no-comp",
212212
"no-shared",
@@ -255,11 +255,11 @@ our %config = (
255255
"prerelease" => "",
256256
"processor" => "",
257257
"rc4_int" => "unsigned int",
258-
"release_date" => "7 sep 2021",
258+
"release_date" => "14 Dec 2021",
259259
"shlib_version" => "81.3",
260260
"sourcedir" => ".",
261261
"target" => "BSD-x86",
262-
"version" => "3.0.0"
262+
"version" => "3.0.1"
263263
);
264264
our %target = (
265265
"AR" => "ar",
@@ -1366,6 +1366,9 @@ our %unified_info = (
13661366
"test/provider_internal_test" => {
13671367
"noinst" => "1"
13681368
},
1369+
"test/provider_pkey_test" => {
1370+
"noinst" => "1"
1371+
},
13691372
"test/provider_status_test" => {
13701373
"noinst" => "1"
13711374
},
@@ -1375,6 +1378,9 @@ our %unified_info = (
13751378
"test/rand_status_test" => {
13761379
"noinst" => "1"
13771380
},
1381+
"test/rand_test" => {
1382+
"noinst" => "1"
1383+
},
13781384
"test/rc2test" => {
13791385
"noinst" => "1"
13801386
},
@@ -1587,6 +1593,7 @@ our %unified_info = (
15871593
"providers/libdefault.a" => [
15881594
"AES_ASM",
15891595
"OPENSSL_CPUID_OBJ",
1596+
"OPENSSL_IA32_SSE2",
15901597
"VPAES_ASM"
15911598
],
15921599
"providers/libfips.a" => [
@@ -2715,8 +2722,8 @@ our %unified_info = (
27152722
"doc/html/man3/EVP_RAND.html" => [
27162723
"doc/man3/EVP_RAND.pod"
27172724
],
2718-
"doc/html/man3/EVP_SIGNATURE_free.html" => [
2719-
"doc/man3/EVP_SIGNATURE_free.pod"
2725+
"doc/html/man3/EVP_SIGNATURE.html" => [
2726+
"doc/man3/EVP_SIGNATURE.pod"
27202727
],
27212728
"doc/html/man3/EVP_SealInit.html" => [
27222729
"doc/man3/EVP_SealInit.pod"
@@ -5052,8 +5059,8 @@ our %unified_info = (
50525059
"doc/man/man3/EVP_RAND.3" => [
50535060
"doc/man3/EVP_RAND.pod"
50545061
],
5055-
"doc/man/man3/EVP_SIGNATURE_free.3" => [
5056-
"doc/man3/EVP_SIGNATURE_free.pod"
5062+
"doc/man/man3/EVP_SIGNATURE.3" => [
5063+
"doc/man3/EVP_SIGNATURE.pod"
50575064
],
50585065
"doc/man/man3/EVP_SealInit.3" => [
50595066
"doc/man3/EVP_SealInit.pod"
@@ -7762,6 +7769,10 @@ our %unified_info = (
77627769
"libcrypto.a",
77637770
"test/libtestutil.a"
77647771
],
7772+
"test/provider_pkey_test" => [
7773+
"libcrypto",
7774+
"test/libtestutil.a"
7775+
],
77657776
"test/provider_status_test" => [
77667777
"libcrypto.a",
77677778
"test/libtestutil.a"
@@ -7774,6 +7785,10 @@ our %unified_info = (
77747785
"libcrypto",
77757786
"test/libtestutil.a"
77767787
],
7788+
"test/rand_test" => [
7789+
"libcrypto",
7790+
"test/libtestutil.a"
7791+
],
77777792
"test/rc2test" => [
77787793
"libcrypto.a",
77797794
"test/libtestutil.a"
@@ -9714,10 +9729,10 @@ our %unified_info = (
97149729
},
97159730
"providers/fips" => {
97169731
"deps" => [
9717-
"providers/fips/fips-dso-fips_entry.o",
97189732
"providers/fips/libfips-lib-fipsprov.o",
97199733
"providers/fips/libfips-lib-self_test.o",
9720-
"providers/fips/libfips-lib-self_test_kats.o"
9734+
"providers/fips/libfips-lib-self_test_kats.o",
9735+
"providers/fips/fips-dso-fips_entry.o"
97219736
],
97229737
"products" => {
97239738
"dso" => [
@@ -9846,6 +9861,7 @@ our %unified_info = (
98469861
"providers/implementations/digests/libdefault-lib-blake2s_prov.o",
98479862
"providers/implementations/digests/libdefault-lib-md5_prov.o",
98489863
"providers/implementations/digests/libdefault-lib-md5_sha1_prov.o",
9864+
"providers/implementations/digests/libdefault-lib-null_prov.o",
98499865
"providers/implementations/digests/libdefault-lib-sha2_prov.o",
98509866
"providers/implementations/digests/libdefault-lib-sha3_prov.o",
98519867
"providers/implementations/digests/libdefault-lib-sm3_prov.o",
@@ -11608,8 +11624,8 @@ our %unified_info = (
1160811624
"doc/html/man3/EVP_RAND.html" => [
1160911625
"doc/man3/EVP_RAND.pod"
1161011626
],
11611-
"doc/html/man3/EVP_SIGNATURE_free.html" => [
11612-
"doc/man3/EVP_SIGNATURE_free.pod"
11627+
"doc/html/man3/EVP_SIGNATURE.html" => [
11628+
"doc/man3/EVP_SIGNATURE.pod"
1161311629
],
1161411630
"doc/html/man3/EVP_SealInit.html" => [
1161511631
"doc/man3/EVP_SealInit.pod"
@@ -13945,8 +13961,8 @@ our %unified_info = (
1394513961
"doc/man/man3/EVP_RAND.3" => [
1394613962
"doc/man3/EVP_RAND.pod"
1394713963
],
13948-
"doc/man/man3/EVP_SIGNATURE_free.3" => [
13949-
"doc/man3/EVP_SIGNATURE_free.pod"
13964+
"doc/man/man3/EVP_SIGNATURE.3" => [
13965+
"doc/man3/EVP_SIGNATURE.pod"
1395013966
],
1395113967
"doc/man/man3/EVP_SealInit.3" => [
1395213968
"doc/man3/EVP_SealInit.pod"
@@ -16339,7 +16355,7 @@ our %unified_info = (
1633916355
"doc/html/man3/EVP_PKEY_verify.html",
1634016356
"doc/html/man3/EVP_PKEY_verify_recover.html",
1634116357
"doc/html/man3/EVP_RAND.html",
16342-
"doc/html/man3/EVP_SIGNATURE_free.html",
16358+
"doc/html/man3/EVP_SIGNATURE.html",
1634316359
"doc/html/man3/EVP_SealInit.html",
1634416360
"doc/html/man3/EVP_SignInit.html",
1634516361
"doc/html/man3/EVP_VerifyInit.html",
@@ -18760,6 +18776,10 @@ our %unified_info = (
1876018776
"apps/include",
1876118777
"."
1876218778
],
18779+
"test/provider_pkey_test" => [
18780+
"include",
18781+
"apps/include"
18782+
],
1876318783
"test/provider_status_test" => [
1876418784
"include",
1876518785
"apps/include"
@@ -18773,6 +18793,10 @@ our %unified_info = (
1877318793
"include",
1877418794
"apps/include"
1877518795
],
18796+
"test/rand_test" => [
18797+
"include",
18798+
"apps/include"
18799+
],
1877618800
"test/rc2test" => [
1877718801
"include",
1877818802
"apps/include"
@@ -19264,7 +19288,7 @@ our %unified_info = (
1926419288
"doc/man/man3/EVP_PKEY_verify.3",
1926519289
"doc/man/man3/EVP_PKEY_verify_recover.3",
1926619290
"doc/man/man3/EVP_RAND.3",
19267-
"doc/man/man3/EVP_SIGNATURE_free.3",
19291+
"doc/man/man3/EVP_SIGNATURE.3",
1926819292
"doc/man/man3/EVP_SealInit.3",
1926919293
"doc/man/man3/EVP_SignInit.3",
1927019294
"doc/man/man3/EVP_VerifyInit.3",
@@ -19981,9 +20005,11 @@ our %unified_info = (
1998120005
"test/provfetchtest",
1998220006
"test/provider_fallback_test",
1998320007
"test/provider_internal_test",
20008+
"test/provider_pkey_test",
1998420009
"test/provider_status_test",
1998520010
"test/provider_test",
1998620011
"test/rand_status_test",
20012+
"test/rand_test",
1998720013
"test/rc2test",
1998820014
"test/rc4test",
1998920015
"test/rc5test",
@@ -24525,6 +24551,9 @@ our %unified_info = (
2452524551
"providers/implementations/digests/libdefault-lib-md5_sha1_prov.o" => [
2452624552
"providers/implementations/digests/md5_sha1_prov.c"
2452724553
],
24554+
"providers/implementations/digests/libdefault-lib-null_prov.o" => [
24555+
"providers/implementations/digests/null_prov.c"
24556+
],
2452824557
"providers/implementations/digests/libdefault-lib-sha2_prov.o" => [
2452924558
"providers/implementations/digests/sha2_prov.c"
2453024559
],
@@ -24946,6 +24975,7 @@ our %unified_info = (
2494624975
"providers/implementations/digests/libdefault-lib-blake2s_prov.o",
2494724976
"providers/implementations/digests/libdefault-lib-md5_prov.o",
2494824977
"providers/implementations/digests/libdefault-lib-md5_sha1_prov.o",
24978+
"providers/implementations/digests/libdefault-lib-null_prov.o",
2494924979
"providers/implementations/digests/libdefault-lib-sha2_prov.o",
2495024980
"providers/implementations/digests/libdefault-lib-sha3_prov.o",
2495124981
"providers/implementations/digests/libdefault-lib-sm3_prov.o",
@@ -26688,6 +26718,16 @@ our %unified_info = (
2668826718
"test/provider_internal_test-bin-provider_internal_test.o" => [
2668926719
"test/provider_internal_test.c"
2669026720
],
26721+
"test/provider_pkey_test" => [
26722+
"test/provider_pkey_test-bin-fake_rsaprov.o",
26723+
"test/provider_pkey_test-bin-provider_pkey_test.o"
26724+
],
26725+
"test/provider_pkey_test-bin-fake_rsaprov.o" => [
26726+
"test/fake_rsaprov.c"
26727+
],
26728+
"test/provider_pkey_test-bin-provider_pkey_test.o" => [
26729+
"test/provider_pkey_test.c"
26730+
],
2669126731
"test/provider_status_test" => [
2669226732
"test/provider_status_test-bin-provider_status_test.o"
2669326733
],
@@ -26710,6 +26750,12 @@ our %unified_info = (
2671026750
"test/rand_status_test-bin-rand_status_test.o" => [
2671126751
"test/rand_status_test.c"
2671226752
],
26753+
"test/rand_test" => [
26754+
"test/rand_test-bin-rand_test.o"
26755+
],
26756+
"test/rand_test-bin-rand_test.o" => [
26757+
"test/rand_test.c"
26758+
],
2671326759
"test/rc2test" => [
2671426760
"test/rc2test-bin-rc2test.o"
2671526761
],
@@ -27216,8 +27262,8 @@ unless (caller) {
2721627262
use File::Copy;
2721727263
use Pod::Usage;
2721827264

27219-
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl';
27220-
use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt';
27265+
use lib '/node/deps/openssl/openssl/util/perl';
27266+
use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt';
2722127267

2722227268
my $here = dirname($0);
2722327269

@@ -27244,7 +27290,7 @@ unless (caller) {
2724427290
);
2724527291

2724627292
use lib '.';
27247-
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations';
27293+
use lib '/node/deps/openssl/openssl/Configurations';
2724827294
use gentemplate;
2724927295

2725027296
print 'Creating ',$buildfile_template,"\n";
@@ -27261,8 +27307,8 @@ unless (caller) {
2726127307

2726227308
my $prepend = <<'_____';
2726327309
use File::Spec::Functions;
27264-
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl';
27265-
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations';
27310+
use lib '/node/deps/openssl/openssl/util/perl';
27311+
use lib '/node/deps/openssl/openssl/Configurations';
2726627312
use lib '.';
2726727313
use platform;
2726827314
_____

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

+1-1
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: Tue Oct 19 08:07:57 2021 UTC"
14+
#define DATE "built on: Tue Dec 14 22:49:16 2021 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/opensslv.h

+5-5
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 0
32+
# define OPENSSL_VERSION_PATCH 1
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.0"
78-
# define OPENSSL_FULL_VERSION_STR "3.0.0+quic"
77+
# define OPENSSL_VERSION_STR "3.0.1"
78+
# define OPENSSL_FULL_VERSION_STR "3.0.1+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 "7 sep 2021"
85+
# define OPENSSL_RELEASE_DATE "14 Dec 2021"
8686

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

91-
# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.0+quic 7 sep 2021"
91+
# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.1+quic 14 Dec 2021"
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

+1
Original file line numberDiff line numberDiff line change
@@ -830,6 +830,7 @@
830830
'openssl/providers/implementations/digests/blake2s_prov.c',
831831
'openssl/providers/implementations/digests/md5_prov.c',
832832
'openssl/providers/implementations/digests/md5_sha1_prov.c',
833+
'openssl/providers/implementations/digests/null_prov.c',
833834
'openssl/providers/implementations/digests/sha2_prov.c',
834835
'openssl/providers/implementations/digests/sha3_prov.c',
835836
'openssl/providers/implementations/digests/sm3_prov.c',

0 commit comments

Comments
 (0)