diff options
author | RafaelGSS <rafael.nunu@hotmail.com> | 2022-07-05 18:56:24 +0300 |
---|---|---|
committer | RafaelGSS <rafael.nunu@hotmail.com> | 2022-07-06 16:20:30 +0300 |
commit | dc7af13486c83cb7a0c3a3e64f106dc91cd04cb1 (patch) | |
tree | d0922b756dd8a90b6f61ac94030b18ead3e30774 /deps/openssl/config/archs/linux-aarch64/no-asm | |
parent | fa72c534ebbcf55597c014ed6d32197d649049e5 (diff) |
deps: update archs files for quictls/openssl-3.0.5+quic
After an OpenSSL source update, all the config files need to be
regenerated and committed by:
$ find archs \( -name \*.s \) -exec rm "{}" \;
Edit deps/openssl/openssl/crypto/perlasm/x86asm.pl changing #ifdef
to %ifdef to make it compatible to nasm on windows 32.
$ make -C deps/openssl/config
$ git add deps/openssl/config/archs
$ git add deps/openssl/openssl
$ git commit
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
PR-URL: https://github.com/nodejs/node/pull/43693
Diffstat (limited to 'deps/openssl/config/archs/linux-aarch64/no-asm')
5 files changed, 135 insertions, 75 deletions
diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/configdata.pm b/deps/openssl/config/archs/linux-aarch64/no-asm/configdata.pm index 7f192a22bb7..3dab1700a08 100644 --- a/deps/openssl/config/archs/linux-aarch64/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux-aarch64/no-asm/configdata.pm @@ -157,7 +157,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.3+quic", + "full_version" => "3.0.5+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,10 +206,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm 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" => "3", - "perl_archname" => "x86_64-linux-thread-multi", + "patch" => "5", + "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.1", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "3 May 2022", + "release_date" => "5 Jul 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux-aarch64", - "version" => "3.0.3" + "version" => "3.0.5" ); our %target = ( "AR" => "ar", @@ -761,6 +761,11 @@ our %unified_info = ( } } }, + "generate" => { + "include/openssl/configuration.h" => { + "skip" => "1" + } + }, "libraries" => { "apps/libapps.a" => { "noinst" => "1" @@ -1595,7 +1600,6 @@ our %unified_info = ( "include/openssl/cmp.h", "include/openssl/cms.h", "include/openssl/conf.h", - "include/openssl/configuration.h", "include/openssl/crmf.h", "include/openssl/crypto.h", "include/openssl/ct.h", @@ -1797,49 +1801,49 @@ our %unified_info = ( "build_modules_nodep" => [ "providers/fipsmodule.cnf" ], - "crypto/aes/aes-586.s" => [ + "crypto/aes/aes-586.S" => [ "crypto/perlasm/x86asm.pl" ], - "crypto/aes/aesni-586.s" => [ + "crypto/aes/aesni-586.S" => [ "crypto/perlasm/x86asm.pl" ], "crypto/aes/aest4-sparcv9.S" => [ "crypto/perlasm/sparcv9_modes.pl" ], - "crypto/aes/vpaes-586.s" => [ + "crypto/aes/vpaes-586.S" => [ "crypto/perlasm/x86asm.pl" ], - "crypto/bf/bf-586.s" => [ + "crypto/bf/bf-586.S" => [ "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl" ], - "crypto/bn/bn-586.s" => [ + "crypto/bn/bn-586.S" => [ "crypto/perlasm/x86asm.pl" ], - "crypto/bn/co-586.s" => [ + "crypto/bn/co-586.S" => [ "crypto/perlasm/x86asm.pl" ], - "crypto/bn/x86-gf2m.s" => [ + "crypto/bn/x86-gf2m.S" => [ "crypto/perlasm/x86asm.pl" ], - "crypto/bn/x86-mont.s" => [ + "crypto/bn/x86-mont.S" => [ "crypto/perlasm/x86asm.pl" ], - "crypto/camellia/cmll-x86.s" => [ + "crypto/camellia/cmll-x86.S" => [ "crypto/perlasm/x86asm.pl" ], "crypto/camellia/cmllt4-sparcv9.S" => [ "crypto/perlasm/sparcv9_modes.pl" ], - "crypto/cast/cast-586.s" => [ + "crypto/cast/cast-586.S" => [ "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl" ], - "crypto/des/crypt586.s" => [ + "crypto/des/crypt586.S" => [ "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl" ], - "crypto/des/des-586.s" => [ + "crypto/des/des-586.S" => [ "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl" ], @@ -1849,22 +1853,22 @@ our %unified_info = ( "crypto/libcrypto-lib-info.o" => [ "crypto/buildinf.h" ], - "crypto/rc4/rc4-586.s" => [ + "crypto/rc4/rc4-586.S" => [ "crypto/perlasm/x86asm.pl" ], - "crypto/ripemd/rmd-586.s" => [ + "crypto/ripemd/rmd-586.S" => [ "crypto/perlasm/x86asm.pl" ], - "crypto/sha/sha1-586.s" => [ + "crypto/sha/sha1-586.S" => [ "crypto/perlasm/x86asm.pl" ], - "crypto/sha/sha256-586.s" => [ + "crypto/sha/sha256-586.S" => [ "crypto/perlasm/x86asm.pl" ], - "crypto/sha/sha512-586.s" => [ + "crypto/sha/sha512-586.S" => [ "crypto/perlasm/x86asm.pl" ], - "crypto/whrlpool/wp-mmx.s" => [ + "crypto/whrlpool/wp-mmx.S" => [ "crypto/perlasm/x86asm.pl" ], "crypto/x86cpuid.s" => [ @@ -9685,10 +9689,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/fips-dso-fips_entry.o" + "providers/fips/libfips-lib-self_test_kats.o" ], "products" => { "dso" => [ @@ -10223,7 +10227,7 @@ our %unified_info = ( "\"-H\"", "\$(APPS_OPENSSL)" ], - "crypto/aes/aes-586.s" => [ + "crypto/aes/aes-586.S" => [ "crypto/aes/asm/aes-586.pl" ], "crypto/aes/aes-armv4.S" => [ @@ -10265,7 +10269,7 @@ our %unified_info = ( "crypto/aes/aesni-sha256-x86_64.s" => [ "crypto/aes/asm/aesni-sha256-x86_64.pl" ], - "crypto/aes/aesni-x86.s" => [ + "crypto/aes/aesni-x86.S" => [ "crypto/aes/asm/aesni-x86.pl" ], "crypto/aes/aesni-x86_64.s" => [ @@ -10292,7 +10296,7 @@ our %unified_info = ( "crypto/aes/vpaes-ppc.s" => [ "crypto/aes/asm/vpaes-ppc.pl" ], - "crypto/aes/vpaes-x86.s" => [ + "crypto/aes/vpaes-x86.S" => [ "crypto/aes/asm/vpaes-x86.pl" ], "crypto/aes/vpaes-x86_64.s" => [ @@ -10307,7 +10311,7 @@ our %unified_info = ( "crypto/armv4cpuid.S" => [ "crypto/armv4cpuid.pl" ], - "crypto/bf/bf-586.s" => [ + "crypto/bf/bf-586.S" => [ "crypto/bf/asm/bf-586.pl" ], "crypto/bn/alpha-mont.S" => [ @@ -10322,7 +10326,7 @@ our %unified_info = ( "crypto/bn/armv8-mont.S" => [ "crypto/bn/asm/armv8-mont.pl" ], - "crypto/bn/bn-586.s" => [ + "crypto/bn/bn-586.S" => [ "crypto/bn/asm/bn-586.pl" ], "crypto/bn/bn-ia64.s" => [ @@ -10334,7 +10338,7 @@ our %unified_info = ( "crypto/bn/bn-ppc.s" => [ "crypto/bn/asm/ppc.pl" ], - "crypto/bn/co-586.s" => [ + "crypto/bn/co-586.S" => [ "crypto/bn/asm/co-586.pl" ], "crypto/bn/ia64-mont.s" => [ @@ -10349,9 +10353,6 @@ our %unified_info = ( "crypto/bn/ppc-mont.s" => [ "crypto/bn/asm/ppc-mont.pl" ], - "crypto/bn/ppc64-mont-fixed.s" => [ - "crypto/bn/asm/ppc64-mont-fixed.pl" - ], "crypto/bn/ppc64-mont.s" => [ "crypto/bn/asm/ppc64-mont.pl" ], @@ -10385,10 +10386,10 @@ our %unified_info = ( "crypto/bn/vis3-mont.S" => [ "crypto/bn/asm/vis3-mont.pl" ], - "crypto/bn/x86-gf2m.s" => [ + "crypto/bn/x86-gf2m.S" => [ "crypto/bn/asm/x86-gf2m.pl" ], - "crypto/bn/x86-mont.s" => [ + "crypto/bn/x86-mont.S" => [ "crypto/bn/asm/x86-mont.pl" ], "crypto/bn/x86_64-gf2m.s" => [ @@ -10407,7 +10408,7 @@ our %unified_info = ( "\$(CPPFLAGS_Q)\"", "\"\$(PLATFORM)\"" ], - "crypto/camellia/cmll-x86.s" => [ + "crypto/camellia/cmll-x86.S" => [ "crypto/camellia/asm/cmll-x86.pl" ], "crypto/camellia/cmll-x86_64.s" => [ @@ -10416,7 +10417,7 @@ our %unified_info = ( "crypto/camellia/cmllt4-sparcv9.S" => [ "crypto/camellia/asm/cmllt4-sparcv9.pl" ], - "crypto/cast/cast-586.s" => [ + "crypto/cast/cast-586.S" => [ "crypto/cast/asm/cast-586.pl" ], "crypto/chacha/chacha-armv4.S" => [ @@ -10428,25 +10429,28 @@ our %unified_info = ( "crypto/chacha/chacha-c64xplus.S" => [ "crypto/chacha/asm/chacha-c64xplus.pl" ], - "crypto/chacha/chacha-ia64.s" => [ + "crypto/chacha/chacha-ia64.S" => [ "crypto/chacha/asm/chacha-ia64.pl" ], + "crypto/chacha/chacha-ia64.s" => [ + "crypto/chacha/chacha-ia64.S" + ], "crypto/chacha/chacha-ppc.s" => [ "crypto/chacha/asm/chacha-ppc.pl" ], "crypto/chacha/chacha-s390x.S" => [ "crypto/chacha/asm/chacha-s390x.pl" ], - "crypto/chacha/chacha-x86.s" => [ + "crypto/chacha/chacha-x86.S" => [ "crypto/chacha/asm/chacha-x86.pl" ], "crypto/chacha/chacha-x86_64.s" => [ "crypto/chacha/asm/chacha-x86_64.pl" ], - "crypto/des/crypt586.s" => [ + "crypto/des/crypt586.S" => [ "crypto/des/asm/crypt586.pl" ], - "crypto/des/des-586.s" => [ + "crypto/des/des-586.S" => [ "crypto/des/asm/des-586.pl" ], "crypto/des/des_enc-sparc.S" => [ @@ -10473,7 +10477,7 @@ our %unified_info = ( "crypto/ec/ecp_nistz256-sparcv9.S" => [ "crypto/ec/asm/ecp_nistz256-sparcv9.pl" ], - "crypto/ec/ecp_nistz256-x86.s" => [ + "crypto/ec/ecp_nistz256-x86.S" => [ "crypto/ec/asm/ecp_nistz256-x86.pl" ], "crypto/ec/ecp_nistz256-x86_64.s" => [ @@ -10488,7 +10492,7 @@ our %unified_info = ( "crypto/ia64cpuid.s" => [ "crypto/ia64cpuid.S" ], - "crypto/md5/md5-586.s" => [ + "crypto/md5/md5-586.S" => [ "crypto/md5/asm/md5-586.pl" ], "crypto/md5/md5-sparcv9.S" => [ @@ -10524,7 +10528,7 @@ our %unified_info = ( "crypto/modes/ghash-sparcv9.S" => [ "crypto/modes/asm/ghash-sparcv9.pl" ], - "crypto/modes/ghash-x86.s" => [ + "crypto/modes/ghash-x86.S" => [ "crypto/modes/asm/ghash-x86.pl" ], "crypto/modes/ghash-x86_64.s" => [ @@ -10548,6 +10552,9 @@ our %unified_info = ( "crypto/poly1305/poly1305-c64xplus.S" => [ "crypto/poly1305/asm/poly1305-c64xplus.pl" ], + "crypto/poly1305/poly1305-ia64.s" => [ + "crypto/poly1305/asm/poly1305-ia64.S" + ], "crypto/poly1305/poly1305-mips.S" => [ "crypto/poly1305/asm/poly1305-mips.pl" ], @@ -10563,7 +10570,7 @@ our %unified_info = ( "crypto/poly1305/poly1305-sparcv9.S" => [ "crypto/poly1305/asm/poly1305-sparcv9.pl" ], - "crypto/poly1305/poly1305-x86.s" => [ + "crypto/poly1305/poly1305-x86.S" => [ "crypto/poly1305/asm/poly1305-x86.pl" ], "crypto/poly1305/poly1305-x86_64.s" => [ @@ -10572,7 +10579,7 @@ our %unified_info = ( "crypto/ppccpuid.s" => [ "crypto/ppccpuid.pl" ], - "crypto/rc4/rc4-586.s" => [ + "crypto/rc4/rc4-586.S" => [ "crypto/rc4/asm/rc4-586.pl" ], "crypto/rc4/rc4-c64xplus.s" => [ @@ -10590,7 +10597,7 @@ our %unified_info = ( "crypto/rc4/rc4-x86_64.s" => [ "crypto/rc4/asm/rc4-x86_64.pl" ], - "crypto/ripemd/rmd-586.s" => [ + "crypto/ripemd/rmd-586.S" => [ "crypto/ripemd/asm/rmd-586.pl" ], "crypto/s390xcpuid.S" => [ @@ -10629,7 +10636,7 @@ our %unified_info = ( "crypto/sha/keccak1600p8-ppc.S" => [ "crypto/sha/asm/keccak1600p8-ppc.pl" ], - "crypto/sha/sha1-586.s" => [ + "crypto/sha/sha1-586.S" => [ "crypto/sha/asm/sha1-586.pl" ], "crypto/sha/sha1-alpha.S" => [ @@ -10674,7 +10681,7 @@ our %unified_info = ( "crypto/sha/sha1-x86_64.s" => [ "crypto/sha/asm/sha1-x86_64.pl" ], - "crypto/sha/sha256-586.s" => [ + "crypto/sha/sha256-586.S" => [ "crypto/sha/asm/sha256-586.pl" ], "crypto/sha/sha256-armv4.S" => [ @@ -10713,7 +10720,7 @@ our %unified_info = ( "crypto/sha/sha256p8-ppc.s" => [ "crypto/sha/asm/sha512p8-ppc.pl" ], - "crypto/sha/sha512-586.s" => [ + "crypto/sha/sha512-586.S" => [ "crypto/sha/asm/sha512-586.pl" ], "crypto/sha/sha512-armv4.S" => [ @@ -10752,13 +10759,13 @@ our %unified_info = ( "crypto/uplink-ia64.s" => [ "ms/uplink-ia64.pl" ], - "crypto/uplink-x86.s" => [ + "crypto/uplink-x86.S" => [ "ms/uplink-x86.pl" ], "crypto/uplink-x86_64.s" => [ "ms/uplink-x86_64.pl" ], - "crypto/whrlpool/wp-mmx.s" => [ + "crypto/whrlpool/wp-mmx.S" => [ "crypto/whrlpool/asm/wp-mmx.pl" ], "crypto/whrlpool/wp-x86_64.s" => [ @@ -10767,7 +10774,7 @@ our %unified_info = ( "crypto/x86_64cpuid.s" => [ "crypto/x86_64cpuid.pl" ], - "crypto/x86cpuid.s" => [ + "crypto/x86cpuid.S" => [ "crypto/x86cpuid.pl" ], "doc/html/man1/CA.pl.html" => [ @@ -15624,7 +15631,7 @@ our %unified_info = ( "doc/man7/openssl_user_macros.pod" => [ "doc/man7/openssl_user_macros.pod.in" ], - "engines/e_padlock-x86.s" => [ + "engines/e_padlock-x86.S" => [ "engines/asm/e_padlock-x86.pl" ], "engines/e_padlock-x86_64.s" => [ @@ -27159,11 +27166,12 @@ unless (caller) { use Getopt::Long; use File::Spec::Functions; use File::Basename; + use File::Compare qw(compare_text); 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 '/home/rafaelgss/repos/os/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/rafaelgss/repos/os/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27190,10 +27198,9 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; + use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; use gentemplate; - print 'Creating ',$buildfile_template,"\n"; open my $buildfile_template_fh, ">$buildfile_template" or die "Trying to create $buildfile_template: $!"; foreach (@{$config{build_file_templates}}) { @@ -27202,22 +27209,23 @@ unless (caller) { } gentemplate(output => $buildfile_template_fh, %gendata); close $buildfile_template_fh; + print 'Created ',$buildfile_template,"\n"; use OpenSSL::Template; 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 '/home/rafaelgss/repos/os/node/deps/openssl/openssl/util/perl'; +use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ - print 'Creating ',$buildfile,"\n"; + my $tmpl; open BUILDFILE, ">$buildfile.new" or die "Trying to create $buildfile.new: $!"; - my $tmpl = OpenSSL::Template->new(TYPE => 'FILE', - SOURCE => $buildfile_template); + $tmpl = OpenSSL::Template->new(TYPE => 'FILE', + SOURCE => $buildfile_template); $tmpl->fill_in(FILENAME => $_, OUTPUT => \*BUILDFILE, HASH => \%gendata, @@ -27230,6 +27238,57 @@ _____ close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; + print 'Created ',$buildfile,"\n"; + + my $configuration_h = + catfile('include', 'openssl', 'configuration.h'); + my $configuration_h_in = + catfile($config{sourcedir}, 'include', 'openssl', 'configuration.h.in'); + open CONFIGURATION_H, ">${configuration_h}.new" + or die "Trying to create ${configuration_h}.new: $!"; + $tmpl = OpenSSL::Template->new(TYPE => 'FILE', + SOURCE => $configuration_h_in); + $tmpl->fill_in(FILENAME => $_, + OUTPUT => \*CONFIGURATION_H, + HASH => \%gendata, + PREPEND => $prepend, + # To ensure that global variables and functions + # defined in one template stick around for the + # next, making them combinable + PACKAGE => 'OpenSSL::safe') + or die $Text::Template::ERROR; + close CONFIGURATION_H; + + # When using stat() on Windows, we can get it to perform better by + # avoid some data. This doesn't affect the mtime field, so we're not + # losing anything... + ${^WIN32_SLOPPY_STAT} = 1; + + my $update_configuration_h = 0; + if (-f $configuration_h) { + my $configuration_h_mtime = (stat($configuration_h))[9]; + my $configuration_h_in_mtime = (stat($configuration_h_in))[9]; + + # If configuration.h.in was updated after the last configuration.h, + # or if configuration.h.new differs configuration.h, we update + # configuration.h + if ($configuration_h_mtime < $configuration_h_in_mtime + || compare_text("${configuration_h}.new", $configuration_h) != 0) { + $update_configuration_h = 1; + } else { + # If nothing has changed, let's just drop the new one and + # pretend like nothing happened + unlink "${configuration_h}.new" + } + } else { + $update_configuration_h = 1; + } + + if ($update_configuration_h) { + rename("${configuration_h}.new", $configuration_h) + or die "Trying to rename ${configuration_h}.new to $configuration_h: $!"; + print 'Created ',$configuration_h,"\n"; + } exit(0); } diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/buildinf.h index 603fc2dcb08..f095dfea12b 100644 --- a/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-aarch64" -#define DATE "built on: Mon May 16 03:49:00 2022 UTC" +#define DATE "built on: Tue Jul 5 15:48:10 2022 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/bio.h b/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/bio.h index c348adae7a3..7e527184b76 100644 --- a/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/bio.h @@ -173,9 +173,9 @@ extern "C" { # ifndef OPENSSL_NO_KTLS # define BIO_get_ktls_send(b) \ - BIO_ctrl(b, BIO_CTRL_GET_KTLS_SEND, 0, NULL) + (BIO_ctrl(b, BIO_CTRL_GET_KTLS_SEND, 0, NULL) > 0) # define BIO_get_ktls_recv(b) \ - BIO_ctrl(b, BIO_CTRL_GET_KTLS_RECV, 0, NULL) + (BIO_ctrl(b, BIO_CTRL_GET_KTLS_RECV, 0, NULL) > 0) # else # define BIO_get_ktls_send(b) (0) # define BIO_get_ktls_recv(b) (0) diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/configuration.h b/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/configuration.h index f6758b155fa..51a2847855c 100644 --- a/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/configuration.h +++ b/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/configuration.h @@ -1,6 +1,7 @@ /* * WARNING: do not edit! - * Generated by Makefile from include/openssl/configuration.h.in + * Generated by configdata.pm from Configurations/common0.tmpl, Configurations/unix-Makefile.tmpl + * via Makefile.in * * Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved. * diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/opensslv.h index 1b853bc9537..4af88bb2704 100644 --- a/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 3 +# define OPENSSL_VERSION_PATCH 5 /* * 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.3" -# define OPENSSL_FULL_VERSION_STR "3.0.3+quic" +# define OPENSSL_VERSION_STR "3.0.5" +# define OPENSSL_FULL_VERSION_STR "3.0.5+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 May 2022" +# define OPENSSL_RELEASE_DATE "5 Jul 2022" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.3+quic 3 May 2022" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.5+quic 5 Jul 2022" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE |