Skip to content

Commit

Permalink
deps: update archs files for quictls/openssl-3.0.1+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
    $ git add deps/openssl/config/archs
    $ git add deps/openssl/openssl
    $ git commit

PR-URL: nodejs#41177
Refs: quictls/openssl#69
Refs: https://mta.openssl.org/pipermail/openssl-announce/2021-December/000212.html
Reviewed-By: Danielle Adams <adamzdanielle@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Derek Lewis <DerekNonGeneric@inf.is>
  • Loading branch information
@richardlau @Linkgoron
richardlau authored and Linkgoron committed Jan 31, 2022
1 parent 250d8f6 commit bae1489
Show file tree
Hide file tree
Showing 301 changed files with 5,200 additions and 2,531 deletions.
92 changes: 69 additions & 23 deletions deps/openssl/config/archs/BSD-x86/asm/configdata.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ our %config = (
],
"dynamic_engines" => "0",
"ex_libs" => [],
"full_version" => "3.0.0+quic",
"full_version" => "3.0.1+quic",
"includes" => [],
"lflags" => [],
"lib_defines" => [
Expand Down Expand Up @@ -203,10 +203,10 @@ 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" => "0",
"perl_archname" => "x86_64-linux-thread-multi",
"patch" => "1",
"perl_archname" => "x86_64-linux-gnu-thread-multi",
"perl_cmd" => "/usr/bin/perl",
"perl_version" => "5.32.1",
"perl_version" => "5.30.0",
"perlargv" => [
"no-comp",
"no-shared",
Expand Down Expand Up @@ -255,11 +255,11 @@ our %config = (
"prerelease" => "",
"processor" => "",
"rc4_int" => "unsigned int",
"release_date" => "7 sep 2021",
"release_date" => "14 Dec 2021",
"shlib_version" => "81.3",
"sourcedir" => ".",
"target" => "BSD-x86",
"version" => "3.0.0"
"version" => "3.0.1"
);
our %target = (
"AR" => "ar",
Expand Down Expand Up @@ -1366,6 +1366,9 @@ our %unified_info = (
"test/provider_internal_test" => {
"noinst" => "1"
},
"test/provider_pkey_test" => {
"noinst" => "1"
},
"test/provider_status_test" => {
"noinst" => "1"
},
Expand All @@ -1375,6 +1378,9 @@ our %unified_info = (
"test/rand_status_test" => {
"noinst" => "1"
},
"test/rand_test" => {
"noinst" => "1"
},
"test/rc2test" => {
"noinst" => "1"
},
Expand Down Expand Up @@ -1587,6 +1593,7 @@ our %unified_info = (
"providers/libdefault.a" => [
"AES_ASM",
"OPENSSL_CPUID_OBJ",
"OPENSSL_IA32_SSE2",
"VPAES_ASM"
],
"providers/libfips.a" => [
Expand Down Expand Up @@ -2715,8 +2722,8 @@ our %unified_info = (
"doc/html/man3/EVP_RAND.html" => [
"doc/man3/EVP_RAND.pod"
],
"doc/html/man3/EVP_SIGNATURE_free.html" => [
"doc/man3/EVP_SIGNATURE_free.pod"
"doc/html/man3/EVP_SIGNATURE.html" => [
"doc/man3/EVP_SIGNATURE.pod"
],
"doc/html/man3/EVP_SealInit.html" => [
"doc/man3/EVP_SealInit.pod"
Expand Down Expand Up @@ -5052,8 +5059,8 @@ our %unified_info = (
"doc/man/man3/EVP_RAND.3" => [
"doc/man3/EVP_RAND.pod"
],
"doc/man/man3/EVP_SIGNATURE_free.3" => [
"doc/man3/EVP_SIGNATURE_free.pod"
"doc/man/man3/EVP_SIGNATURE.3" => [
"doc/man3/EVP_SIGNATURE.pod"
],
"doc/man/man3/EVP_SealInit.3" => [
"doc/man3/EVP_SealInit.pod"
Expand Down Expand Up @@ -7762,6 +7769,10 @@ our %unified_info = (
"libcrypto.a",
"test/libtestutil.a"
],
"test/provider_pkey_test" => [
"libcrypto",
"test/libtestutil.a"
],
"test/provider_status_test" => [
"libcrypto.a",
"test/libtestutil.a"
Expand All @@ -7774,6 +7785,10 @@ our %unified_info = (
"libcrypto",
"test/libtestutil.a"
],
"test/rand_test" => [
"libcrypto",
"test/libtestutil.a"
],
"test/rc2test" => [
"libcrypto.a",
"test/libtestutil.a"
Expand Down Expand Up @@ -9714,10 +9729,10 @@ our %unified_info = (
},
"providers/fips" => {
"deps" => [
"providers/fips/fips-dso-fips_entry.o",
"providers/fips/libfips-lib-fipsprov.o",
"providers/fips/libfips-lib-self_test.o",
"providers/fips/libfips-lib-self_test_kats.o"
"providers/fips/libfips-lib-self_test_kats.o",
"providers/fips/fips-dso-fips_entry.o"
],
"products" => {
"dso" => [
Expand Down Expand Up @@ -9846,6 +9861,7 @@ our %unified_info = (
"providers/implementations/digests/libdefault-lib-blake2s_prov.o",
"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-sha2_prov.o",
"providers/implementations/digests/libdefault-lib-sha3_prov.o",
"providers/implementations/digests/libdefault-lib-sm3_prov.o",
Expand Down Expand Up @@ -11608,8 +11624,8 @@ our %unified_info = (
"doc/html/man3/EVP_RAND.html" => [
"doc/man3/EVP_RAND.pod"
],
"doc/html/man3/EVP_SIGNATURE_free.html" => [
"doc/man3/EVP_SIGNATURE_free.pod"
"doc/html/man3/EVP_SIGNATURE.html" => [
"doc/man3/EVP_SIGNATURE.pod"
],
"doc/html/man3/EVP_SealInit.html" => [
"doc/man3/EVP_SealInit.pod"
Expand Down Expand Up @@ -13945,8 +13961,8 @@ our %unified_info = (
"doc/man/man3/EVP_RAND.3" => [
"doc/man3/EVP_RAND.pod"
],
"doc/man/man3/EVP_SIGNATURE_free.3" => [
"doc/man3/EVP_SIGNATURE_free.pod"
"doc/man/man3/EVP_SIGNATURE.3" => [
"doc/man3/EVP_SIGNATURE.pod"
],
"doc/man/man3/EVP_SealInit.3" => [
"doc/man3/EVP_SealInit.pod"
Expand Down Expand Up @@ -16339,7 +16355,7 @@ our %unified_info = (
"doc/html/man3/EVP_PKEY_verify.html",
"doc/html/man3/EVP_PKEY_verify_recover.html",
"doc/html/man3/EVP_RAND.html",
"doc/html/man3/EVP_SIGNATURE_free.html",
"doc/html/man3/EVP_SIGNATURE.html",
"doc/html/man3/EVP_SealInit.html",
"doc/html/man3/EVP_SignInit.html",
"doc/html/man3/EVP_VerifyInit.html",
Expand Down Expand Up @@ -18760,6 +18776,10 @@ our %unified_info = (
"apps/include",
"."
],
"test/provider_pkey_test" => [
"include",
"apps/include"
],
"test/provider_status_test" => [
"include",
"apps/include"
Expand All @@ -18773,6 +18793,10 @@ our %unified_info = (
"include",
"apps/include"
],
"test/rand_test" => [
"include",
"apps/include"
],
"test/rc2test" => [
"include",
"apps/include"
Expand Down Expand Up @@ -19264,7 +19288,7 @@ our %unified_info = (
"doc/man/man3/EVP_PKEY_verify.3",
"doc/man/man3/EVP_PKEY_verify_recover.3",
"doc/man/man3/EVP_RAND.3",
"doc/man/man3/EVP_SIGNATURE_free.3",
"doc/man/man3/EVP_SIGNATURE.3",
"doc/man/man3/EVP_SealInit.3",
"doc/man/man3/EVP_SignInit.3",
"doc/man/man3/EVP_VerifyInit.3",
Expand Down Expand Up @@ -19981,9 +20005,11 @@ our %unified_info = (
"test/provfetchtest",
"test/provider_fallback_test",
"test/provider_internal_test",
"test/provider_pkey_test",
"test/provider_status_test",
"test/provider_test",
"test/rand_status_test",
"test/rand_test",
"test/rc2test",
"test/rc4test",
"test/rc5test",
Expand Down Expand Up @@ -24525,6 +24551,9 @@ our %unified_info = (
"providers/implementations/digests/libdefault-lib-md5_sha1_prov.o" => [
"providers/implementations/digests/md5_sha1_prov.c"
],
"providers/implementations/digests/libdefault-lib-null_prov.o" => [
"providers/implementations/digests/null_prov.c"
],
"providers/implementations/digests/libdefault-lib-sha2_prov.o" => [
"providers/implementations/digests/sha2_prov.c"
],
Expand Down Expand Up @@ -24946,6 +24975,7 @@ our %unified_info = (
"providers/implementations/digests/libdefault-lib-blake2s_prov.o",
"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-sha2_prov.o",
"providers/implementations/digests/libdefault-lib-sha3_prov.o",
"providers/implementations/digests/libdefault-lib-sm3_prov.o",
Expand Down Expand Up @@ -26688,6 +26718,16 @@ our %unified_info = (
"test/provider_internal_test-bin-provider_internal_test.o" => [
"test/provider_internal_test.c"
],
"test/provider_pkey_test" => [
"test/provider_pkey_test-bin-fake_rsaprov.o",
"test/provider_pkey_test-bin-provider_pkey_test.o"
],
"test/provider_pkey_test-bin-fake_rsaprov.o" => [
"test/fake_rsaprov.c"
],
"test/provider_pkey_test-bin-provider_pkey_test.o" => [
"test/provider_pkey_test.c"
],
"test/provider_status_test" => [
"test/provider_status_test-bin-provider_status_test.o"
],
Expand All @@ -26710,6 +26750,12 @@ our %unified_info = (
"test/rand_status_test-bin-rand_status_test.o" => [
"test/rand_status_test.c"
],
"test/rand_test" => [
"test/rand_test-bin-rand_test.o"
],
"test/rand_test-bin-rand_test.o" => [
"test/rand_test.c"
],
"test/rc2test" => [
"test/rc2test-bin-rc2test.o"
],
Expand Down Expand Up @@ -27216,8 +27262,8 @@ unless (caller) {
use File::Copy;
use Pod::Usage;

use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl';
use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt';
use lib '/node/deps/openssl/openssl/util/perl';
use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt';

my $here = dirname($0);

Expand All @@ -27244,7 +27290,7 @@ unless (caller) {
);

use lib '.';
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations';
use lib '/node/deps/openssl/openssl/Configurations';
use gentemplate;

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

my $prepend = <<'_____';
use File::Spec::Functions;
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl';
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations';
use lib '/node/deps/openssl/openssl/util/perl';
use lib '/node/deps/openssl/openssl/Configurations';
use lib '.';
use platform;
_____
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86"
#define DATE "built on: Tue Oct 19 08:07:57 2021 UTC"
#define DATE "built on: Tue Dec 14 22:49:16 2021 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
10 changes: 5 additions & 5 deletions deps/openssl/config/archs/BSD-x86/asm/include/openssl/opensslv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ extern "C" {
*/
# define OPENSSL_VERSION_MAJOR 3
# define OPENSSL_VERSION_MINOR 0
# define OPENSSL_VERSION_PATCH 0
# define OPENSSL_VERSION_PATCH 1

/*
* 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.0"
# define OPENSSL_FULL_VERSION_STR "3.0.0+quic"
# define OPENSSL_VERSION_STR "3.0.1"
# define OPENSSL_FULL_VERSION_STR "3.0.1+quic"

/*
* SECTION 3: ADDITIONAL METADATA
*
* These strings are defined separately to allow them to be parsable.
*/
# define OPENSSL_RELEASE_DATE "7 sep 2021"
# define OPENSSL_RELEASE_DATE "14 Dec 2021"

/*
* SECTION 4: BACKWARD COMPATIBILITY
*/

# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.0+quic 7 sep 2021"
# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.1+quic 14 Dec 2021"

/* 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
Original file line number Diff line number Diff line change
Expand Up @@ -830,6 +830,7 @@
'openssl/providers/implementations/digests/blake2s_prov.c',
'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/sha2_prov.c',
'openssl/providers/implementations/digests/sha3_prov.c',
'openssl/providers/implementations/digests/sm3_prov.c',
Expand Down
Loading

0 comments on commit bae1489

Please sign in to comment.