diff --git a/deps/openssl/config/archs/BSD-x86/asm/configdata.pm b/deps/openssl/config/archs/BSD-x86/asm/configdata.pm index ed7d359f4b82be..f7f8b5656dfcbc 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/configdata.pm +++ b/deps/openssl/config/archs/BSD-x86/asm/configdata.pm @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -203,7 +203,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-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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -255,11 +255,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "BSD-x86", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1320,6 +1320,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3964,6 +3967,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4072,6 +4078,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6337,6 +6346,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6445,6 +6457,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7794,6 +7809,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8461,7 +8480,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", "crypto/bn/libcrypto-lib-co-586.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-x86-gf2m.o", "crypto/bn/libcrypto-lib-x86-mont.o", "crypto/bn/libfips-lib-bn-586.o", @@ -8493,7 +8511,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", "crypto/bn/libfips-lib-co-586.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-x86-gf2m.o", "crypto/bn/libfips-lib-x86-mont.o" ], @@ -12955,6 +12972,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -13063,6 +13083,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15328,6 +15351,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15436,6 +15462,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16948,6 +16977,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -16984,6 +17014,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18895,6 +18926,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19919,6 +19954,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19955,6 +19991,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20220,6 +20257,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -21066,9 +21104,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-co-586.o" => [ "crypto/bn/co-586.S" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libcrypto-lib-x86-gf2m.o" => [ "crypto/bn/x86-gf2m.S" ], @@ -21162,9 +21197,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-co-586.o" => [ "crypto/bn/co-586.S" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-x86-gf2m.o" => [ "crypto/bn/x86-gf2m.S" ], @@ -23714,7 +23746,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", "crypto/bn/libcrypto-lib-co-586.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-x86-gf2m.o", "crypto/bn/libcrypto-lib-x86-mont.o", "crypto/buffer/libcrypto-lib-buf_err.o", @@ -25296,7 +25327,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", "crypto/bn/libfips-lib-co-586.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-x86-gf2m.o", "crypto/bn/libfips-lib-x86-mont.o", "crypto/buffer/libfips-lib-buffer.o", @@ -26814,6 +26844,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27509,8 +27545,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27537,7 +27573,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27554,8 +27590,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h b/deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h index 84cdaf89a76e82..a5c1149cf4ef69 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: BSD-x86" -#define DATE "built on: Mon Feb 13 14:04:08 2023 UTC" +#define DATE "built on: Fri Jun 9 11:58:46 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/BSD-x86/asm/include/openssl/cmp.h b/deps/openssl/config/archs/BSD-x86/asm/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/include/openssl/cmp.h +++ b/deps/openssl/config/archs/BSD-x86/asm/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/BSD-x86/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/BSD-x86/asm/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/BSD-x86/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/BSD-x86/asm/openssl-fips.gypi b/deps/openssl/config/archs/BSD-x86/asm/openssl-fips.gypi index 65b38971428a19..f900bbeb914057 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/BSD-x86/asm/openssl-fips.gypi @@ -30,7 +30,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/ecb3_enc.c', diff --git a/deps/openssl/config/archs/BSD-x86/asm/openssl.gypi b/deps/openssl/config/archs/BSD-x86/asm/openssl.gypi index 34a45a8e63eb87..2a4a7ba93b93d2 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/openssl.gypi +++ b/deps/openssl/config/archs/BSD-x86/asm/openssl.gypi @@ -188,7 +188,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/cmll_cfb.c', diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/configdata.pm b/deps/openssl/config/archs/BSD-x86/asm_avx2/configdata.pm index 14fadb6e808b72..fe8c42f5c72614 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/configdata.pm @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -203,7 +203,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-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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -255,11 +255,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "BSD-x86", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1320,6 +1320,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3964,6 +3967,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4072,6 +4078,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6337,6 +6346,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6445,6 +6457,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7794,6 +7809,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8461,7 +8480,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", "crypto/bn/libcrypto-lib-co-586.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-x86-gf2m.o", "crypto/bn/libcrypto-lib-x86-mont.o", "crypto/bn/libfips-lib-bn-586.o", @@ -8493,7 +8511,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", "crypto/bn/libfips-lib-co-586.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-x86-gf2m.o", "crypto/bn/libfips-lib-x86-mont.o" ], @@ -12955,6 +12972,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -13063,6 +13083,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15328,6 +15351,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15436,6 +15462,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16948,6 +16977,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -16984,6 +17014,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18895,6 +18926,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19919,6 +19954,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19955,6 +19991,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20220,6 +20257,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -21066,9 +21104,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-co-586.o" => [ "crypto/bn/co-586.S" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libcrypto-lib-x86-gf2m.o" => [ "crypto/bn/x86-gf2m.S" ], @@ -21162,9 +21197,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-co-586.o" => [ "crypto/bn/co-586.S" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-x86-gf2m.o" => [ "crypto/bn/x86-gf2m.S" ], @@ -23714,7 +23746,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", "crypto/bn/libcrypto-lib-co-586.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-x86-gf2m.o", "crypto/bn/libcrypto-lib-x86-mont.o", "crypto/buffer/libcrypto-lib-buf_err.o", @@ -25296,7 +25327,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", "crypto/bn/libfips-lib-co-586.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-x86-gf2m.o", "crypto/bn/libfips-lib-x86-mont.o", "crypto/buffer/libfips-lib-buffer.o", @@ -26814,6 +26844,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27509,8 +27545,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27537,7 +27573,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27554,8 +27590,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/buildinf.h index 228d13654257f7..bacd1f1db009eb 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: BSD-x86" -#define DATE "built on: Mon Feb 13 14:04:20 2023 UTC" +#define DATE "built on: Fri Jun 9 11:59:07 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/cmp.h b/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/cmp.h +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/BSD-x86/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl-fips.gypi index 7858056b1b531f..f9448e07fd9d12 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl-fips.gypi @@ -30,7 +30,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/ecb3_enc.c', diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl.gypi b/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl.gypi index 025cf8881c1c33..f4392fdfa2727d 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl.gypi @@ -188,7 +188,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/cmll_cfb.c', diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/configdata.pm b/deps/openssl/config/archs/BSD-x86/no-asm/configdata.pm index a88e1fa2dea04e..f304aeafc1f071 100644 --- a/deps/openssl/config/archs/BSD-x86/no-asm/configdata.pm +++ b/deps/openssl/config/archs/BSD-x86/no-asm/configdata.pm @@ -18,7 +18,7 @@ our %config = ( "ARFLAGS" => [ "qc" ], - "CC" => "gcc", + "CC" => "cc", "CFLAGS" => [ "-Wall -O3 -fomit-frame-pointer" ], @@ -154,7 +154,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -202,7 +202,7 @@ 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-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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -221,7 +221,7 @@ our %config = ( "AS" => undef, "ASFLAGS" => undef, "BUILDFILE" => undef, - "CC" => "gcc", + "CC" => undef, "CFLAGS" => undef, "CPP" => undef, "CPPDEFINES" => undef, @@ -255,11 +255,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "BSD-x86", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1321,6 +1321,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3908,6 +3911,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4016,6 +4022,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6281,6 +6290,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6389,6 +6401,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7738,6 +7753,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8402,7 +8421,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-bn_add.o", "crypto/bn/libfips-lib-bn_asm.o", "crypto/bn/libfips-lib-bn_blind.o", @@ -8430,8 +8448,7 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_shift.o", "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", - "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o" + "crypto/bn/libfips-lib-bn_word.o" ], "products" => { "lib" => [ @@ -12877,6 +12894,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -12985,6 +13005,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15250,6 +15273,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15358,6 +15384,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16870,6 +16899,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -16906,6 +16936,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18817,6 +18848,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19841,6 +19876,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19877,6 +19913,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20142,6 +20179,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -20979,9 +21017,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_x931p.o" => [ "crypto/bn/bn_x931p.c" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-bn_add.o" => [ "crypto/bn/bn_add.c" ], @@ -21066,9 +21101,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_word.o" => [ "crypto/bn/bn_word.c" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/buffer/libcrypto-lib-buf_err.o" => [ "crypto/buffer/buf_err.c" ], @@ -23568,7 +23600,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/buffer/libcrypto-lib-buf_err.o", "crypto/buffer/libcrypto-lib-buffer.o", "crypto/camellia/libcrypto-lib-camellia.o", @@ -25138,7 +25169,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/buffer/libfips-lib-buffer.o", "crypto/cmac/libfips-lib-cmac.o", "crypto/des/libfips-lib-des_enc.o", @@ -26648,6 +26678,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27346,8 +27382,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27374,7 +27410,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27391,8 +27427,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/BSD-x86/no-asm/crypto/buildinf.h index 91e0a9a205a5c1..0385ea99f117a7 100644 --- a/deps/openssl/config/archs/BSD-x86/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/BSD-x86/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: BSD-x86" -#define DATE "built on: Mon Feb 13 14:04:32 2023 UTC" +#define DATE "built on: Fri Jun 9 11:59:26 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -19,14 +19,14 @@ * literal */ static const char compiler_flags[] = { - 'c','o','m','p','i','l','e','r',':',' ','g','c','c',' ','-','f', - 'P','I','C',' ','-','p','t','h','r','e','a','d',' ','-','W','a', - 'l','l',' ','-','O','3',' ','-','f','o','m','i','t','-','f','r', - 'a','m','e','-','p','o','i','n','t','e','r',' ','-','D','L','_', - 'E','N','D','I','A','N',' ','-','D','O','P','E','N','S','S','L', - '_','P','I','C',' ','-','D','_','T','H','R','E','A','D','_','S', - 'A','F','E',' ','-','D','_','R','E','E','N','T','R','A','N','T', - ' ','-','D','O','P','E','N','S','S','L','_','B','U','I','L','D', - 'I','N','G','_','O','P','E','N','S','S','L',' ','-','D','N','D', - 'E','B','U','G','\0' + 'c','o','m','p','i','l','e','r',':',' ','c','c',' ','-','f','P', + 'I','C',' ','-','p','t','h','r','e','a','d',' ','-','W','a','l', + 'l',' ','-','O','3',' ','-','f','o','m','i','t','-','f','r','a', + 'm','e','-','p','o','i','n','t','e','r',' ','-','D','L','_','E', + 'N','D','I','A','N',' ','-','D','O','P','E','N','S','S','L','_', + 'P','I','C',' ','-','D','_','T','H','R','E','A','D','_','S','A', + 'F','E',' ','-','D','_','R','E','E','N','T','R','A','N','T',' ', + '-','D','O','P','E','N','S','S','L','_','B','U','I','L','D','I', + 'N','G','_','O','P','E','N','S','S','L',' ','-','D','N','D','E', + 'B','U','G','\0' }; diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/cmp.h b/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/cmp.h +++ b/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/BSD-x86/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/BSD-x86/no-asm/openssl-fips.gypi index 3bdf95ec72ac4b..4d4d25a9e8f6dc 100644 --- a/deps/openssl/config/archs/BSD-x86/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/BSD-x86/no-asm/openssl-fips.gypi @@ -33,7 +33,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/des_enc.c', diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/openssl.gypi b/deps/openssl/config/archs/BSD-x86/no-asm/openssl.gypi index 3426ad5bc483ca..12fdb1843c693c 100644 --- a/deps/openssl/config/archs/BSD-x86/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/BSD-x86/no-asm/openssl.gypi @@ -192,7 +192,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/camellia.c', diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm b/deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm index a757a01c911747..94053117f2bca1 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm +++ b/deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -203,7 +203,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-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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -255,11 +255,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "BSD-x86_64", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1321,6 +1321,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3970,6 +3973,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4078,6 +4084,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6343,6 +6352,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6451,6 +6463,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7800,6 +7815,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8473,7 +8492,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-rsaz-avx2.o", "crypto/bn/libcrypto-lib-rsaz-avx512.o", "crypto/bn/libcrypto-lib-rsaz-x86_64.o", @@ -8509,7 +8527,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-rsaz-avx2.o", "crypto/bn/libfips-lib-rsaz-avx512.o", "crypto/bn/libfips-lib-rsaz-x86_64.o", @@ -12997,6 +13014,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -13105,6 +13125,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15370,6 +15393,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15478,6 +15504,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16990,6 +17019,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -17026,6 +17056,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18937,6 +18968,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19961,6 +19996,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19997,6 +20033,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20262,6 +20299,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -21132,9 +21170,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_x931p.o" => [ "crypto/bn/bn_x931p.c" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libcrypto-lib-rsaz-avx2.o" => [ "crypto/bn/rsaz-avx2.s" ], @@ -21240,9 +21275,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_word.o" => [ "crypto/bn/bn_word.c" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-rsaz-avx2.o" => [ "crypto/bn/rsaz-avx2.s" ], @@ -23837,7 +23869,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-rsaz-avx2.o", "crypto/bn/libcrypto-lib-rsaz-avx512.o", "crypto/bn/libcrypto-lib-rsaz-x86_64.o", @@ -25432,7 +25463,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-rsaz-avx2.o", "crypto/bn/libfips-lib-rsaz-avx512.o", "crypto/bn/libfips-lib-rsaz-x86_64.o", @@ -26960,6 +26990,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27655,8 +27691,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27683,7 +27719,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27700,8 +27736,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h index 808adc4df4ef17..030011ddd329d1 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: BSD-x86_64" -#define DATE "built on: Mon Feb 13 14:04:42 2023 UTC" +#define DATE "built on: Fri Jun 9 11:59:45 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/cmp.h b/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/cmp.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/BSD-x86_64/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/openssl-fips.gypi b/deps/openssl/config/archs/BSD-x86_64/asm/openssl-fips.gypi index e0b96484802ab7..e98affa3c77d90 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/BSD-x86_64/asm/openssl-fips.gypi @@ -31,7 +31,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/bn/rsaz_exp.c', 'openssl/crypto/bn/rsaz_exp_x2.c', 'openssl/crypto/buffer/buffer.c', diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/openssl.gypi b/deps/openssl/config/archs/BSD-x86_64/asm/openssl.gypi index f2fbf6543b0abc..d666f1d87ab6ee 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/openssl.gypi +++ b/deps/openssl/config/archs/BSD-x86_64/asm/openssl.gypi @@ -190,7 +190,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/bn/rsaz_exp.c', 'openssl/crypto/bn/rsaz_exp_x2.c', 'openssl/crypto/buffer/buf_err.c', diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/configdata.pm b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/configdata.pm index fa23ed5ae32297..8ee8ba6f5f209c 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/configdata.pm @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -203,7 +203,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-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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -255,11 +255,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "BSD-x86_64", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1321,6 +1321,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3970,6 +3973,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4078,6 +4084,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6343,6 +6352,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6451,6 +6463,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7800,6 +7815,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8473,7 +8492,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-rsaz-avx2.o", "crypto/bn/libcrypto-lib-rsaz-avx512.o", "crypto/bn/libcrypto-lib-rsaz-x86_64.o", @@ -8509,7 +8527,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-rsaz-avx2.o", "crypto/bn/libfips-lib-rsaz-avx512.o", "crypto/bn/libfips-lib-rsaz-x86_64.o", @@ -12997,6 +13014,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -13105,6 +13125,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15370,6 +15393,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15478,6 +15504,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16990,6 +17019,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -17026,6 +17056,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18937,6 +18968,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19961,6 +19996,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19997,6 +20033,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20262,6 +20299,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -21132,9 +21170,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_x931p.o" => [ "crypto/bn/bn_x931p.c" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libcrypto-lib-rsaz-avx2.o" => [ "crypto/bn/rsaz-avx2.s" ], @@ -21240,9 +21275,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_word.o" => [ "crypto/bn/bn_word.c" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-rsaz-avx2.o" => [ "crypto/bn/rsaz-avx2.s" ], @@ -23837,7 +23869,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-rsaz-avx2.o", "crypto/bn/libcrypto-lib-rsaz-avx512.o", "crypto/bn/libcrypto-lib-rsaz-x86_64.o", @@ -25432,7 +25463,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-rsaz-avx2.o", "crypto/bn/libfips-lib-rsaz-avx512.o", "crypto/bn/libfips-lib-rsaz-x86_64.o", @@ -26960,6 +26990,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27655,8 +27691,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27683,7 +27719,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27700,8 +27736,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/buildinf.h index dc95f6c941feae..e51610d0ee444a 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: BSD-x86_64" -#define DATE "built on: Mon Feb 13 14:04:56 2023 UTC" +#define DATE "built on: Fri Jun 9 12:00:09 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/cmp.h b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/cmp.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/BSD-x86_64/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl-fips.gypi index ef76760f23f47a..2831a837c2afd2 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl-fips.gypi @@ -31,7 +31,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/bn/rsaz_exp.c', 'openssl/crypto/bn/rsaz_exp_x2.c', 'openssl/crypto/buffer/buffer.c', diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl.gypi b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl.gypi index 24930e9ec8474b..e5835b13683008 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl.gypi @@ -190,7 +190,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/bn/rsaz_exp.c', 'openssl/crypto/bn/rsaz_exp_x2.c', 'openssl/crypto/buffer/buf_err.c', diff --git a/deps/openssl/config/archs/BSD-x86_64/no-asm/configdata.pm b/deps/openssl/config/archs/BSD-x86_64/no-asm/configdata.pm index d8d97e5c96d3b9..fe6faf48fe717b 100644 --- a/deps/openssl/config/archs/BSD-x86_64/no-asm/configdata.pm +++ b/deps/openssl/config/archs/BSD-x86_64/no-asm/configdata.pm @@ -18,7 +18,7 @@ our %config = ( "ARFLAGS" => [ "qc" ], - "CC" => "gcc", + "CC" => "cc", "CFLAGS" => [ "-Wall -O3" ], @@ -154,7 +154,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -202,7 +202,7 @@ 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-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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -221,7 +221,7 @@ our %config = ( "AS" => undef, "ASFLAGS" => undef, "BUILDFILE" => undef, - "CC" => "gcc", + "CC" => undef, "CFLAGS" => undef, "CPP" => undef, "CPPDEFINES" => undef, @@ -255,11 +255,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "BSD-x86_64", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1322,6 +1322,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3909,6 +3912,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4017,6 +4023,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6282,6 +6291,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6390,6 +6402,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7739,6 +7754,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8403,7 +8422,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-bn_add.o", "crypto/bn/libfips-lib-bn_asm.o", "crypto/bn/libfips-lib-bn_blind.o", @@ -8431,8 +8449,7 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_shift.o", "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", - "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o" + "crypto/bn/libfips-lib-bn_word.o" ], "products" => { "lib" => [ @@ -12878,6 +12895,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -12986,6 +13006,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15251,6 +15274,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15359,6 +15385,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16871,6 +16900,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -16907,6 +16937,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18818,6 +18849,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19842,6 +19877,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19878,6 +19914,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20143,6 +20180,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -20980,9 +21018,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_x931p.o" => [ "crypto/bn/bn_x931p.c" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-bn_add.o" => [ "crypto/bn/bn_add.c" ], @@ -21067,9 +21102,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_word.o" => [ "crypto/bn/bn_word.c" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/buffer/libcrypto-lib-buf_err.o" => [ "crypto/buffer/buf_err.c" ], @@ -23569,7 +23601,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/buffer/libcrypto-lib-buf_err.o", "crypto/buffer/libcrypto-lib-buffer.o", "crypto/camellia/libcrypto-lib-camellia.o", @@ -25139,7 +25170,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/buffer/libfips-lib-buffer.o", "crypto/cmac/libfips-lib-cmac.o", "crypto/des/libfips-lib-des_enc.o", @@ -26649,6 +26679,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27347,8 +27383,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27375,7 +27411,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27392,8 +27428,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/buildinf.h index 6f38aba79c453e..76c3d4c52a8c42 100644 --- a/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: BSD-x86_64" -#define DATE "built on: Mon Feb 13 14:05:10 2023 UTC" +#define DATE "built on: Fri Jun 9 12:00:34 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -19,12 +19,12 @@ * literal */ static const char compiler_flags[] = { - 'c','o','m','p','i','l','e','r',':',' ','g','c','c',' ','-','f', - 'P','I','C',' ','-','p','t','h','r','e','a','d',' ','-','W','a', - 'l','l',' ','-','O','3',' ','-','D','L','_','E','N','D','I','A', - 'N',' ','-','D','O','P','E','N','S','S','L','_','P','I','C',' ', - '-','D','_','T','H','R','E','A','D','_','S','A','F','E',' ','-', - 'D','_','R','E','E','N','T','R','A','N','T',' ','-','D','O','P', - 'E','N','S','S','L','_','B','U','I','L','D','I','N','G','_','O', - 'P','E','N','S','S','L',' ','-','D','N','D','E','B','U','G','\0' + 'c','o','m','p','i','l','e','r',':',' ','c','c',' ','-','f','P', + 'I','C',' ','-','p','t','h','r','e','a','d',' ','-','W','a','l', + 'l',' ','-','O','3',' ','-','D','L','_','E','N','D','I','A','N', + ' ','-','D','O','P','E','N','S','S','L','_','P','I','C',' ','-', + 'D','_','T','H','R','E','A','D','_','S','A','F','E',' ','-','D', + '_','R','E','E','N','T','R','A','N','T',' ','-','D','O','P','E', + 'N','S','S','L','_','B','U','I','L','D','I','N','G','_','O','P', + 'E','N','S','S','L',' ','-','D','N','D','E','B','U','G','\0' }; diff --git a/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/cmp.h b/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/cmp.h +++ b/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/BSD-x86_64/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/BSD-x86_64/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/BSD-x86_64/no-asm/openssl-fips.gypi index ec0cf1709481d5..e1b0a3a63deac0 100644 --- a/deps/openssl/config/archs/BSD-x86_64/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/BSD-x86_64/no-asm/openssl-fips.gypi @@ -33,7 +33,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/des_enc.c', diff --git a/deps/openssl/config/archs/BSD-x86_64/no-asm/openssl.gypi b/deps/openssl/config/archs/BSD-x86_64/no-asm/openssl.gypi index 78e45978d08f6d..d1d45e83d022b8 100644 --- a/deps/openssl/config/archs/BSD-x86_64/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/BSD-x86_64/no-asm/openssl.gypi @@ -192,7 +192,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/camellia.c', diff --git a/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm b/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm index 6bbf8b19e91a86..5f342faf4fe565 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm @@ -165,7 +165,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -216,7 +216,7 @@ our %config = ( ], "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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -268,11 +268,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "VC-WIN32", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "lib", @@ -287,7 +287,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x56195e685cb0)", + "RANLIB" => "CODE(0x55fe658edb00)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -1371,6 +1371,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -4012,6 +4015,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4120,6 +4126,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6385,6 +6394,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6493,6 +6505,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7848,6 +7863,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8517,7 +8536,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", "crypto/bn/libcrypto-lib-co-586.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-x86-gf2m.o", "crypto/bn/libcrypto-lib-x86-mont.o", "crypto/bn/libfips-lib-bn-586.o", @@ -8549,7 +8567,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", "crypto/bn/libfips-lib-co-586.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-x86-gf2m.o", "crypto/bn/libfips-lib-x86-mont.o" ], @@ -13013,6 +13030,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -13121,6 +13141,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15386,6 +15409,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15494,6 +15520,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -17022,6 +17051,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -17058,6 +17088,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18975,6 +19006,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19999,6 +20034,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -20035,6 +20071,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20300,6 +20337,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -21156,9 +21194,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-co-586.o" => [ "crypto/bn/co-586.S" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libcrypto-lib-x86-gf2m.o" => [ "crypto/bn/x86-gf2m.S" ], @@ -21252,9 +21287,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-co-586.o" => [ "crypto/bn/co-586.S" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-x86-gf2m.o" => [ "crypto/bn/x86-gf2m.S" ], @@ -23801,7 +23833,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", "crypto/bn/libcrypto-lib-co-586.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-x86-gf2m.o", "crypto/bn/libcrypto-lib-x86-mont.o", "crypto/buffer/libcrypto-lib-buf_err.o", @@ -25390,7 +25421,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", "crypto/bn/libfips-lib-co-586.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-x86-gf2m.o", "crypto/bn/libfips-lib-x86-mont.o", "crypto/buffer/libfips-lib-buffer.o", @@ -26909,6 +26939,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27604,8 +27640,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27632,7 +27668,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27649,8 +27685,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/VC-WIN32/asm/crypto/buildinf.h b/deps/openssl/config/archs/VC-WIN32/asm/crypto/buildinf.h index e2e8b80a7cf3ab..db23ff982f9c84 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/VC-WIN32/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: " -#define DATE "built on: Mon Feb 13 14:13:24 2023 UTC" +#define DATE "built on: Fri Jun 9 12:15:22 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -19,27 +19,27 @@ * literal */ static const char compiler_flags[] = { - 'c','o','m','p','i','l','e','r',':',' ','g','c','c',' ','/','Z', - 'i',' ','/','F','d','o','s','s','l','_','s','t','a','t','i','c', - '.','p','d','b',' ',' ','-','D','O','P','E','N','S','S','L','_', - 'I','A','3','2','_','S','S','E','2',' ','-','D','L','_','E','N', - 'D','I','A','N',' ','-','D','O','P','E','N','S','S','L','_','P', - 'I','C',' ','-','D','O','P','E','N','S','S','L','_','C','P','U', - 'I','D','_','O','B','J',' ','-','D','O','P','E','N','S','S','L', - '_','B','N','_','A','S','M','_','P','A','R','T','_','W','O','R', - 'D','S',' ','-','D','O','P','E','N','S','S','L','_','I','A','3', - '2','_','S','S','E','2',' ','-','D','O','P','E','N','S','S','L', - '_','B','N','_','A','S','M','_','M','O','N','T',' ','-','D','O', - 'P','E','N','S','S','L','_','B','N','_','A','S','M','_','G','F', - '2','m',' ','-','D','S','H','A','1','_','A','S','M',' ','-','D', - 'S','H','A','2','5','6','_','A','S','M',' ','-','D','S','H','A', - '5','1','2','_','A','S','M',' ','-','D','R','C','4','_','A','S', - 'M',' ','-','D','M','D','5','_','A','S','M',' ','-','D','R','M', - 'D','1','6','0','_','A','S','M',' ','-','D','A','E','S','_','A', - 'S','M',' ','-','D','V','P','A','E','S','_','A','S','M',' ','-', - 'D','W','H','I','R','L','P','O','O','L','_','A','S','M',' ','-', - 'D','G','H','A','S','H','_','A','S','M',' ','-','D','E','C','P', - '_','N','I','S','T','Z','2','5','6','_','A','S','M',' ','-','D', - 'P','A','D','L','O','C','K','_','A','S','M',' ','-','D','P','O', - 'L','Y','1','3','0','5','_','A','S','M','\0' + 'c','o','m','p','i','l','e','r',':',' ','c','c',' ','/','Z','i', + ' ','/','F','d','o','s','s','l','_','s','t','a','t','i','c','.', + 'p','d','b',' ',' ','-','D','O','P','E','N','S','S','L','_','I', + 'A','3','2','_','S','S','E','2',' ','-','D','L','_','E','N','D', + 'I','A','N',' ','-','D','O','P','E','N','S','S','L','_','P','I', + 'C',' ','-','D','O','P','E','N','S','S','L','_','C','P','U','I', + 'D','_','O','B','J',' ','-','D','O','P','E','N','S','S','L','_', + 'B','N','_','A','S','M','_','P','A','R','T','_','W','O','R','D', + 'S',' ','-','D','O','P','E','N','S','S','L','_','I','A','3','2', + '_','S','S','E','2',' ','-','D','O','P','E','N','S','S','L','_', + 'B','N','_','A','S','M','_','M','O','N','T',' ','-','D','O','P', + 'E','N','S','S','L','_','B','N','_','A','S','M','_','G','F','2', + 'm',' ','-','D','S','H','A','1','_','A','S','M',' ','-','D','S', + 'H','A','2','5','6','_','A','S','M',' ','-','D','S','H','A','5', + '1','2','_','A','S','M',' ','-','D','R','C','4','_','A','S','M', + ' ','-','D','M','D','5','_','A','S','M',' ','-','D','R','M','D', + '1','6','0','_','A','S','M',' ','-','D','A','E','S','_','A','S', + 'M',' ','-','D','V','P','A','E','S','_','A','S','M',' ','-','D', + 'W','H','I','R','L','P','O','O','L','_','A','S','M',' ','-','D', + 'G','H','A','S','H','_','A','S','M',' ','-','D','E','C','P','_', + 'N','I','S','T','Z','2','5','6','_','A','S','M',' ','-','D','P', + 'A','D','L','O','C','K','_','A','S','M',' ','-','D','P','O','L', + 'Y','1','3','0','5','_','A','S','M','\0' }; diff --git a/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/cmp.h b/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/cmp.h index 170a00036ce4dc..f0e768e01baacd 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/cmp.h +++ b/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/opensslv.h index a63e892265737e..874d53c931fc8a 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/VC-WIN32/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/VC-WIN32/asm/openssl-fips.gypi b/deps/openssl/config/archs/VC-WIN32/asm/openssl-fips.gypi index e48ebc84212af0..44bc4f894fb1ee 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/VC-WIN32/asm/openssl-fips.gypi @@ -30,7 +30,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/ecb3_enc.c', diff --git a/deps/openssl/config/archs/VC-WIN32/asm/openssl.gypi b/deps/openssl/config/archs/VC-WIN32/asm/openssl.gypi index 6df450496c2740..07b539779f9fe1 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/openssl.gypi +++ b/deps/openssl/config/archs/VC-WIN32/asm/openssl.gypi @@ -188,7 +188,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/cmll_cfb.c', diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/configdata.pm b/deps/openssl/config/archs/VC-WIN32/asm_avx2/configdata.pm index 73cb193801c8db..489b9a56592a91 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/configdata.pm @@ -165,7 +165,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -216,7 +216,7 @@ our %config = ( ], "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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -268,11 +268,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "VC-WIN32", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "lib", @@ -287,7 +287,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x558fc7dbdc90)", + "RANLIB" => "CODE(0x55d85b90f3a0)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -1371,6 +1371,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -4012,6 +4015,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4120,6 +4126,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6385,6 +6394,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6493,6 +6505,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7848,6 +7863,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8517,7 +8536,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", "crypto/bn/libcrypto-lib-co-586.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-x86-gf2m.o", "crypto/bn/libcrypto-lib-x86-mont.o", "crypto/bn/libfips-lib-bn-586.o", @@ -8549,7 +8567,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", "crypto/bn/libfips-lib-co-586.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-x86-gf2m.o", "crypto/bn/libfips-lib-x86-mont.o" ], @@ -13013,6 +13030,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -13121,6 +13141,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15386,6 +15409,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15494,6 +15520,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -17022,6 +17051,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -17058,6 +17088,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18975,6 +19006,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19999,6 +20034,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -20035,6 +20071,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20300,6 +20337,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -21156,9 +21194,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-co-586.o" => [ "crypto/bn/co-586.S" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libcrypto-lib-x86-gf2m.o" => [ "crypto/bn/x86-gf2m.S" ], @@ -21252,9 +21287,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-co-586.o" => [ "crypto/bn/co-586.S" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-x86-gf2m.o" => [ "crypto/bn/x86-gf2m.S" ], @@ -23801,7 +23833,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", "crypto/bn/libcrypto-lib-co-586.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-x86-gf2m.o", "crypto/bn/libcrypto-lib-x86-mont.o", "crypto/buffer/libcrypto-lib-buf_err.o", @@ -25390,7 +25421,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", "crypto/bn/libfips-lib-co-586.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-x86-gf2m.o", "crypto/bn/libfips-lib-x86-mont.o", "crypto/buffer/libfips-lib-buffer.o", @@ -26909,6 +26939,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27604,8 +27640,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27632,7 +27668,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27649,8 +27685,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/buildinf.h index 2bd8ab2e0c4e27..81c4bb130a934e 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: " -#define DATE "built on: Mon Feb 13 14:13:35 2023 UTC" +#define DATE "built on: Fri Jun 9 12:15:41 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -19,27 +19,27 @@ * literal */ static const char compiler_flags[] = { - 'c','o','m','p','i','l','e','r',':',' ','g','c','c',' ','/','Z', - 'i',' ','/','F','d','o','s','s','l','_','s','t','a','t','i','c', - '.','p','d','b',' ',' ','-','D','O','P','E','N','S','S','L','_', - 'I','A','3','2','_','S','S','E','2',' ','-','D','L','_','E','N', - 'D','I','A','N',' ','-','D','O','P','E','N','S','S','L','_','P', - 'I','C',' ','-','D','O','P','E','N','S','S','L','_','C','P','U', - 'I','D','_','O','B','J',' ','-','D','O','P','E','N','S','S','L', - '_','B','N','_','A','S','M','_','P','A','R','T','_','W','O','R', - 'D','S',' ','-','D','O','P','E','N','S','S','L','_','I','A','3', - '2','_','S','S','E','2',' ','-','D','O','P','E','N','S','S','L', - '_','B','N','_','A','S','M','_','M','O','N','T',' ','-','D','O', - 'P','E','N','S','S','L','_','B','N','_','A','S','M','_','G','F', - '2','m',' ','-','D','S','H','A','1','_','A','S','M',' ','-','D', - 'S','H','A','2','5','6','_','A','S','M',' ','-','D','S','H','A', - '5','1','2','_','A','S','M',' ','-','D','R','C','4','_','A','S', - 'M',' ','-','D','M','D','5','_','A','S','M',' ','-','D','R','M', - 'D','1','6','0','_','A','S','M',' ','-','D','A','E','S','_','A', - 'S','M',' ','-','D','V','P','A','E','S','_','A','S','M',' ','-', - 'D','W','H','I','R','L','P','O','O','L','_','A','S','M',' ','-', - 'D','G','H','A','S','H','_','A','S','M',' ','-','D','E','C','P', - '_','N','I','S','T','Z','2','5','6','_','A','S','M',' ','-','D', - 'P','A','D','L','O','C','K','_','A','S','M',' ','-','D','P','O', - 'L','Y','1','3','0','5','_','A','S','M','\0' + 'c','o','m','p','i','l','e','r',':',' ','c','c',' ','/','Z','i', + ' ','/','F','d','o','s','s','l','_','s','t','a','t','i','c','.', + 'p','d','b',' ',' ','-','D','O','P','E','N','S','S','L','_','I', + 'A','3','2','_','S','S','E','2',' ','-','D','L','_','E','N','D', + 'I','A','N',' ','-','D','O','P','E','N','S','S','L','_','P','I', + 'C',' ','-','D','O','P','E','N','S','S','L','_','C','P','U','I', + 'D','_','O','B','J',' ','-','D','O','P','E','N','S','S','L','_', + 'B','N','_','A','S','M','_','P','A','R','T','_','W','O','R','D', + 'S',' ','-','D','O','P','E','N','S','S','L','_','I','A','3','2', + '_','S','S','E','2',' ','-','D','O','P','E','N','S','S','L','_', + 'B','N','_','A','S','M','_','M','O','N','T',' ','-','D','O','P', + 'E','N','S','S','L','_','B','N','_','A','S','M','_','G','F','2', + 'm',' ','-','D','S','H','A','1','_','A','S','M',' ','-','D','S', + 'H','A','2','5','6','_','A','S','M',' ','-','D','S','H','A','5', + '1','2','_','A','S','M',' ','-','D','R','C','4','_','A','S','M', + ' ','-','D','M','D','5','_','A','S','M',' ','-','D','R','M','D', + '1','6','0','_','A','S','M',' ','-','D','A','E','S','_','A','S', + 'M',' ','-','D','V','P','A','E','S','_','A','S','M',' ','-','D', + 'W','H','I','R','L','P','O','O','L','_','A','S','M',' ','-','D', + 'G','H','A','S','H','_','A','S','M',' ','-','D','E','C','P','_', + 'N','I','S','T','Z','2','5','6','_','A','S','M',' ','-','D','P', + 'A','D','L','O','C','K','_','A','S','M',' ','-','D','P','O','L', + 'Y','1','3','0','5','_','A','S','M','\0' }; diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/cmp.h b/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/cmp.h index 170a00036ce4dc..f0e768e01baacd 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/cmp.h +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/opensslv.h index a63e892265737e..874d53c931fc8a 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/VC-WIN32/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl-fips.gypi index 55c0bd7168e53d..8f90fc015d135d 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl-fips.gypi @@ -30,7 +30,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/ecb3_enc.c', diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl.gypi b/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl.gypi index 90ef600abc04df..607341683d0b56 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl.gypi @@ -188,7 +188,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/cmll_cfb.c', diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm b/deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm index 5a5cf667064b71..95f445562af65d 100644 --- a/deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm @@ -19,7 +19,7 @@ our %config = ( "/nologo" ], "AS" => "nasm", - "CC" => "gcc", + "CC" => "cl", "CFLAGS" => [ "/W3 /wd4090 /nologo /O2" ], @@ -163,7 +163,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -215,7 +215,7 @@ our %config = ( ], "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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -234,7 +234,7 @@ our %config = ( "AS" => undef, "ASFLAGS" => undef, "BUILDFILE" => undef, - "CC" => "gcc", + "CC" => undef, "CFLAGS" => undef, "CPP" => undef, "CPPDEFINES" => undef, @@ -268,11 +268,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "VC-WIN32", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "lib", @@ -287,7 +287,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x55f8b3f3f6d8)", + "RANLIB" => "CODE(0x563faaebacb8)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -1372,6 +1372,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3956,6 +3959,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4064,6 +4070,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6329,6 +6338,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6437,6 +6449,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7792,6 +7807,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8458,7 +8477,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-bn_add.o", "crypto/bn/libfips-lib-bn_asm.o", "crypto/bn/libfips-lib-bn_blind.o", @@ -8486,8 +8504,7 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_shift.o", "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", - "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o" + "crypto/bn/libfips-lib-bn_word.o" ], "products" => { "lib" => [ @@ -12935,6 +12952,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -13043,6 +13063,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15308,6 +15331,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15416,6 +15442,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16944,6 +16973,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -16980,6 +17010,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18897,6 +18928,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19921,6 +19956,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19957,6 +19993,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20222,6 +20259,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -21069,9 +21107,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_x931p.o" => [ "crypto/bn/bn_x931p.c" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-bn_add.o" => [ "crypto/bn/bn_add.c" ], @@ -21156,9 +21191,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_word.o" => [ "crypto/bn/bn_word.c" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/buffer/libcrypto-lib-buf_err.o" => [ "crypto/buffer/buf_err.c" ], @@ -23655,7 +23687,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/buffer/libcrypto-lib-buf_err.o", "crypto/buffer/libcrypto-lib-buffer.o", "crypto/camellia/libcrypto-lib-camellia.o", @@ -25232,7 +25263,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/buffer/libfips-lib-buffer.o", "crypto/cmac/libfips-lib-cmac.o", "crypto/des/libfips-lib-des_enc.o", @@ -26743,6 +26773,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27441,8 +27477,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27469,7 +27505,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27486,8 +27522,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/buildinf.h index 65da593fc35565..e5d99ffb1f85e4 100644 --- a/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: " -#define DATE "built on: Mon Feb 13 14:13:46 2023 UTC" +#define DATE "built on: Fri Jun 9 12:16:00 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -19,27 +19,27 @@ * literal */ static const char compiler_flags[] = { - 'c','o','m','p','i','l','e','r',':',' ','g','c','c',' ','/','Z', - 'i',' ','/','F','d','o','s','s','l','_','s','t','a','t','i','c', - '.','p','d','b',' ',' ','-','D','O','P','E','N','S','S','L','_', - 'I','A','3','2','_','S','S','E','2',' ','-','D','L','_','E','N', - 'D','I','A','N',' ','-','D','O','P','E','N','S','S','L','_','P', - 'I','C',' ','-','D','O','P','E','N','S','S','L','_','C','P','U', - 'I','D','_','O','B','J',' ','-','D','O','P','E','N','S','S','L', - '_','B','N','_','A','S','M','_','P','A','R','T','_','W','O','R', - 'D','S',' ','-','D','O','P','E','N','S','S','L','_','I','A','3', - '2','_','S','S','E','2',' ','-','D','O','P','E','N','S','S','L', - '_','B','N','_','A','S','M','_','M','O','N','T',' ','-','D','O', - 'P','E','N','S','S','L','_','B','N','_','A','S','M','_','G','F', - '2','m',' ','-','D','S','H','A','1','_','A','S','M',' ','-','D', - 'S','H','A','2','5','6','_','A','S','M',' ','-','D','S','H','A', - '5','1','2','_','A','S','M',' ','-','D','R','C','4','_','A','S', - 'M',' ','-','D','M','D','5','_','A','S','M',' ','-','D','R','M', - 'D','1','6','0','_','A','S','M',' ','-','D','A','E','S','_','A', - 'S','M',' ','-','D','V','P','A','E','S','_','A','S','M',' ','-', - 'D','W','H','I','R','L','P','O','O','L','_','A','S','M',' ','-', - 'D','G','H','A','S','H','_','A','S','M',' ','-','D','E','C','P', - '_','N','I','S','T','Z','2','5','6','_','A','S','M',' ','-','D', - 'P','A','D','L','O','C','K','_','A','S','M',' ','-','D','P','O', - 'L','Y','1','3','0','5','_','A','S','M','\0' + 'c','o','m','p','i','l','e','r',':',' ','c','c',' ','/','Z','i', + ' ','/','F','d','o','s','s','l','_','s','t','a','t','i','c','.', + 'p','d','b',' ',' ','-','D','O','P','E','N','S','S','L','_','I', + 'A','3','2','_','S','S','E','2',' ','-','D','L','_','E','N','D', + 'I','A','N',' ','-','D','O','P','E','N','S','S','L','_','P','I', + 'C',' ','-','D','O','P','E','N','S','S','L','_','C','P','U','I', + 'D','_','O','B','J',' ','-','D','O','P','E','N','S','S','L','_', + 'B','N','_','A','S','M','_','P','A','R','T','_','W','O','R','D', + 'S',' ','-','D','O','P','E','N','S','S','L','_','I','A','3','2', + '_','S','S','E','2',' ','-','D','O','P','E','N','S','S','L','_', + 'B','N','_','A','S','M','_','M','O','N','T',' ','-','D','O','P', + 'E','N','S','S','L','_','B','N','_','A','S','M','_','G','F','2', + 'm',' ','-','D','S','H','A','1','_','A','S','M',' ','-','D','S', + 'H','A','2','5','6','_','A','S','M',' ','-','D','S','H','A','5', + '1','2','_','A','S','M',' ','-','D','R','C','4','_','A','S','M', + ' ','-','D','M','D','5','_','A','S','M',' ','-','D','R','M','D', + '1','6','0','_','A','S','M',' ','-','D','A','E','S','_','A','S', + 'M',' ','-','D','V','P','A','E','S','_','A','S','M',' ','-','D', + 'W','H','I','R','L','P','O','O','L','_','A','S','M',' ','-','D', + 'G','H','A','S','H','_','A','S','M',' ','-','D','E','C','P','_', + 'N','I','S','T','Z','2','5','6','_','A','S','M',' ','-','D','P', + 'A','D','L','O','C','K','_','A','S','M',' ','-','D','P','O','L', + 'Y','1','3','0','5','_','A','S','M','\0' }; diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/cmp.h b/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/cmp.h index 170a00036ce4dc..f0e768e01baacd 100644 --- a/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/cmp.h +++ b/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/opensslv.h index a63e892265737e..874d53c931fc8a 100644 --- a/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/VC-WIN32/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/VC-WIN32/no-asm/openssl-fips.gypi index 45edb39959ab8b..603ad27f9be83d 100644 --- a/deps/openssl/config/archs/VC-WIN32/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/VC-WIN32/no-asm/openssl-fips.gypi @@ -33,7 +33,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/des_enc.c', diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/openssl.gypi b/deps/openssl/config/archs/VC-WIN32/no-asm/openssl.gypi index 15ded008445eab..c4e4b169a0489d 100644 --- a/deps/openssl/config/archs/VC-WIN32/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/VC-WIN32/no-asm/openssl.gypi @@ -192,7 +192,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/camellia.c', diff --git a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/configdata.pm b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/configdata.pm index e048d7219cdb8d..326aee8a214bfc 100644 --- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/configdata.pm @@ -18,7 +18,7 @@ our %config = ( "ARFLAGS" => [ "/nologo" ], - "CC" => "gcc", + "CC" => "cl", "CFLAGS" => [ "/W3 /wd4090 /nologo /O2" ], @@ -163,7 +163,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -213,7 +213,7 @@ 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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -232,7 +232,7 @@ our %config = ( "AS" => undef, "ASFLAGS" => undef, "BUILDFILE" => undef, - "CC" => "gcc", + "CC" => undef, "CFLAGS" => undef, "CPP" => undef, "CPPDEFINES" => undef, @@ -266,11 +266,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "VC-WIN64-ARM", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "lib", @@ -283,7 +283,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x560b35d16608)", + "RANLIB" => "CODE(0x556dc7ce0ba8)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -1364,6 +1364,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3948,6 +3951,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4056,6 +4062,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6321,6 +6330,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6429,6 +6441,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7784,6 +7799,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8450,7 +8469,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-bn_add.o", "crypto/bn/libfips-lib-bn_asm.o", "crypto/bn/libfips-lib-bn_blind.o", @@ -8478,8 +8496,7 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_shift.o", "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", - "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o" + "crypto/bn/libfips-lib-bn_word.o" ], "products" => { "lib" => [ @@ -12927,6 +12944,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -13035,6 +13055,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15300,6 +15323,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15408,6 +15434,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16936,6 +16965,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -16972,6 +17002,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18889,6 +18920,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19913,6 +19948,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19949,6 +19985,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20214,6 +20251,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -21061,9 +21099,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_x931p.o" => [ "crypto/bn/bn_x931p.c" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-bn_add.o" => [ "crypto/bn/bn_add.c" ], @@ -21148,9 +21183,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_word.o" => [ "crypto/bn/bn_word.c" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/buffer/libcrypto-lib-buf_err.o" => [ "crypto/buffer/buf_err.c" ], @@ -23647,7 +23679,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/buffer/libcrypto-lib-buf_err.o", "crypto/buffer/libcrypto-lib-buffer.o", "crypto/camellia/libcrypto-lib-camellia.o", @@ -25224,7 +25255,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/buffer/libfips-lib-buffer.o", "crypto/cmac/libfips-lib-cmac.o", "crypto/des/libfips-lib-des_enc.o", @@ -26735,6 +26765,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27433,8 +27469,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27461,7 +27497,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27478,8 +27514,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/buildinf.h index 1c78164efeb710..8d5b5a0265ca60 100644 --- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: VC-WIN64-ARM" -#define DATE "built on: Mon Feb 13 14:13:56 2023 UTC" +#define DATE "built on: Fri Jun 9 12:16:18 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/cmp.h b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/cmp.h index 170a00036ce4dc..f0e768e01baacd 100644 --- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/cmp.h +++ b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/opensslv.h index a63e892265737e..874d53c931fc8a 100644 --- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/VC-WIN64-ARM/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/openssl-fips.gypi index 0b84f9edac3dd5..58f627a062a2cd 100644 --- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/openssl-fips.gypi @@ -33,7 +33,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/des_enc.c', diff --git a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/openssl.gypi b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/openssl.gypi index 892ec550f05841..81eb195afa9c48 100644 --- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/openssl.gypi @@ -192,7 +192,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/camellia.c', diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm b/deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm index 307b0396fdcf2d..772e2a57e368e9 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm @@ -168,7 +168,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -219,7 +219,7 @@ our %config = ( ], "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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -271,11 +271,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "VC-WIN64A", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "lib", @@ -290,7 +290,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x5652087d76d0)", + "RANLIB" => "CODE(0x55a5434b2770)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -1375,6 +1375,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -4021,6 +4024,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4129,6 +4135,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6394,6 +6403,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6502,6 +6514,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7857,6 +7872,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8533,7 +8552,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-rsaz-avx2.o", "crypto/bn/libcrypto-lib-rsaz-avx512.o", "crypto/bn/libcrypto-lib-rsaz-x86_64.o", @@ -8570,7 +8588,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-rsaz-avx2.o", "crypto/bn/libfips-lib-rsaz-avx512.o", "crypto/bn/libfips-lib-rsaz-x86_64.o", @@ -13048,6 +13065,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -13156,6 +13176,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15421,6 +15444,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15529,6 +15555,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -17057,6 +17086,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -17093,6 +17123,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -19010,6 +19041,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -20034,6 +20069,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -20070,6 +20106,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20335,6 +20372,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -21212,9 +21250,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_x931p.o" => [ "crypto/bn/bn_x931p.c" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libcrypto-lib-rsaz-avx2.o" => [ "crypto/bn/rsaz-avx2.s" ], @@ -21323,9 +21358,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_word.o" => [ "crypto/bn/bn_word.c" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-rsaz-avx2.o" => [ "crypto/bn/rsaz-avx2.s" ], @@ -23917,7 +23949,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-rsaz-avx2.o", "crypto/bn/libcrypto-lib-rsaz-avx512.o", "crypto/bn/libcrypto-lib-rsaz-x86_64.o", @@ -25519,7 +25550,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-rsaz-avx2.o", "crypto/bn/libfips-lib-rsaz-avx512.o", "crypto/bn/libfips-lib-rsaz-x86_64.o", @@ -27048,6 +27078,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27743,8 +27779,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27771,7 +27807,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27788,8 +27824,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/buildinf.h b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/buildinf.h index 8ca649d6caa6fe..75f69ed990b56e 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: " -#define DATE "built on: Mon Feb 13 14:12:47 2023 UTC" +#define DATE "built on: Fri Jun 9 12:14:15 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -19,5 +19,5 @@ * literal */ static const char compiler_flags[] = { - 'c','o','m','p','i','l','e','r',':',' ','g','c','c',' ',' ','\0' + 'c','o','m','p','i','l','e','r',':',' ','c','c',' ',' ','\0' }; diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/cmp.h b/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/cmp.h index 170a00036ce4dc..f0e768e01baacd 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/cmp.h +++ b/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/opensslv.h index a63e892265737e..874d53c931fc8a 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/VC-WIN64A/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/openssl-fips.gypi b/deps/openssl/config/archs/VC-WIN64A/asm/openssl-fips.gypi index 3ef8063ba8dae0..780f25951c1546 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/VC-WIN64A/asm/openssl-fips.gypi @@ -31,7 +31,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/bn/rsaz_exp.c', 'openssl/crypto/bn/rsaz_exp_x2.c', 'openssl/crypto/buffer/buffer.c', diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/openssl.gypi b/deps/openssl/config/archs/VC-WIN64A/asm/openssl.gypi index 635739dec0f07c..c1fe444ecbef8d 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/openssl.gypi +++ b/deps/openssl/config/archs/VC-WIN64A/asm/openssl.gypi @@ -190,7 +190,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/bn/rsaz_exp.c', 'openssl/crypto/bn/rsaz_exp_x2.c', 'openssl/crypto/buffer/buf_err.c', diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/configdata.pm b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/configdata.pm index 3a33833e724d8c..cbc250155f4bd0 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/configdata.pm @@ -168,7 +168,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -219,7 +219,7 @@ our %config = ( ], "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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -271,11 +271,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "VC-WIN64A", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "lib", @@ -290,7 +290,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x55cd5c11f9c0)", + "RANLIB" => "CODE(0x5590b4594db0)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -1375,6 +1375,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -4021,6 +4024,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4129,6 +4135,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6394,6 +6403,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6502,6 +6514,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7857,6 +7872,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8533,7 +8552,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-rsaz-avx2.o", "crypto/bn/libcrypto-lib-rsaz-avx512.o", "crypto/bn/libcrypto-lib-rsaz-x86_64.o", @@ -8570,7 +8588,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-rsaz-avx2.o", "crypto/bn/libfips-lib-rsaz-avx512.o", "crypto/bn/libfips-lib-rsaz-x86_64.o", @@ -13048,6 +13065,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -13156,6 +13176,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15421,6 +15444,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15529,6 +15555,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -17057,6 +17086,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -17093,6 +17123,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -19010,6 +19041,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -20034,6 +20069,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -20070,6 +20106,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20335,6 +20372,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -21212,9 +21250,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_x931p.o" => [ "crypto/bn/bn_x931p.c" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libcrypto-lib-rsaz-avx2.o" => [ "crypto/bn/rsaz-avx2.s" ], @@ -21323,9 +21358,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_word.o" => [ "crypto/bn/bn_word.c" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-rsaz-avx2.o" => [ "crypto/bn/rsaz-avx2.s" ], @@ -23917,7 +23949,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-rsaz-avx2.o", "crypto/bn/libcrypto-lib-rsaz-avx512.o", "crypto/bn/libcrypto-lib-rsaz-x86_64.o", @@ -25519,7 +25550,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-rsaz-avx2.o", "crypto/bn/libfips-lib-rsaz-avx512.o", "crypto/bn/libfips-lib-rsaz-x86_64.o", @@ -27048,6 +27078,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27743,8 +27779,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27771,7 +27807,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27788,8 +27824,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/buildinf.h index 78a751a60f3b3d..c4f414e265d1f9 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: " -#define DATE "built on: Mon Feb 13 14:13:01 2023 UTC" +#define DATE "built on: Fri Jun 9 12:14:40 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -19,5 +19,5 @@ * literal */ static const char compiler_flags[] = { - 'c','o','m','p','i','l','e','r',':',' ','g','c','c',' ',' ','\0' + 'c','o','m','p','i','l','e','r',':',' ','c','c',' ',' ','\0' }; diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/cmp.h b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/cmp.h index 170a00036ce4dc..f0e768e01baacd 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/cmp.h +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/opensslv.h index a63e892265737e..874d53c931fc8a 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/VC-WIN64A/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl-fips.gypi index c8319b48ab2622..205df43d3ce86a 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl-fips.gypi @@ -31,7 +31,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/bn/rsaz_exp.c', 'openssl/crypto/bn/rsaz_exp_x2.c', 'openssl/crypto/buffer/buffer.c', diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl.gypi b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl.gypi index 4bd22ea44b2a2b..d7fd83a46e3910 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl.gypi @@ -190,7 +190,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/bn/rsaz_exp.c', 'openssl/crypto/bn/rsaz_exp_x2.c', 'openssl/crypto/buffer/buf_err.c', diff --git a/deps/openssl/config/archs/VC-WIN64A/no-asm/configdata.pm b/deps/openssl/config/archs/VC-WIN64A/no-asm/configdata.pm index 6ab66718714789..5e12aa14fe94ad 100644 --- a/deps/openssl/config/archs/VC-WIN64A/no-asm/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/configdata.pm @@ -22,7 +22,7 @@ our %config = ( "ASFLAGS" => [ "-g" ], - "CC" => "gcc", + "CC" => "cl", "CFLAGS" => [ "/W3 /wd4090 /nologo /O2" ], @@ -166,7 +166,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -218,7 +218,7 @@ our %config = ( ], "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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -237,7 +237,7 @@ our %config = ( "AS" => undef, "ASFLAGS" => undef, "BUILDFILE" => undef, - "CC" => "gcc", + "CC" => undef, "CFLAGS" => undef, "CPP" => undef, "CPPDEFINES" => undef, @@ -271,11 +271,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "VC-WIN64A", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "lib", @@ -290,7 +290,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x561728431c98)", + "RANLIB" => "CODE(0x559ab9a64278)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -1376,6 +1376,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3960,6 +3963,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4068,6 +4074,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6333,6 +6342,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6441,6 +6453,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7796,6 +7811,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8462,7 +8481,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-bn_add.o", "crypto/bn/libfips-lib-bn_asm.o", "crypto/bn/libfips-lib-bn_blind.o", @@ -8490,8 +8508,7 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_shift.o", "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", - "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o" + "crypto/bn/libfips-lib-bn_word.o" ], "products" => { "lib" => [ @@ -12939,6 +12956,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -13047,6 +13067,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15312,6 +15335,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15420,6 +15446,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16948,6 +16977,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -16984,6 +17014,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18901,6 +18932,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19925,6 +19960,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19961,6 +19997,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20226,6 +20263,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -21073,9 +21111,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_x931p.o" => [ "crypto/bn/bn_x931p.c" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-bn_add.o" => [ "crypto/bn/bn_add.c" ], @@ -21160,9 +21195,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_word.o" => [ "crypto/bn/bn_word.c" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/buffer/libcrypto-lib-buf_err.o" => [ "crypto/buffer/buf_err.c" ], @@ -23659,7 +23691,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/buffer/libcrypto-lib-buf_err.o", "crypto/buffer/libcrypto-lib-buffer.o", "crypto/camellia/libcrypto-lib-camellia.o", @@ -25236,7 +25267,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/buffer/libfips-lib-buffer.o", "crypto/cmac/libfips-lib-cmac.o", "crypto/des/libfips-lib-des_enc.o", @@ -26747,6 +26777,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27445,8 +27481,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27473,7 +27509,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27490,8 +27526,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/buildinf.h index d9047e04f155bb..51a79f2842b4d2 100644 --- a/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: " -#define DATE "built on: Mon Feb 13 14:13:14 2023 UTC" +#define DATE "built on: Fri Jun 9 12:15:04 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -19,5 +19,5 @@ * literal */ static const char compiler_flags[] = { - 'c','o','m','p','i','l','e','r',':',' ','g','c','c',' ',' ','\0' + 'c','o','m','p','i','l','e','r',':',' ','c','c',' ',' ','\0' }; diff --git a/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/cmp.h b/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/cmp.h index 170a00036ce4dc..f0e768e01baacd 100644 --- a/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/cmp.h +++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/opensslv.h index a63e892265737e..874d53c931fc8a 100644 --- a/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/VC-WIN64A/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl-fips.gypi index ebdda8bcd55bad..8da150aab54f0c 100644 --- a/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl-fips.gypi @@ -33,7 +33,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/des_enc.c', diff --git a/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl.gypi b/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl.gypi index d09aced640d58c..af84bdff856623 100644 --- a/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl.gypi @@ -192,7 +192,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/camellia.c', diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm/configdata.pm b/deps/openssl/config/archs/aix64-gcc-as/asm/configdata.pm index d7cb32dbeab602..45f66d88bec8bd 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm/configdata.pm +++ b/deps/openssl/config/archs/aix64-gcc-as/asm/configdata.pm @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,7 +206,7 @@ our %config = ( ], "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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -258,11 +258,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "aix64-gcc-as", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar -X64", @@ -1324,6 +1324,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3949,6 +3952,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4057,6 +4063,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6322,6 +6331,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6430,6 +6442,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7779,6 +7794,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8453,7 +8472,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", "crypto/bn/libcrypto-lib-ppc-mont.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-bn-ppc.o", "crypto/bn/libfips-lib-bn_add.o", "crypto/bn/libfips-lib-bn_blind.o", @@ -8483,8 +8501,7 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-ppc-mont.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o" + "crypto/bn/libfips-lib-ppc-mont.o" ], "products" => { "lib" => [ @@ -12955,6 +12972,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -13063,6 +13083,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15328,6 +15351,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15436,6 +15462,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16948,6 +16977,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -16984,6 +17014,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18895,6 +18926,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19919,6 +19954,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19955,6 +19991,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20220,6 +20257,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -21081,9 +21119,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-ppc-mont.o" => [ "crypto/bn/ppc-mont.s" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-bn-ppc.o" => [ "crypto/bn/bn-ppc.s" ], @@ -21174,9 +21209,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-ppc-mont.o" => [ "crypto/bn/ppc-mont.s" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/buffer/libcrypto-lib-buf_err.o" => [ "crypto/buffer/buf_err.c" ], @@ -23762,7 +23794,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", "crypto/bn/libcrypto-lib-ppc-mont.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/buffer/libcrypto-lib-buf_err.o", "crypto/buffer/libcrypto-lib-buffer.o", "crypto/camellia/libcrypto-lib-camellia.o", @@ -25352,7 +25383,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", "crypto/bn/libfips-lib-ppc-mont.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/buffer/libfips-lib-buffer.o", "crypto/cmac/libfips-lib-cmac.o", "crypto/des/libfips-lib-des_enc.o", @@ -26874,6 +26904,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27572,8 +27608,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27600,7 +27636,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27617,8 +27653,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm/crypto/buildinf.h b/deps/openssl/config/archs/aix64-gcc-as/asm/crypto/buildinf.h index b767b13d5ffe17..d13a70519f2a29 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/aix64-gcc-as/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: aix64-gcc-as" -#define DATE "built on: Mon Feb 13 14:03:35 2023 UTC" +#define DATE "built on: Fri Jun 9 11:57:48 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/cmp.h b/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/cmp.h +++ b/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/aix64-gcc-as/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm/openssl-fips.gypi b/deps/openssl/config/archs/aix64-gcc-as/asm/openssl-fips.gypi index 9344144adf6ca0..834f45768009b6 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/aix64-gcc-as/asm/openssl-fips.gypi @@ -33,7 +33,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/des_enc.c', diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm/openssl.gypi b/deps/openssl/config/archs/aix64-gcc-as/asm/openssl.gypi index bb7e95846b6dc4..8a048cba01e211 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm/openssl.gypi +++ b/deps/openssl/config/archs/aix64-gcc-as/asm/openssl.gypi @@ -192,7 +192,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/camellia.c', diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/configdata.pm b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/configdata.pm index cc60b23311ac84..8b3a1f0ee5f0bb 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/configdata.pm @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,7 +206,7 @@ our %config = ( ], "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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -258,11 +258,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "aix64-gcc-as", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar -X64", @@ -1324,6 +1324,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3949,6 +3952,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4057,6 +4063,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6322,6 +6331,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6430,6 +6442,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7779,6 +7794,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8453,7 +8472,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", "crypto/bn/libcrypto-lib-ppc-mont.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-bn-ppc.o", "crypto/bn/libfips-lib-bn_add.o", "crypto/bn/libfips-lib-bn_blind.o", @@ -8483,8 +8501,7 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-ppc-mont.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o" + "crypto/bn/libfips-lib-ppc-mont.o" ], "products" => { "lib" => [ @@ -12955,6 +12972,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -13063,6 +13083,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15328,6 +15351,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15436,6 +15462,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16948,6 +16977,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -16984,6 +17014,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18895,6 +18926,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19919,6 +19954,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19955,6 +19991,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20220,6 +20257,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -21081,9 +21119,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-ppc-mont.o" => [ "crypto/bn/ppc-mont.s" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-bn-ppc.o" => [ "crypto/bn/bn-ppc.s" ], @@ -21174,9 +21209,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-ppc-mont.o" => [ "crypto/bn/ppc-mont.s" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/buffer/libcrypto-lib-buf_err.o" => [ "crypto/buffer/buf_err.c" ], @@ -23762,7 +23794,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", "crypto/bn/libcrypto-lib-ppc-mont.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/buffer/libcrypto-lib-buf_err.o", "crypto/buffer/libcrypto-lib-buffer.o", "crypto/camellia/libcrypto-lib-camellia.o", @@ -25352,7 +25383,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", "crypto/bn/libfips-lib-ppc-mont.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/buffer/libfips-lib-buffer.o", "crypto/cmac/libfips-lib-cmac.o", "crypto/des/libfips-lib-des_enc.o", @@ -26874,6 +26904,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27572,8 +27608,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27600,7 +27636,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27617,8 +27653,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/crypto/buildinf.h index 2001bb9fa5bb29..b49627c01c44a0 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: aix64-gcc-as" -#define DATE "built on: Mon Feb 13 14:03:47 2023 UTC" +#define DATE "built on: Fri Jun 9 11:58:08 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/cmp.h b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/cmp.h +++ b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/aix64-gcc-as/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/openssl-fips.gypi index 4144154c75cf88..275d88b584e7a5 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/openssl-fips.gypi @@ -33,7 +33,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/des_enc.c', diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/openssl.gypi b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/openssl.gypi index 6e95b79dfd8815..ab4157db96a8ad 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/openssl.gypi @@ -192,7 +192,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/camellia.c', diff --git a/deps/openssl/config/archs/aix64-gcc-as/no-asm/configdata.pm b/deps/openssl/config/archs/aix64-gcc-as/no-asm/configdata.pm index 9419e8d5e0fbae..c43b955a97f1fa 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/no-asm/configdata.pm +++ b/deps/openssl/config/archs/aix64-gcc-as/no-asm/configdata.pm @@ -154,7 +154,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -205,7 +205,7 @@ our %config = ( ], "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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -224,7 +224,7 @@ our %config = ( "AS" => undef, "ASFLAGS" => undef, "BUILDFILE" => undef, - "CC" => "gcc", + "CC" => undef, "CFLAGS" => undef, "CPP" => undef, "CPPDEFINES" => undef, @@ -258,11 +258,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "aix64-gcc-as", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar -X64", @@ -1325,6 +1325,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3912,6 +3915,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4020,6 +4026,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6285,6 +6294,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6393,6 +6405,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7742,6 +7757,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8406,7 +8425,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-bn_add.o", "crypto/bn/libfips-lib-bn_asm.o", "crypto/bn/libfips-lib-bn_blind.o", @@ -8434,8 +8452,7 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_shift.o", "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", - "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o" + "crypto/bn/libfips-lib-bn_word.o" ], "products" => { "lib" => [ @@ -12880,6 +12897,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -12988,6 +13008,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15253,6 +15276,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15361,6 +15387,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16873,6 +16902,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -16909,6 +16939,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18820,6 +18851,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19844,6 +19879,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19880,6 +19916,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20145,6 +20182,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -20982,9 +21020,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_x931p.o" => [ "crypto/bn/bn_x931p.c" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-bn_add.o" => [ "crypto/bn/bn_add.c" ], @@ -21069,9 +21104,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_word.o" => [ "crypto/bn/bn_word.c" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/buffer/libcrypto-lib-buf_err.o" => [ "crypto/buffer/buf_err.c" ], @@ -23568,7 +23600,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/buffer/libcrypto-lib-buf_err.o", "crypto/buffer/libcrypto-lib-buffer.o", "crypto/camellia/libcrypto-lib-camellia.o", @@ -25137,7 +25168,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/buffer/libfips-lib-buffer.o", "crypto/cmac/libfips-lib-cmac.o", "crypto/des/libfips-lib-des_enc.o", @@ -26647,6 +26677,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27348,8 +27384,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27376,7 +27412,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27393,8 +27429,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/aix64-gcc-as/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/aix64-gcc-as/no-asm/crypto/buildinf.h index 1744535e5d7bb3..087f6580773805 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/aix64-gcc-as/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: aix64-gcc-as" -#define DATE "built on: Mon Feb 13 14:03:58 2023 UTC" +#define DATE "built on: Fri Jun 9 11:58:27 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/cmp.h b/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/cmp.h +++ b/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/aix64-gcc-as/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/aix64-gcc-as/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/aix64-gcc-as/no-asm/openssl-fips.gypi index 3b9169ed54bc7f..b283040eeec87a 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/aix64-gcc-as/no-asm/openssl-fips.gypi @@ -33,7 +33,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/des_enc.c', diff --git a/deps/openssl/config/archs/aix64-gcc-as/no-asm/openssl.gypi b/deps/openssl/config/archs/aix64-gcc-as/no-asm/openssl.gypi index 82c5f7faa57562..150635d1cfc050 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/aix64-gcc-as/no-asm/openssl.gypi @@ -192,7 +192,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/camellia.c', diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/configdata.pm b/deps/openssl/config/archs/darwin-i386-cc/asm/configdata.pm index 106c0c93bfbba7..dd2e698e0ccc04 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/configdata.pm +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/configdata.pm @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,7 +206,7 @@ our %config = ( ], "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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -258,11 +258,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "darwin-i386-cc", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1322,6 +1322,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3966,6 +3969,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4074,6 +4080,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6339,6 +6348,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6447,6 +6459,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7788,6 +7803,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8455,7 +8474,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", "crypto/bn/libcrypto-lib-co-586.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-x86-gf2m.o", "crypto/bn/libcrypto-lib-x86-mont.o", "crypto/bn/libfips-lib-bn-586.o", @@ -8487,7 +8505,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", "crypto/bn/libfips-lib-co-586.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-x86-gf2m.o", "crypto/bn/libfips-lib-x86-mont.o" ], @@ -12947,6 +12964,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -13055,6 +13075,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15320,6 +15343,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15428,6 +15454,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16923,6 +16952,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -16959,6 +16989,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18862,6 +18893,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19886,6 +19921,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19922,6 +19958,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20187,6 +20224,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -21033,9 +21071,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-co-586.o" => [ "crypto/bn/co-586.S" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libcrypto-lib-x86-gf2m.o" => [ "crypto/bn/x86-gf2m.S" ], @@ -21129,9 +21164,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-co-586.o" => [ "crypto/bn/co-586.S" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-x86-gf2m.o" => [ "crypto/bn/x86-gf2m.S" ], @@ -23678,7 +23710,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", "crypto/bn/libcrypto-lib-co-586.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-x86-gf2m.o", "crypto/bn/libcrypto-lib-x86-mont.o", "crypto/buffer/libcrypto-lib-buf_err.o", @@ -25257,7 +25288,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", "crypto/bn/libfips-lib-co-586.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-x86-gf2m.o", "crypto/bn/libfips-lib-x86-mont.o", "crypto/buffer/libfips-lib-buffer.o", @@ -26775,6 +26805,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27472,8 +27508,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27500,7 +27536,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27517,8 +27553,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/buildinf.h b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/buildinf.h index d94e43882eaf0c..88afb06bbc114d 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin-i386-cc" -#define DATE "built on: Mon Feb 13 14:05:58 2023 UTC" +#define DATE "built on: Fri Jun 9 12:01:57 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/cmp.h b/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/cmp.h +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/darwin-i386-cc/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/openssl-fips.gypi b/deps/openssl/config/archs/darwin-i386-cc/asm/openssl-fips.gypi index d33e8682963849..808b7f9cbf4f61 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/openssl-fips.gypi @@ -30,7 +30,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/ecb3_enc.c', diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/openssl.gypi b/deps/openssl/config/archs/darwin-i386-cc/asm/openssl.gypi index c3b61ba96e764c..cf331ff9355043 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/openssl.gypi +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/openssl.gypi @@ -188,7 +188,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/cmll_cfb.c', diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/configdata.pm b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/configdata.pm index c6aa90f0ae7834..0236d99d33a9a7 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/configdata.pm @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,7 +206,7 @@ our %config = ( ], "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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -258,11 +258,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "darwin-i386-cc", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1322,6 +1322,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3966,6 +3969,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4074,6 +4080,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6339,6 +6348,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6447,6 +6459,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7788,6 +7803,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8455,7 +8474,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", "crypto/bn/libcrypto-lib-co-586.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-x86-gf2m.o", "crypto/bn/libcrypto-lib-x86-mont.o", "crypto/bn/libfips-lib-bn-586.o", @@ -8487,7 +8505,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", "crypto/bn/libfips-lib-co-586.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-x86-gf2m.o", "crypto/bn/libfips-lib-x86-mont.o" ], @@ -12947,6 +12964,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -13055,6 +13075,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15320,6 +15343,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15428,6 +15454,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16923,6 +16952,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -16959,6 +16989,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18862,6 +18893,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19886,6 +19921,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19922,6 +19958,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20187,6 +20224,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -21033,9 +21071,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-co-586.o" => [ "crypto/bn/co-586.S" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libcrypto-lib-x86-gf2m.o" => [ "crypto/bn/x86-gf2m.S" ], @@ -21129,9 +21164,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-co-586.o" => [ "crypto/bn/co-586.S" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-x86-gf2m.o" => [ "crypto/bn/x86-gf2m.S" ], @@ -23678,7 +23710,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", "crypto/bn/libcrypto-lib-co-586.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-x86-gf2m.o", "crypto/bn/libcrypto-lib-x86-mont.o", "crypto/buffer/libcrypto-lib-buf_err.o", @@ -25257,7 +25288,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", "crypto/bn/libfips-lib-co-586.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-x86-gf2m.o", "crypto/bn/libfips-lib-x86-mont.o", "crypto/buffer/libfips-lib-buffer.o", @@ -26775,6 +26805,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27472,8 +27508,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27500,7 +27536,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27517,8 +27553,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/buildinf.h index afb5ea6b729dec..db1463ebd9208a 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin-i386-cc" -#define DATE "built on: Mon Feb 13 14:06:10 2023 UTC" +#define DATE "built on: Fri Jun 9 12:02:18 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/cmp.h b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/cmp.h +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/darwin-i386-cc/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl-fips.gypi index 6a01d68163405c..d7a8a61595a09a 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl-fips.gypi @@ -30,7 +30,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/ecb3_enc.c', diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl.gypi b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl.gypi index aba37551eb6868..09d5fd91d86031 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl.gypi @@ -188,7 +188,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/cmll_cfb.c', diff --git a/deps/openssl/config/archs/darwin-i386-cc/no-asm/configdata.pm b/deps/openssl/config/archs/darwin-i386-cc/no-asm/configdata.pm index aeb9182052d18b..face9f022762e9 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/no-asm/configdata.pm +++ b/deps/openssl/config/archs/darwin-i386-cc/no-asm/configdata.pm @@ -18,7 +18,7 @@ our %config = ( "ARFLAGS" => [ "qc" ], - "CC" => "gcc", + "CC" => "cc", "CFLAGS" => [ "-O3 -fomit-frame-pointer" ], @@ -154,7 +154,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -205,7 +205,7 @@ our %config = ( ], "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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -224,7 +224,7 @@ our %config = ( "AS" => undef, "ASFLAGS" => undef, "BUILDFILE" => undef, - "CC" => "gcc", + "CC" => undef, "CFLAGS" => undef, "CPP" => undef, "CPPDEFINES" => undef, @@ -258,11 +258,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "darwin-i386-cc", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1323,6 +1323,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3910,6 +3913,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4018,6 +4024,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6283,6 +6292,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6391,6 +6403,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7732,6 +7747,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8396,7 +8415,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-bn_add.o", "crypto/bn/libfips-lib-bn_asm.o", "crypto/bn/libfips-lib-bn_blind.o", @@ -8424,8 +8442,7 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_shift.o", "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", - "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o" + "crypto/bn/libfips-lib-bn_word.o" ], "products" => { "lib" => [ @@ -12869,6 +12886,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -12977,6 +12997,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15242,6 +15265,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15350,6 +15376,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16845,6 +16874,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -16881,6 +16911,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18784,6 +18815,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19808,6 +19843,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19844,6 +19880,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20109,6 +20146,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -20946,9 +20984,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_x931p.o" => [ "crypto/bn/bn_x931p.c" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-bn_add.o" => [ "crypto/bn/bn_add.c" ], @@ -21033,9 +21068,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_word.o" => [ "crypto/bn/bn_word.c" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/buffer/libcrypto-lib-buf_err.o" => [ "crypto/buffer/buf_err.c" ], @@ -23532,7 +23564,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/buffer/libcrypto-lib-buf_err.o", "crypto/buffer/libcrypto-lib-buffer.o", "crypto/camellia/libcrypto-lib-camellia.o", @@ -25099,7 +25130,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/buffer/libfips-lib-buffer.o", "crypto/cmac/libfips-lib-cmac.o", "crypto/des/libfips-lib-des_enc.o", @@ -26609,6 +26639,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27309,8 +27345,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27337,7 +27373,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27354,8 +27390,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/buildinf.h index 3a4c47322459b5..cd966a1098c64c 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin-i386-cc" -#define DATE "built on: Mon Feb 13 14:06:21 2023 UTC" +#define DATE "built on: Fri Jun 9 12:02:39 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -19,13 +19,12 @@ * literal */ static const char compiler_flags[] = { - 'c','o','m','p','i','l','e','r',':',' ','g','c','c',' ','-','f', - 'P','I','C',' ','-','a','r','c','h',' ','i','3','8','6',' ','-', - 'O','3',' ','-','f','o','m','i','t','-','f','r','a','m','e','-', - 'p','o','i','n','t','e','r',' ','-','D','L','_','E','N','D','I', - 'A','N',' ','-','D','O','P','E','N','S','S','L','_','P','I','C', - ' ','-','D','_','R','E','E','N','T','R','A','N','T',' ','-','D', - 'O','P','E','N','S','S','L','_','B','U','I','L','D','I','N','G', - '_','O','P','E','N','S','S','L',' ','-','D','N','D','E','B','U', - 'G','\0' + 'c','o','m','p','i','l','e','r',':',' ','c','c',' ','-','f','P', + 'I','C',' ','-','a','r','c','h',' ','i','3','8','6',' ','-','O', + '3',' ','-','f','o','m','i','t','-','f','r','a','m','e','-','p', + 'o','i','n','t','e','r',' ','-','D','L','_','E','N','D','I','A', + 'N',' ','-','D','O','P','E','N','S','S','L','_','P','I','C',' ', + '-','D','_','R','E','E','N','T','R','A','N','T',' ','-','D','O', + 'P','E','N','S','S','L','_','B','U','I','L','D','I','N','G','_', + 'O','P','E','N','S','S','L',' ','-','D','N','D','E','B','U','G','\0' }; diff --git a/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/cmp.h b/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/cmp.h +++ b/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/darwin-i386-cc/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/darwin-i386-cc/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/darwin-i386-cc/no-asm/openssl-fips.gypi index 27cb2092d4a2df..2a401f82311c62 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/darwin-i386-cc/no-asm/openssl-fips.gypi @@ -33,7 +33,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/des_enc.c', diff --git a/deps/openssl/config/archs/darwin-i386-cc/no-asm/openssl.gypi b/deps/openssl/config/archs/darwin-i386-cc/no-asm/openssl.gypi index 4ad4e8c3a0d7f6..7469c552c64729 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/darwin-i386-cc/no-asm/openssl.gypi @@ -192,7 +192,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/camellia.c', diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm/configdata.pm b/deps/openssl/config/archs/darwin64-arm64-cc/asm/configdata.pm index c032d5b7047da0..f857559a756c8c 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm/configdata.pm +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm/configdata.pm @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,7 +206,7 @@ our %config = ( ], "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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -258,11 +258,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "darwin64-arm64-cc", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1322,6 +1322,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3941,6 +3944,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4049,6 +4055,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6314,6 +6323,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6422,6 +6434,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7763,6 +7778,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8434,7 +8453,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-armv8-mont.o", "crypto/bn/libfips-lib-bn_add.o", "crypto/bn/libfips-lib-bn_asm.o", @@ -8463,8 +8481,7 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_shift.o", "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", - "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o" + "crypto/bn/libfips-lib-bn_word.o" ], "products" => { "lib" => [ @@ -12923,6 +12940,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -13031,6 +13051,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15296,6 +15319,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15404,6 +15430,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16899,6 +16928,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -16935,6 +16965,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18898,6 +18929,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19922,6 +19957,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19958,6 +19994,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20223,6 +20260,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -21075,9 +21113,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_x931p.o" => [ "crypto/bn/bn_x931p.c" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-armv8-mont.o" => [ "crypto/bn/armv8-mont.S" ], @@ -21165,9 +21200,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_word.o" => [ "crypto/bn/bn_word.c" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/buffer/libcrypto-lib-buf_err.o" => [ "crypto/buffer/buf_err.c" ], @@ -23718,7 +23750,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/buffer/libcrypto-lib-buf_err.o", "crypto/buffer/libcrypto-lib-buffer.o", "crypto/camellia/libcrypto-lib-camellia.o", @@ -25297,7 +25328,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/buffer/libfips-lib-buffer.o", "crypto/cmac/libfips-lib-cmac.o", "crypto/des/libfips-lib-des_enc.o", @@ -26815,6 +26845,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27512,8 +27548,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27540,7 +27576,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27557,8 +27593,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm/crypto/aes/aesv8-armx.S b/deps/openssl/config/archs/darwin64-arm64-cc/asm/crypto/aes/aesv8-armx.S index 62840b3d2bb605..5e3afc1ced813d 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm/crypto/aes/aesv8-armx.S +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm/crypto/aes/aesv8-armx.S @@ -1859,10 +1859,10 @@ _aes_v8_xts_encrypt: b.ne Lxts_enc_big_size // Encrypt the iv with key2, as the first XEX iv. ldr w6,[x4,#240] - ld1 {v0.16b},[x4],#16 + ld1 {v0.4s},[x4],#16 ld1 {v6.16b},[x5] sub w6,w6,#2 - ld1 {v1.16b},[x4],#16 + ld1 {v1.4s},[x4],#16 Loop_enc_iv_enc: aese v6.16b,v0.16b @@ -2462,9 +2462,9 @@ Lxts_enc_load_done: // Encrypt the composite block to get the last second encrypted text block ldr w6,[x3,#240] // load key schedule... - ld1 {v0.16b},[x3],#16 + ld1 {v0.4s},[x3],#16 sub w6,w6,#2 - ld1 {v1.16b},[x3],#16 // load key schedule... + ld1 {v1.4s},[x3],#16 // load key schedule... Loop_final_enc: aese v26.16b,v0.16b aesmc v26.16b,v26.16b @@ -2500,10 +2500,10 @@ _aes_v8_xts_decrypt: b.ne Lxts_dec_big_size // Encrypt the iv with key2, as the first XEX iv. ldr w6,[x4,#240] - ld1 {v0.16b},[x4],#16 + ld1 {v0.4s},[x4],#16 ld1 {v6.16b},[x5] sub w6,w6,#2 - ld1 {v1.16b},[x4],#16 + ld1 {v1.4s},[x4],#16 Loop_dec_small_iv_enc: aese v6.16b,v0.16b @@ -2581,10 +2581,10 @@ Lxts_dec_big_size: // Encrypt the iv with key2, as the first XEX iv ldr w6,[x4,#240] - ld1 {v0.16b},[x4],#16 + ld1 {v0.4s},[x4],#16 ld1 {v6.16b},[x5] sub w6,w6,#2 - ld1 {v1.16b},[x4],#16 + ld1 {v1.4s},[x4],#16 Loop_dec_iv_enc: aese v6.16b,v0.16b @@ -2914,7 +2914,7 @@ Loop5x_dec_after: .align 4 Lxts_dec_tail4x: add x0,x0,#16 - ld1 {v0.4s},[x0],#16 + tst x21,#0xf eor v5.16b,v1.16b,v4.16b st1 {v5.16b},[x1],#16 eor v17.16b,v24.16b,v17.16b @@ -2923,6 +2923,8 @@ Lxts_dec_tail4x: eor v31.16b,v26.16b,v31.16b st1 {v30.16b,v31.16b},[x1],#32 + b.eq Lxts_dec_abort + ld1 {v0.16b},[x0],#16 b Lxts_done .align 4 Lxts_outer_dec_tail: @@ -3100,7 +3102,7 @@ Lxts_done: // Processing the last two blocks with cipher stealing. mov x7,x3 cbnz x2,Lxts_dec_1st_done - ld1 {v0.4s},[x0],#16 + ld1 {v0.16b},[x0],#16 // Decrypt the last secod block to get the last plain text block Lxts_dec_1st_done: @@ -3145,9 +3147,9 @@ Lxts_dec_load_done: // Decrypt the composite block to get the last second plain text block ldr w6,[x7,#240] - ld1 {v0.16b},[x7],#16 + ld1 {v0.4s},[x7],#16 sub w6,w6,#2 - ld1 {v1.16b},[x7],#16 + ld1 {v1.4s},[x7],#16 Loop_final_dec: aesd v26.16b,v0.16b aesimc v26.16b,v26.16b diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm/crypto/buildinf.h b/deps/openssl/config/archs/darwin64-arm64-cc/asm/crypto/buildinf.h index edf50885690f96..c8ae0aa7190e5b 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin64-arm64-cc" -#define DATE "built on: Mon Feb 13 14:06:31 2023 UTC" +#define DATE "built on: Fri Jun 9 12:02:57 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm/crypto/modes/aes-gcm-armv8_64.S b/deps/openssl/config/archs/darwin64-arm64-cc/asm/crypto/modes/aes-gcm-armv8_64.S index 777c55f9fb3dfb..6fcafd5805448e 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm/crypto/modes/aes-gcm-armv8_64.S +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm/crypto/modes/aes-gcm-armv8_64.S @@ -19,28 +19,36 @@ _aes_gcm_enc_128_kernel: stp d14, d15, [sp, #96] ldp x10, x11, [x16] //ctr96_b64, ctr96_t32 +#ifdef __AARCH64EB__ + rev x10, x10 + rev x11, x11 +#endif ldp x13, x14, [x8, #160] //load rk10 - +#ifdef __AARCH64EB__ + ror x13, x13, #32 + ror x14, x14, #32 +#endif ld1 {v11.16b}, [x3] ext v11.16b, v11.16b, v11.16b, #8 rev64 v11.16b, v11.16b lsr x5, x1, #3 //byte_len mov x15, x5 - ldr q27, [x8, #144] //load rk9 + ld1 {v18.4s}, [x8], #16 //load rk0 add x4, x0, x1, lsr #3 //end_input_ptr sub x5, x5, #1 //byte_len - 1 lsr x12, x11, #32 ldr q15, [x3, #112] //load h4l | h4h +#ifndef __AARCH64EB__ ext v15.16b, v15.16b, v15.16b, #8 - +#endif fmov d1, x10 //CTR block 1 rev w12, w12 //rev_ctr32 add w12, w12, #1 //increment rev_ctr32 orr w11, w11, w11 - ldr q18, [x8, #0] //load rk0 + ld1 {v19.4s}, [x8], #16 //load rk1 rev w9, w12 //CTR block 1 add w12, w12, #1 //CTR block 1 @@ -60,30 +68,33 @@ _aes_gcm_enc_128_kernel: rev w9, w12 //CTR block 3 orr x9, x11, x9, lsl #32 //CTR block 3 - ldr q19, [x8, #16] //load rk1 + ld1 {v20.4s}, [x8], #16 //load rk2 add w12, w12, #1 //CTR block 3 fmov v3.d[1], x9 //CTR block 3 ldr q14, [x3, #80] //load h3l | h3h +#ifndef __AARCH64EB__ ext v14.16b, v14.16b, v14.16b, #8 - +#endif aese v1.16b, v18.16b aesmc v1.16b, v1.16b //AES block 1 - round 0 - ldr q20, [x8, #32] //load rk2 + ld1 {v21.4s}, [x8], #16 //load rk3 aese v2.16b, v18.16b aesmc v2.16b, v2.16b //AES block 2 - round 0 ldr q12, [x3, #32] //load h1l | h1h +#ifndef __AARCH64EB__ ext v12.16b, v12.16b, v12.16b, #8 +#endif aese v0.16b, v18.16b aesmc v0.16b, v0.16b //AES block 0 - round 0 - ldr q26, [x8, #128] //load rk8 + ld1 {v22.4s}, [x8], #16 //load rk4 aese v3.16b, v18.16b aesmc v3.16b, v3.16b //AES block 3 - round 0 - ldr q21, [x8, #48] //load rk3 + ld1 {v23.4s}, [x8], #16 //load rk5 aese v2.16b, v19.16b aesmc v2.16b, v2.16b //AES block 2 - round 1 @@ -91,11 +102,11 @@ _aes_gcm_enc_128_kernel: aese v0.16b, v19.16b aesmc v0.16b, v0.16b //AES block 0 - round 1 - ldr q24, [x8, #96] //load rk6 + ld1 {v24.4s}, [x8], #16 //load rk6 aese v1.16b, v19.16b aesmc v1.16b, v1.16b //AES block 1 - round 1 - ldr q25, [x8, #112] //load rk7 + ld1 {v25.4s}, [x8], #16 //load rk7 aese v3.16b, v19.16b aesmc v3.16b, v3.16b //AES block 3 - round 1 @@ -103,12 +114,14 @@ _aes_gcm_enc_128_kernel: aese v0.16b, v20.16b aesmc v0.16b, v0.16b //AES block 0 - round 2 - ldr q23, [x8, #80] //load rk5 + ld1 {v26.4s}, [x8], #16 //load rk8 aese v1.16b, v20.16b aesmc v1.16b, v1.16b //AES block 1 - round 2 ldr q13, [x3, #64] //load h2l | h2h +#ifndef __AARCH64EB__ ext v13.16b, v13.16b, v13.16b, #8 +#endif aese v3.16b, v20.16b aesmc v3.16b, v3.16b //AES block 3 - round 2 @@ -125,7 +138,7 @@ _aes_gcm_enc_128_kernel: aese v2.16b, v21.16b aesmc v2.16b, v2.16b //AES block 2 - round 3 - ldr q22, [x8, #64] //load rk4 + ld1 {v27.4s}, [x8], #16 //load rk9 aese v3.16b, v21.16b aesmc v3.16b, v3.16b //AES block 3 - round 3 @@ -208,13 +221,25 @@ _aes_gcm_enc_128_kernel: b.ge L128_enc_tail //handle tail ldp x6, x7, [x0, #0] //AES block 0 - load plaintext - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif ldp x21, x22, [x0, #32] //AES block 2 - load plaintext - +#ifdef __AARCH64EB__ + rev x21, x21 + rev x22, x22 +#endif ldp x19, x20, [x0, #16] //AES block 1 - load plaintext - +#ifdef __AARCH64EB__ + rev x19, x19 + rev x20, x20 +#endif ldp x23, x24, [x0, #48] //AES block 3 - load plaintext - +#ifdef __AARCH64EB__ + rev x23, x23 + rev x24, x24 +#endif eor x6, x6, x13 //AES block 0 - round 10 low eor x7, x7, x14 //AES block 0 - round 10 high @@ -279,6 +304,10 @@ _aes_gcm_enc_128_kernel: L128_enc_main_loop: //main loop start ldp x23, x24, [x0, #48] //AES block 4k+3 - load plaintext +#ifdef __AARCH64EB__ + rev x23, x23 + rev x24, x24 +#endif rev64 v4.16b, v4.16b //GHASH block 4k (only t0 is free) rev64 v6.16b, v6.16b //GHASH block 4k+2 (t0, t1, and t2 free) @@ -313,7 +342,10 @@ L128_enc_main_loop: //main loop start pmull2 v28.1q, v5.2d, v14.2d //GHASH block 4k+1 - high eor v31.8b, v31.8b, v6.8b //GHASH block 4k+2 - mid ldp x6, x7, [x0, #0] //AES block 4k+4 - load plaintext - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif aese v0.16b, v19.16b aesmc v0.16b, v0.16b //AES block 4k+4 - round 1 rev w9, w12 //CTR block 4k+8 @@ -395,7 +427,10 @@ L128_enc_main_loop: //main loop start aese v1.16b, v23.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 5 ldp x19, x20, [x0, #16] //AES block 4k+5 - load plaintext - +#ifdef __AARCH64EB__ + rev x19, x19 + rev x20, x20 +#endif aese v3.16b, v21.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 3 eor v10.16b, v10.16b, v31.16b //GHASH block 4k+2 - mid @@ -403,7 +438,10 @@ L128_enc_main_loop: //main loop start aese v0.16b, v23.16b aesmc v0.16b, v0.16b //AES block 4k+4 - round 5 ldp x21, x22, [x0, #32] //AES block 4k+6 - load plaintext - +#ifdef __AARCH64EB__ + rev x21, x21 + rev x22, x22 +#endif pmull v31.1q, v9.1d, v8.1d //MODULO - top 64b align with mid eor v11.16b, v11.16b, v29.16b //GHASH block 4k+3 - low @@ -712,7 +750,10 @@ L128_enc_tail: //TAIL sub x5, x4, x0 //main_end_input_ptr is number of bytes left to process ldp x6, x7, [x0], #16 //AES block 4k+4 - load plaintext - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif cmp x5, #48 ext v8.16b, v11.16b, v11.16b, #8 //prepare final partial tag @@ -750,7 +791,10 @@ L128_enc_blocks_more_than_3: //blocks left > 3 st1 { v5.16b}, [x2], #16 //AES final-3 block - store result ldp x6, x7, [x0], #16 //AES final-2 block - load input low & high - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif rev64 v4.16b, v5.16b //GHASH final-3 block eor v4.16b, v4.16b, v8.16b //feed in partial tag @@ -779,7 +823,10 @@ L128_enc_blocks_more_than_2: //blocks left > 2 rev64 v4.16b, v5.16b //GHASH final-2 block ldp x6, x7, [x0], #16 //AES final-1 block - load input low & high - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif eor v4.16b, v4.16b, v8.16b //feed in partial tag eor x6, x6, x13 //AES final-1 block - round 10 low @@ -813,7 +860,10 @@ L128_enc_blocks_more_than_1: //blocks left > 1 rev64 v4.16b, v5.16b //GHASH final-1 block ldp x6, x7, [x0], #16 //AES final block - load input low & high - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif eor v4.16b, v4.16b, v8.16b //feed in partial tag eor x7, x7, x14 //AES final block - round 10 high @@ -876,9 +926,11 @@ L128_enc_blocks_less_than_1: //blocks left <= 1 ld1 { v18.16b}, [x2] //load existing bytes where the possibly partial last block is to be stored eor v8.8b, v8.8b, v4.8b //GHASH final block - mid - +#ifndef __AARCH64EB__ rev w9, w12 - +#else + mov w9, w12 +#endif pmull2 v20.1q, v4.2d, v12.2d //GHASH final block - high pmull v8.1q, v8.1d, v16.1d //GHASH final block - mid @@ -951,20 +1003,29 @@ _aes_gcm_dec_128_kernel: lsr x5, x1, #3 //byte_len mov x15, x5 ldp x10, x11, [x16] //ctr96_b64, ctr96_t32 - +#ifdef __AARCH64EB__ + rev x10, x10 + rev x11, x11 +#endif + ldp x13, x14, [x8, #160] //load rk10 +#ifdef __AARCH64EB__ + ror x14, x14, 32 + ror x13, x13, 32 +#endif sub x5, x5, #1 //byte_len - 1 - ldr q18, [x8, #0] //load rk0 + ld1 {v18.4s}, [x8], #16 //load rk0 and x5, x5, #0xffffffffffffffc0 //number of bytes to be processed in main loop (at least 1 byte must be handled by tail) ld1 { v0.16b}, [x16] //special case vector load initial counter so we can start first AES block as quickly as possible ldr q13, [x3, #64] //load h2l | h2h +#ifndef __AARCH64EB__ ext v13.16b, v13.16b, v13.16b, #8 - +#endif lsr x12, x11, #32 fmov d2, x10 //CTR block 2 - ldr q19, [x8, #16] //load rk1 + ld1 {v19.4s}, [x8], #16 //load rk1 orr w11, w11, w11 rev w12, w12 //rev_ctr32 @@ -976,7 +1037,7 @@ _aes_gcm_dec_128_kernel: rev w9, w12 //CTR block 1 orr x9, x11, x9, lsl #32 //CTR block 1 - ldr q20, [x8, #32] //load rk2 + ld1 {v20.4s}, [x8], #16 //load rk2 add w12, w12, #1 //CTR block 1 fmov v1.d[1], x9 //CTR block 1 @@ -999,19 +1060,19 @@ _aes_gcm_dec_128_kernel: aese v1.16b, v18.16b aesmc v1.16b, v1.16b //AES block 1 - round 0 - ldr q21, [x8, #48] //load rk3 + ld1 {v21.4s}, [x8], #16 //load rk3 aese v0.16b, v20.16b aesmc v0.16b, v0.16b //AES block 0 - round 2 - ldr q24, [x8, #96] //load rk6 + ld1 {v22.4s}, [x8], #16 //load rk4 aese v2.16b, v18.16b aesmc v2.16b, v2.16b //AES block 2 - round 0 - ldr q25, [x8, #112] //load rk7 + ld1 {v23.4s}, [x8], #16 //load rk5 aese v1.16b, v19.16b aesmc v1.16b, v1.16b //AES block 1 - round 1 - ldr q22, [x8, #64] //load rk4 + ld1 {v24.4s}, [x8], #16 //load rk6 aese v3.16b, v18.16b aesmc v3.16b, v3.16b //AES block 3 - round 0 @@ -1021,7 +1082,6 @@ _aes_gcm_dec_128_kernel: aese v1.16b, v20.16b aesmc v1.16b, v1.16b //AES block 1 - round 2 - ldp x13, x14, [x8, #160] //load rk10 aese v3.16b, v19.16b aesmc v3.16b, v3.16b //AES block 3 - round 1 @@ -1031,7 +1091,7 @@ _aes_gcm_dec_128_kernel: aese v0.16b, v21.16b aesmc v0.16b, v0.16b //AES block 0 - round 3 - ldr q23, [x8, #80] //load rk5 + ld1 {v25.4s}, [x8], #16 //load rk7 aese v1.16b, v21.16b aesmc v1.16b, v1.16b //AES block 1 - round 3 @@ -1041,7 +1101,7 @@ _aes_gcm_dec_128_kernel: aese v2.16b, v20.16b aesmc v2.16b, v2.16b //AES block 2 - round 2 - ldr q27, [x8, #144] //load rk9 + ld1 {v26.4s}, [x8], #16 //load rk8 aese v1.16b, v22.16b aesmc v1.16b, v1.16b //AES block 1 - round 4 @@ -1052,11 +1112,12 @@ _aes_gcm_dec_128_kernel: aese v2.16b, v21.16b aesmc v2.16b, v2.16b //AES block 2 - round 3 ldr q14, [x3, #80] //load h3l | h3h +#ifndef __AARCH64EB__ ext v14.16b, v14.16b, v14.16b, #8 - +#endif aese v0.16b, v22.16b aesmc v0.16b, v0.16b //AES block 0 - round 4 - ldr q26, [x8, #128] //load rk8 + ld1 {v27.4s}, [x8], #16 //load rk9 aese v1.16b, v23.16b aesmc v1.16b, v1.16b //AES block 1 - round 5 @@ -1073,8 +1134,9 @@ _aes_gcm_dec_128_kernel: aese v2.16b, v23.16b aesmc v2.16b, v2.16b //AES block 2 - round 5 ldr q12, [x3, #32] //load h1l | h1h +#ifndef __AARCH64EB__ ext v12.16b, v12.16b, v12.16b, #8 - +#endif aese v3.16b, v23.16b aesmc v3.16b, v3.16b //AES block 3 - round 5 @@ -1092,7 +1154,9 @@ _aes_gcm_dec_128_kernel: trn1 v8.2d, v12.2d, v13.2d //h2h | h1h ldr q15, [x3, #112] //load h4l | h4h +#ifndef __AARCH64EB__ ext v15.16b, v15.16b, v15.16b, #8 +#endif trn2 v16.2d, v12.2d, v13.2d //h2l | h1l add x5, x5, x0 @@ -1134,12 +1198,10 @@ _aes_gcm_dec_128_kernel: eor v17.16b, v17.16b, v9.16b //h4k | h3k b.ge L128_dec_tail //handle tail - ldr q5, [x0, #16] //AES block 1 - load ciphertext - - ldr q4, [x0, #0] //AES block 0 - load ciphertext + ld1 {v4.16b, v5.16b}, [x0], #32 //AES block 0 - load ciphertext; AES block 1 - load ciphertext eor v1.16b, v5.16b, v1.16b //AES block 1 - result - ldr q6, [x0, #32] //AES block 2 - load ciphertext + ld1 {v6.16b}, [x0], #16 //AES block 2 - load ciphertext eor v0.16b, v4.16b, v0.16b //AES block 0 - result rev64 v4.16b, v4.16b //GHASH block 0 @@ -1147,10 +1209,9 @@ _aes_gcm_dec_128_kernel: orr x9, x11, x9, lsl #32 //CTR block 4 add w12, w12, #1 //CTR block 4 - ldr q7, [x0, #48] //AES block 3 - load ciphertext + ld1 {v7.16b}, [x0], #16 //AES block 3 - load ciphertext rev64 v5.16b, v5.16b //GHASH block 1 - add x0, x0, #64 //AES input_ptr update mov x19, v1.d[0] //AES block 1 - mov low mov x20, v1.d[1] //AES block 1 - mov high @@ -1165,7 +1226,9 @@ _aes_gcm_dec_128_kernel: fmov v0.d[1], x9 //CTR block 4 rev w9, w12 //CTR block 5 eor x19, x19, x13 //AES block 1 - round 10 low - +#ifdef __AARCH64EB__ + rev x19, x19 +#endif fmov d1, x10 //CTR block 5 add w12, w12, #1 //CTR block 5 orr x9, x11, x9, lsl #32 //CTR block 5 @@ -1177,10 +1240,19 @@ _aes_gcm_dec_128_kernel: orr x9, x11, x9, lsl #32 //CTR block 6 eor x20, x20, x14 //AES block 1 - round 10 high +#ifdef __AARCH64EB__ + rev x20, x20 +#endif eor x6, x6, x13 //AES block 0 - round 10 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif eor v2.16b, v6.16b, v2.16b //AES block 2 - result eor x7, x7, x14 //AES block 0 - round 10 high +#ifdef __AARCH64EB__ + rev x7, x7 +#endif stp x6, x7, [x2], #16 //AES block 0 - store result stp x19, x20, [x2], #16 //AES block 1 - store result @@ -1248,9 +1320,14 @@ L128_dec_main_loop: //main loop start aese v3.16b, v19.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 1 eor x23, x23, x13 //AES block 4k+3 - round 10 low - +#ifdef __AARCH64EB__ + rev x23, x23 +#endif pmull v30.1q, v30.1d, v17.1d //GHASH block 4k+1 - mid eor x22, x22, x14 //AES block 4k+2 - round 10 high +#ifdef __AARCH64EB__ + rev x22, x22 +#endif mov d31, v6.d[1] //GHASH block 4k+2 - mid aese v0.16b, v19.16b @@ -1288,7 +1365,9 @@ L128_dec_main_loop: //main loop start pmull2 v31.1q, v31.2d, v16.2d //GHASH block 4k+2 - mid eor x24, x24, x14 //AES block 4k+3 - round 10 high - +#ifdef __AARCH64EB__ + rev x24, x24 +#endif aese v2.16b, v20.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 2 eor v30.8b, v30.8b, v7.8b //GHASH block 4k+3 - mid @@ -1296,7 +1375,9 @@ L128_dec_main_loop: //main loop start aese v1.16b, v23.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 5 eor x21, x21, x13 //AES block 4k+2 - round 10 low - +#ifdef __AARCH64EB__ + rev x21, x21 +#endif aese v0.16b, v23.16b aesmc v0.16b, v0.16b //AES block 4k+4 - round 5 movi v8.8b, #0xc2 @@ -1318,7 +1399,7 @@ L128_dec_main_loop: //main loop start pmull v30.1q, v30.1d, v16.1d //GHASH block 4k+3 - mid eor v9.16b, v9.16b, v4.16b //GHASH block 4k+3 - high - ldr q4, [x0, #0] //AES block 4k+4 - load ciphertext + ld1 {v4.16b}, [x0], #16 //AES block 4k+3 - load ciphertext aese v1.16b, v25.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 7 @@ -1345,7 +1426,7 @@ L128_dec_main_loop: //main loop start rev w9, w12 //CTR block 4k+8 pmull v31.1q, v9.1d, v8.1d //MODULO - top 64b align with mid - ldr q5, [x0, #16] //AES block 4k+5 - load ciphertext + ld1 {v5.16b}, [x0], #16 //AES block 4k+4 - load ciphertext ext v9.16b, v9.16b, v9.16b, #8 //MODULO - other top alignment aese v0.16b, v27.16b //AES block 4k+4 - round 9 @@ -1363,7 +1444,7 @@ L128_dec_main_loop: //main loop start aese v3.16b, v23.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 5 - ldr q6, [x0, #32] //AES block 4k+6 - load ciphertext + ld1 {v6.16b}, [x0], #16 //AES block 4k+5 - load ciphertext add w12, w12, #1 //CTR block 4k+8 eor v10.16b, v10.16b, v31.16b //MODULO - fold into mid @@ -1371,11 +1452,10 @@ L128_dec_main_loop: //main loop start aese v2.16b, v25.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 7 - ldr q7, [x0, #48] //AES block 4k+3 - load ciphertext + ld1 {v7.16b}, [x0], #16 //AES block 4k+6 - load ciphertext aese v3.16b, v24.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 6 - add x0, x0, #64 //AES input_ptr update rev64 v5.16b, v5.16b //GHASH block 4k+5 eor v10.16b, v10.16b, v9.16b //MODULO - fold into mid @@ -1400,11 +1480,15 @@ L128_dec_main_loop: //main loop start aese v3.16b, v26.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 8 eor x7, x7, x14 //AES block 4k+4 - round 10 high - +#ifdef __AARCH64EB__ + rev x7, x7 +#endif eor v11.16b, v11.16b, v8.16b //MODULO - fold into low mov x20, v1.d[1] //AES block 4k+5 - mov high eor x6, x6, x13 //AES block 4k+4 - round 10 low - +#ifdef __AARCH64EB__ + rev x6, x6 +#endif eor v2.16b, v6.16b, v2.16b //AES block 4k+6 - result mov x19, v1.d[0] //AES block 4k+5 - mov low add w12, w12, #1 //CTR block 4k+9 @@ -1421,9 +1505,15 @@ L128_dec_main_loop: //main loop start add w12, w12, #1 //CTR block 4k+10 eor x20, x20, x14 //AES block 4k+5 - round 10 high +#ifdef __AARCH64EB__ + rev x20, x20 +#endif stp x6, x7, [x2], #16 //AES block 4k+4 - store result eor x19, x19, x13 //AES block 4k+5 - round 10 low +#ifdef __AARCH64EB__ + rev x19, x19 +#endif stp x19, x20, [x2], #16 //AES block 4k+5 - store result orr x9, x11, x9, lsl #32 //CTR block 4k+10 @@ -1528,9 +1618,14 @@ L128_dec_prepretail: //PREPRETAIL aese v3.16b, v20.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 2 eor x23, x23, x13 //AES block 4k+3 - round 10 low - +#ifdef __AARCH64EB__ + rev x23, x23 +#endif pmull v30.1q, v30.1d, v16.1d //GHASH block 4k+3 - mid eor x21, x21, x13 //AES block 4k+2 - round 10 low +#ifdef __AARCH64EB__ + rev x21, x21 +#endif eor v11.16b, v11.16b, v29.16b //GHASH block 4k+3 - low aese v2.16b, v21.16b @@ -1603,7 +1698,9 @@ L128_dec_prepretail: //PREPRETAIL pmull v8.1q, v10.1d, v8.1d //MODULO - mid 64b align with low eor x24, x24, x14 //AES block 4k+3 - round 10 high - +#ifdef __AARCH64EB__ + rev x24, x24 +#endif aese v2.16b, v25.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 7 ext v10.16b, v10.16b, v10.16b, #8 //MODULO - other mid alignment @@ -1621,7 +1718,9 @@ L128_dec_prepretail: //PREPRETAIL aese v3.16b, v26.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 8 eor x22, x22, x14 //AES block 4k+2 - round 10 high - +#ifdef __AARCH64EB__ + rev x22, x22 +#endif aese v0.16b, v27.16b //AES block 4k+4 - round 9 stp x21, x22, [x2], #16 //AES block 4k+2 - store result @@ -1645,9 +1744,14 @@ L128_dec_tail: //TAIL cmp x5, #48 eor x7, x7, x14 //AES block 4k+4 - round 10 high - +#ifdef __AARCH64EB__ + rev x7, x7 +#endif ext v8.16b, v11.16b, v11.16b, #8 //prepare final partial tag eor x6, x6, x13 //AES block 4k+4 - round 10 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif b.gt L128_dec_blocks_more_than_3 mov v3.16b, v2.16b @@ -1691,9 +1795,14 @@ L128_dec_blocks_more_than_3: //blocks left > 3 movi v8.8b, #0 //suppress further partial tag feed in eor x7, x7, x14 //AES final-2 block - round 10 high - +#ifdef __AARCH64EB__ + rev x7, x7 +#endif pmull v10.1q, v22.1d, v10.1d //GHASH final-3 block - mid eor x6, x6, x13 //AES final-2 block - round 10 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif L128_dec_blocks_more_than_2: //blocks left > 2 rev64 v4.16b, v5.16b //GHASH final-2 block @@ -1719,12 +1828,18 @@ L128_dec_blocks_more_than_2: //blocks left > 2 pmull v22.1q, v22.1d, v17.1d //GHASH final-2 block - mid eor x6, x6, x13 //AES final-1 block - round 10 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif eor v11.16b, v11.16b, v21.16b //GHASH final-2 block - low eor v9.16b, v9.16b, v20.16b //GHASH final-2 block - high eor v10.16b, v10.16b, v22.16b //GHASH final-2 block - mid eor x7, x7, x14 //AES final-1 block - round 10 high +#ifdef __AARCH64EB__ + rev x7, x7 +#endif L128_dec_blocks_more_than_1: //blocks left > 1 rev64 v4.16b, v5.16b //GHASH final-1 block @@ -1755,8 +1870,13 @@ L128_dec_blocks_more_than_1: //blocks left > 1 eor v9.16b, v9.16b, v20.16b //GHASH final-1 block - high eor x7, x7, x14 //AES final block - round 10 high - +#ifdef __AARCH64EB__ + rev x7, x7 +#endif eor x6, x6, x13 //AES final block - round 10 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif eor v10.16b, v10.16b, v22.16b //GHASH final-1 block - mid L128_dec_blocks_less_than_1: //blocks left <= 1 @@ -1802,7 +1922,11 @@ L128_dec_blocks_less_than_1: //blocks left <= 1 bic x4, x4, x9 //mask out low existing bytes and x6, x6, x9 +#ifndef __AARCH64EB__ rev w9, w12 +#else + mov w9, w12 +#endif eor v10.16b, v10.16b, v8.16b //GHASH final block - mid movi v8.8b, #0xc2 @@ -1869,18 +1993,26 @@ _aes_gcm_enc_192_kernel: stp d14, d15, [sp, #96] ldp x10, x11, [x16] //ctr96_b64, ctr96_t32 +#ifdef __AARCH64EB__ + rev x10, x10 + rev x11, x11 +#endif + ldp x13, x14, [x8, #192] //load rk12 +#ifdef __AARCH64EB__ + ror x13, x13, #32 + ror x14, x14, #32 +#endif + ld1 {v18.4s}, [x8], #16 //load rk0 - ldr q23, [x8, #80] //load rk5 - - ldr q22, [x8, #64] //load rk4 + ld1 {v19.4s}, [x8], #16 //load rk1 - ldr q26, [x8, #128] //load rk8 + ld1 {v20.4s}, [x8], #16 //load rk2 lsr x12, x11, #32 - ldr q24, [x8, #96] //load rk6 + ld1 {v21.4s}, [x8], #16 //load rk3 orr w11, w11, w11 - ldr q25, [x8, #112] //load rk7 + ld1 {v22.4s}, [x8], #16 //load rk4 rev w12, w12 //rev_ctr32 add w12, w12, #1 //increment rev_ctr32 @@ -1904,15 +2036,13 @@ _aes_gcm_enc_192_kernel: rev w9, w12 //CTR block 3 orr x9, x11, x9, lsl #32 //CTR block 3 - ldr q18, [x8, #0] //load rk0 + ld1 {v23.4s}, [x8], #16 //load rk5 fmov v3.d[1], x9 //CTR block 3 - ldr q21, [x8, #48] //load rk3 + ld1 {v24.4s}, [x8], #16 //load rk6 - ldp x13, x14, [x8, #192] //load rk12 - - ldr q19, [x8, #16] //load rk1 + ld1 {v25.4s}, [x8], #16 //load rk7 aese v0.16b, v18.16b aesmc v0.16b, v0.16b //AES block 0 - round 0 @@ -1922,35 +2052,38 @@ _aes_gcm_enc_192_kernel: aese v3.16b, v18.16b aesmc v3.16b, v3.16b //AES block 3 - round 0 - ldr q29, [x8, #176] //load rk11 + ld1 {v26.4s}, [x8], #16 //load rk8 aese v1.16b, v18.16b aesmc v1.16b, v1.16b //AES block 1 - round 0 ldr q15, [x3, #112] //load h4l | h4h +#ifndef __AARCH64EB__ ext v15.16b, v15.16b, v15.16b, #8 - +#endif aese v2.16b, v18.16b aesmc v2.16b, v2.16b //AES block 2 - round 0 - ldr q20, [x8, #32] //load rk2 + ld1 {v27.4s}, [x8], #16 //load rk9 aese v0.16b, v19.16b aesmc v0.16b, v0.16b //AES block 0 - round 1 - ldr q28, [x8, #160] //load rk10 + ld1 {v28.4s}, [x8], #16 //load rk10 aese v1.16b, v19.16b aesmc v1.16b, v1.16b //AES block 1 - round 1 ldr q12, [x3, #32] //load h1l | h1h +#ifndef __AARCH64EB__ ext v12.16b, v12.16b, v12.16b, #8 - +#endif aese v2.16b, v19.16b aesmc v2.16b, v2.16b //AES block 2 - round 1 - ldr q27, [x8, #144] //load rk9 + ld1 {v29.4s}, [x8], #16 //load rk11 aese v3.16b, v19.16b aesmc v3.16b, v3.16b //AES block 3 - round 1 ldr q14, [x3, #80] //load h3l | h3h +#ifndef __AARCH64EB__ ext v14.16b, v14.16b, v14.16b, #8 - +#endif aese v0.16b, v20.16b aesmc v0.16b, v0.16b //AES block 0 - round 2 @@ -2007,8 +2140,9 @@ _aes_gcm_enc_192_kernel: aese v2.16b, v24.16b aesmc v2.16b, v2.16b //AES block 2 - round 6 ldr q13, [x3, #64] //load h2l | h2h +#ifndef __AARCH64EB__ ext v13.16b, v13.16b, v13.16b, #8 - +#endif aese v1.16b, v24.16b aesmc v1.16b, v1.16b //AES block 1 - round 6 @@ -2088,13 +2222,26 @@ _aes_gcm_enc_192_kernel: rev w9, w12 //CTR block 4 ldp x6, x7, [x0, #0] //AES block 0 - load plaintext - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif orr x9, x11, x9, lsl #32 //CTR block 4 ldp x21, x22, [x0, #32] //AES block 2 - load plaintext - +#ifdef __AARCH64EB__ + rev x21, x21 + rev x22, x22 +#endif ldp x23, x24, [x0, #48] //AES block 3 - load plaintext - +#ifdef __AARCH64EB__ + rev x23, x23 + rev x24, x24 +#endif ldp x19, x20, [x0, #16] //AES block 1 - load plaintext +#ifdef __AARCH64EB__ + rev x19, x19 + rev x20, x20 +#endif add x0, x0, #64 //AES input_ptr update cmp x0, x5 //check if we have <= 8 blocks @@ -2166,7 +2313,10 @@ L192_enc_main_loop: //main loop start aese v1.16b, v18.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 0 ldp x19, x20, [x0, #16] //AES block 4k+5 - load plaintext - +#ifdef __AARCH64EB__ + rev x19, x19 + rev x20, x20 +#endif ext v11.16b, v11.16b, v11.16b, #8 //PRE 0 fmov d3, x10 //CTR block 4k+3 rev64 v4.16b, v4.16b //GHASH block 4k (only t0 is free) @@ -2178,11 +2328,17 @@ L192_enc_main_loop: //main loop start pmull2 v30.1q, v5.2d, v14.2d //GHASH block 4k+1 - high rev64 v7.16b, v7.16b //GHASH block 4k+3 (t0, t1, t2 and t3 free) ldp x21, x22, [x0, #32] //AES block 4k+6 - load plaintext - +#ifdef __AARCH64EB__ + rev x21, x21 + rev x22, x22 +#endif aese v0.16b, v18.16b aesmc v0.16b, v0.16b //AES block 4k+4 - round 0 ldp x23, x24, [x0, #48] //AES block 4k+3 - load plaintext - +#ifdef __AARCH64EB__ + rev x23, x23 + rev x24, x24 +#endif pmull v31.1q, v5.1d, v14.1d //GHASH block 4k+1 - low eor v4.16b, v4.16b, v11.16b //PRE 1 @@ -2275,7 +2431,10 @@ L192_enc_main_loop: //main loop start aese v1.16b, v22.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 4 ldp x6, x7, [x0, #0] //AES block 4k+4 - load plaintext - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif aese v0.16b, v24.16b aesmc v0.16b, v0.16b //AES block 4k+4 - round 6 eor v11.16b, v11.16b, v8.16b //GHASH block 4k+2 - low @@ -2640,7 +2799,10 @@ L192_enc_tail: //TAIL sub x5, x4, x0 //main_end_input_ptr is number of bytes left to process ldp x6, x7, [x0], #16 //AES block 4k+4 - load plaintext - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif eor x6, x6, x13 //AES block 4k+4 - round 12 low eor x7, x7, x14 //AES block 4k+4 - round 12 high @@ -2677,7 +2839,10 @@ L192_enc_blocks_more_than_3: //blocks left > 3 st1 { v5.16b}, [x2], #16 //AES final-3 block - store result ldp x6, x7, [x0], #16 //AES final-2 block - load input low & high - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif rev64 v4.16b, v5.16b //GHASH final-3 block eor x6, x6, x13 //AES final-2 block - round 12 low @@ -2708,7 +2873,10 @@ L192_enc_blocks_more_than_2: //blocks left > 2 rev64 v4.16b, v5.16b //GHASH final-2 block ldp x6, x7, [x0], #16 //AES final-1 block - load input low & high - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif eor v4.16b, v4.16b, v8.16b //feed in partial tag eor x7, x7, x14 //AES final-1 block - round 12 high @@ -2739,7 +2907,10 @@ L192_enc_blocks_more_than_1: //blocks left > 1 st1 { v5.16b}, [x2], #16 //AES final-1 block - store result ldp x6, x7, [x0], #16 //AES final block - load input low & high - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif rev64 v4.16b, v5.16b //GHASH final-1 block eor x6, x6, x13 //AES final block - round 12 low @@ -2771,7 +2942,11 @@ L192_enc_blocks_more_than_1: //blocks left > 1 L192_enc_blocks_less_than_1: //blocks left <= 1 ld1 { v18.16b}, [x2] //load existing bytes where the possibly partial last block is to be stored +#ifndef __AARCH64EB__ rev w9, w12 +#else + mov w9, w12 +#endif and x1, x1, #127 //bit_length %= 128 sub x1, x1, #128 //bit_length -= 128 @@ -2876,14 +3051,22 @@ _aes_gcm_dec_192_kernel: add x4, x0, x1, lsr #3 //end_input_ptr ldp x10, x11, [x16] //ctr96_b64, ctr96_t32 - +#ifdef __AARCH64EB__ + rev x10, x10 + rev x11, x11 +#endif + ldp x13, x14, [x8, #192] //load rk12 +#ifdef __AARCH64EB__ + ror x13, x13, #32 + ror x14, x14, #32 +#endif ld1 { v0.16b}, [x16] //special case vector load initial counter so we can start first AES block as quickly as possible - ldr q18, [x8, #0] //load rk0 + ld1 {v18.4s}, [x8], #16 //load rk0 lsr x5, x1, #3 //byte_len mov x15, x5 - ldr q20, [x8, #32] //load rk2 + ld1 {v19.4s}, [x8], #16 //load rk1 lsr x12, x11, #32 orr w11, w11, w11 @@ -2893,7 +3076,7 @@ _aes_gcm_dec_192_kernel: fmov d1, x10 //CTR block 1 add w12, w12, #1 //increment rev_ctr32 - ldr q19, [x8, #16] //load rk1 + ld1 {v20.4s}, [x8], #16 //load rk2 aese v0.16b, v18.16b aesmc v0.16b, v0.16b //AES block 0 - round 0 @@ -2901,7 +3084,7 @@ _aes_gcm_dec_192_kernel: add w12, w12, #1 //CTR block 1 orr x9, x11, x9, lsl #32 //CTR block 1 - ldr q21, [x8, #48] //load rk3 + ld1 {v21.4s}, [x8], #16 //load rk3 fmov v1.d[1], x9 //CTR block 1 rev w9, w12 //CTR block 2 @@ -2919,54 +3102,57 @@ _aes_gcm_dec_192_kernel: fmov v3.d[1], x9 //CTR block 3 - ldr q26, [x8, #128] //load rk8 + ld1 {v22.4s}, [x8], #16 //load rk4 aese v0.16b, v20.16b aesmc v0.16b, v0.16b //AES block 0 - round 2 aese v2.16b, v18.16b aesmc v2.16b, v2.16b //AES block 2 - round 0 - ldr q29, [x8, #176] //load rk11 + ld1 {v23.4s}, [x8], #16 //load rk5 aese v1.16b, v18.16b aesmc v1.16b, v1.16b //AES block 1 - round 0 ldr q15, [x3, #112] //load h4l | h4h +#ifndef __AARCH64EB__ ext v15.16b, v15.16b, v15.16b, #8 - +#endif aese v3.16b, v18.16b aesmc v3.16b, v3.16b //AES block 3 - round 0 ldr q13, [x3, #64] //load h2l | h2h +#ifndef __AARCH64EB__ ext v13.16b, v13.16b, v13.16b, #8 - +#endif aese v2.16b, v19.16b aesmc v2.16b, v2.16b //AES block 2 - round 1 ldr q14, [x3, #80] //load h3l | h3h +#ifndef __AARCH64EB__ ext v14.16b, v14.16b, v14.16b, #8 - +#endif aese v1.16b, v19.16b aesmc v1.16b, v1.16b //AES block 1 - round 1 - ldp x13, x14, [x8, #192] //load rk12 aese v3.16b, v19.16b aesmc v3.16b, v3.16b //AES block 3 - round 1 ldr q12, [x3, #32] //load h1l | h1h +#ifndef __AARCH64EB__ ext v12.16b, v12.16b, v12.16b, #8 - +#endif aese v2.16b, v20.16b aesmc v2.16b, v2.16b //AES block 2 - round 2 - ldr q28, [x8, #160] //load rk10 + ld1 {v24.4s}, [x8], #16 //load rk6 aese v0.16b, v21.16b aesmc v0.16b, v0.16b //AES block 0 - round 3 - ldr q27, [x8, #144] //load rk9 + ld1 {v25.4s}, [x8], #16 //load rk7 aese v1.16b, v20.16b aesmc v1.16b, v1.16b //AES block 1 - round 2 - ldr q25, [x8, #112] //load rk7 + ld1 {v26.4s}, [x8], #16 //load rk8 aese v3.16b, v20.16b aesmc v3.16b, v3.16b //AES block 3 - round 2 - ldr q22, [x8, #64] //load rk4 + ld1 {v27.4s}, [x8], #16 //load rk9 aese v2.16b, v21.16b aesmc v2.16b, v2.16b //AES block 2 - round 3 @@ -2984,7 +3170,7 @@ _aes_gcm_dec_192_kernel: aese v0.16b, v22.16b aesmc v0.16b, v0.16b //AES block 0 - round 4 - ldr q23, [x8, #80] //load rk5 + ld1 {v28.4s}, [x8], #16 //load rk10 aese v1.16b, v22.16b aesmc v1.16b, v1.16b //AES block 1 - round 4 @@ -2999,7 +3185,7 @@ _aes_gcm_dec_192_kernel: aese v0.16b, v23.16b aesmc v0.16b, v0.16b //AES block 0 - round 5 - ldr q24, [x8, #96] //load rk6 + ld1 {v29.4s}, [x8], #16 //load rk11 aese v1.16b, v23.16b aesmc v1.16b, v1.16b //AES block 1 - round 5 @@ -3086,17 +3272,13 @@ _aes_gcm_dec_192_kernel: aese v0.16b, v29.16b //AES block 0 - round 11 b.ge L192_dec_tail //handle tail - ldr q5, [x0, #16] //AES block 1 - load ciphertext - - ldr q4, [x0, #0] //AES block 0 - load ciphertext + ld1 {v4.16b, v5.16b}, [x0], #32 //AES block 0,1 - load ciphertext eor v1.16b, v5.16b, v1.16b //AES block 1 - result eor v0.16b, v4.16b, v0.16b //AES block 0 - result rev w9, w12 //CTR block 4 - ldr q7, [x0, #48] //AES block 3 - load ciphertext - - ldr q6, [x0, #32] //AES block 2 - load ciphertext + ld1 {v6.16b, v7.16b}, [x0], #32 //AES block 2,3 - load ciphertext mov x19, v1.d[0] //AES block 1 - mov low @@ -3108,27 +3290,35 @@ _aes_gcm_dec_192_kernel: mov x7, v0.d[1] //AES block 0 - mov high rev64 v4.16b, v4.16b //GHASH block 0 - add x0, x0, #64 //AES input_ptr update fmov d0, x10 //CTR block 4 rev64 v5.16b, v5.16b //GHASH block 1 cmp x0, x5 //check if we have <= 8 blocks eor x19, x19, x13 //AES block 1 - round 12 low +#ifdef __AARCH64EB__ + rev x19, x19 +#endif fmov v0.d[1], x9 //CTR block 4 rev w9, w12 //CTR block 5 orr x9, x11, x9, lsl #32 //CTR block 5 fmov d1, x10 //CTR block 5 eor x20, x20, x14 //AES block 1 - round 12 high - +#ifdef __AARCH64EB__ + rev x20, x20 +#endif add w12, w12, #1 //CTR block 5 fmov v1.d[1], x9 //CTR block 5 eor x6, x6, x13 //AES block 0 - round 12 low - +#ifdef __AARCH64EB__ + rev x6, x6 +#endif rev w9, w12 //CTR block 6 eor x7, x7, x14 //AES block 0 - round 12 high - +#ifdef __AARCH64EB__ + rev x7, x7 +#endif stp x6, x7, [x2], #16 //AES block 0 - store result orr x9, x11, x9, lsl #32 //CTR block 6 @@ -3191,7 +3381,9 @@ L192_dec_main_loop: //main loop start aese v0.16b, v20.16b aesmc v0.16b, v0.16b //AES block 4k+4 - round 2 eor x22, x22, x14 //AES block 4k+2 - round 12 high - +#ifdef __AARCH64EB__ + rev x22, x22 +#endif aese v2.16b, v19.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 1 eor v4.8b, v4.8b, v5.8b //GHASH block 4k+1 - mid @@ -3208,7 +3400,9 @@ L192_dec_main_loop: //main loop start pmull v4.1q, v4.1d, v17.1d //GHASH block 4k+1 - mid eor v11.16b, v11.16b, v31.16b //GHASH block 4k+1 - low eor x21, x21, x13 //AES block 4k+2 - round 12 low - +#ifdef __AARCH64EB__ + rev x21, x21 +#endif aese v1.16b, v22.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 4 @@ -3310,16 +3504,18 @@ L192_dec_main_loop: //main loop start aese v2.16b, v24.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 6 - ldr q6, [x0, #32] //AES block 4k+6 - load ciphertext + ld1 {v4.16b}, [x0], #16 //AES block 4k+4 - load ciphertext aese v3.16b, v24.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 6 eor v10.16b, v10.16b, v30.16b //MODULO - karatsuba tidy up pmull v31.1q, v9.1d, v8.1d //MODULO - top 64b align with mid - ldr q7, [x0, #48] //AES block 4k+7 - load ciphertext + ld1 {v5.16b}, [x0], #16 //AES block 4k+5 - load ciphertext eor x23, x23, x13 //AES block 4k+3 - round 12 low - +#ifdef __AARCH64EB__ + rev x23, x23 +#endif aese v2.16b, v25.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 7 ext v9.16b, v9.16b, v9.16b, #8 //MODULO - other top alignment @@ -3333,10 +3529,10 @@ L192_dec_main_loop: //main loop start aese v2.16b, v26.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 8 - ldr q4, [x0, #0] //AES block 4k+4 - load ciphertext + ld1 {v6.16b}, [x0], #16 //AES block 4k+6 - load ciphertext aese v1.16b, v29.16b //AES block 4k+5 - round 11 - ldr q5, [x0, #16] //AES block 4k+5 - load ciphertext + ld1 {v7.16b}, [x0], #16 //AES block 4k+7 - load ciphertext rev w9, w12 //CTR block 4k+8 aese v3.16b, v26.16b @@ -3347,11 +3543,13 @@ L192_dec_main_loop: //main loop start aesmc v2.16b, v2.16b //AES block 4k+6 - round 9 eor v10.16b, v10.16b, v9.16b //MODULO - fold into mid - add x0, x0, #64 //AES input_ptr update cmp x0, x5 //LOOP CONTROL eor v0.16b, v4.16b, v0.16b //AES block 4k+4 - result eor x24, x24, x14 //AES block 4k+3 - round 12 high +#ifdef __AARCH64EB__ + rev x24, x24 +#endif eor v1.16b, v5.16b, v1.16b //AES block 4k+5 - result aese v2.16b, v28.16b @@ -3384,18 +3582,28 @@ L192_dec_main_loop: //main loop start rev w9, w12 //CTR block 4k+9 eor x6, x6, x13 //AES block 4k+4 - round 12 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif orr x9, x11, x9, lsl #32 //CTR block 4k+9 eor v11.16b, v11.16b, v8.16b //MODULO - fold into low fmov d1, x10 //CTR block 4k+9 add w12, w12, #1 //CTR block 4k+9 eor x19, x19, x13 //AES block 4k+5 - round 12 low - +#ifdef __AARCH64EB__ + rev x19, x19 +#endif fmov v1.d[1], x9 //CTR block 4k+9 rev w9, w12 //CTR block 4k+10 eor x20, x20, x14 //AES block 4k+5 - round 12 high - +#ifdef __AARCH64EB__ + rev x20, x20 +#endif eor x7, x7, x14 //AES block 4k+4 - round 12 high +#ifdef __AARCH64EB__ + rev x7, x7 +#endif stp x6, x7, [x2], #16 //AES block 4k+4 - store result eor v11.16b, v11.16b, v10.16b //MODULO - fold into low @@ -3449,18 +3657,29 @@ L192_dec_prepretail: //PREPRETAIL pmull v31.1q, v5.1d, v14.1d //GHASH block 4k+1 - low eor x24, x24, x14 //AES block 4k+3 - round 12 high +#ifdef __AARCH64EB__ + rev x24, x24 +#endif fmov v3.d[1], x9 //CTR block 4k+7 aese v0.16b, v20.16b aesmc v0.16b, v0.16b //AES block 4k+4 - round 2 eor x21, x21, x13 //AES block 4k+2 - round 12 low - +#ifdef __AARCH64EB__ + rev x21, x21 +#endif pmull2 v30.1q, v5.2d, v14.2d //GHASH block 4k+1 - high eor x22, x22, x14 //AES block 4k+2 - round 12 high +#ifdef __AARCH64EB__ + rev x22, x22 +#endif eor v4.8b, v4.8b, v5.8b //GHASH block 4k+1 - mid pmull v10.1q, v8.1d, v10.1d //GHASH block 4k - mid eor x23, x23, x13 //AES block 4k+3 - round 12 low +#ifdef __AARCH64EB__ + rev x23, x23 +#endif stp x21, x22, [x2], #16 //AES block 4k+2 - store result rev64 v7.16b, v7.16b //GHASH block 4k+3 @@ -3650,8 +3869,13 @@ L192_dec_tail: //TAIL cmp x5, #48 eor x7, x7, x14 //AES block 4k+4 - round 12 high - +#ifdef __AARCH64EB__ + rev x7, x7 +#endif eor x6, x6, x13 //AES block 4k+4 - round 12 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif b.gt L192_dec_blocks_more_than_3 movi v11.8b, #0 @@ -3695,10 +3919,16 @@ L192_dec_blocks_more_than_3: //blocks left > 3 pmull2 v9.1q, v4.2d, v15.2d //GHASH final-3 block - high eor x6, x6, x13 //AES final-2 block - round 12 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif movi v8.8b, #0 //suppress further partial tag feed in pmull v10.1q, v22.1d, v10.1d //GHASH final-3 block - mid eor x7, x7, x14 //AES final-2 block - round 12 high +#ifdef __AARCH64EB__ + rev x7, x7 +#endif L192_dec_blocks_more_than_2: //blocks left > 2 rev64 v4.16b, v5.16b //GHASH final-2 block @@ -3728,8 +3958,13 @@ L192_dec_blocks_more_than_2: //blocks left > 2 eor v9.16b, v9.16b, v20.16b //GHASH final-2 block - high eor x7, x7, x14 //AES final-1 block - round 12 high - +#ifdef __AARCH64EB__ + rev x7, x7 +#endif eor x6, x6, x13 //AES final-1 block - round 12 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif eor v10.16b, v10.16b, v22.16b //GHASH final-2 block - mid L192_dec_blocks_more_than_1: //blocks left > 1 @@ -3760,9 +3995,13 @@ L192_dec_blocks_more_than_1: //blocks left > 1 movi v8.8b, #0 //suppress further partial tag feed in eor v11.16b, v11.16b, v21.16b //GHASH final-1 block - low eor x7, x7, x14 //AES final block - round 12 high - +#ifdef __AARCH64EB__ + rev x7, x7 +#endif eor x6, x6, x13 //AES final block - round 12 low - +#ifdef __AARCH64EB__ + rev x6, x6 +#endif eor v10.16b, v10.16b, v22.16b //GHASH final-1 block - mid L192_dec_blocks_less_than_1: //blocks left <= 1 @@ -3789,8 +4028,11 @@ L192_dec_blocks_less_than_1: //blocks left <= 1 orr x6, x6, x4 mov v0.d[1], x10 - +#ifndef __AARCH64EB__ rev w9, w12 +#else + mov w9, w12 +#endif and v5.16b, v5.16b, v0.16b //possibly partial last block has zeroes in highest bits str w9, [x16, #12] //store the updated counter @@ -3878,14 +4120,22 @@ _aes_gcm_enc_256_kernel: lsr x5, x1, #3 //byte_len mov x15, x5 ldp x10, x11, [x16] //ctr96_b64, ctr96_t32 - +#ifdef __AARCH64EB__ + rev x10, x10 + rev x11, x11 +#endif + ldp x13, x14, [x8, #224] //load rk14 +#ifdef __AARCH64EB__ + ror x13, x13, #32 + ror x14, x14, #32 +#endif ld1 { v0.16b}, [x16] //special case vector load initial counter so we can start first AES block as quickly as possible sub x5, x5, #1 //byte_len - 1 - ldr q18, [x8, #0] //load rk0 + ld1 {v18.4s}, [x8], #16 //load rk0 and x5, x5, #0xffffffffffffffc0 //number of bytes to be processed in main loop (at least 1 byte must be handled by tail) - ldr q25, [x8, #112] //load rk7 + ld1 {v19.4s}, [x8], #16 //load rk1 add x5, x5, x0 lsr x12, x11, #32 @@ -3905,14 +4155,14 @@ _aes_gcm_enc_256_kernel: orr x9, x11, x9, lsl #32 //CTR block 1 add w12, w12, #1 //CTR block 1 - ldr q19, [x8, #16] //load rk1 + ld1 {v20.4s}, [x8], #16 //load rk2 fmov v1.d[1], x9 //CTR block 1 rev w9, w12 //CTR block 2 add w12, w12, #1 //CTR block 2 orr x9, x11, x9, lsl #32 //CTR block 2 - ldr q20, [x8, #32] //load rk2 + ld1 {v21.4s}, [x8], #16 //load rk3 fmov v2.d[1], x9 //CTR block 2 rev w9, w12 //CTR block 3 @@ -3925,50 +4175,53 @@ _aes_gcm_enc_256_kernel: aese v1.16b, v18.16b aesmc v1.16b, v1.16b //AES block 1 - round 0 - ldr q21, [x8, #48] //load rk3 + ld1 {v22.4s}, [x8], #16 //load rk4 aese v0.16b, v20.16b aesmc v0.16b, v0.16b //AES block 0 - round 2 - ldr q24, [x8, #96] //load rk6 + ld1 {v23.4s}, [x8], #16 //load rk5 aese v2.16b, v18.16b aesmc v2.16b, v2.16b //AES block 2 - round 0 - ldr q23, [x8, #80] //load rk5 + ld1 {v24.4s}, [x8], #16 //load rk6 aese v1.16b, v19.16b aesmc v1.16b, v1.16b //AES block 1 - round 1 ldr q14, [x3, #80] //load h3l | h3h +#ifndef __AARCH64EB__ ext v14.16b, v14.16b, v14.16b, #8 - +#endif aese v3.16b, v18.16b aesmc v3.16b, v3.16b //AES block 3 - round 0 - ldr q31, [x8, #208] //load rk13 + ld1 {v25.4s}, [x8], #16 //load rk7 aese v2.16b, v19.16b aesmc v2.16b, v2.16b //AES block 2 - round 1 - ldr q22, [x8, #64] //load rk4 + ld1 {v26.4s}, [x8], #16 //load rk8 aese v1.16b, v20.16b aesmc v1.16b, v1.16b //AES block 1 - round 2 ldr q13, [x3, #64] //load h2l | h2h +#ifndef __AARCH64EB__ ext v13.16b, v13.16b, v13.16b, #8 - +#endif aese v3.16b, v19.16b aesmc v3.16b, v3.16b //AES block 3 - round 1 - ldr q30, [x8, #192] //load rk12 + ld1 {v27.4s}, [x8], #16 //load rk9 aese v2.16b, v20.16b aesmc v2.16b, v2.16b //AES block 2 - round 2 ldr q15, [x3, #112] //load h4l | h4h +#ifndef __AARCH64EB__ ext v15.16b, v15.16b, v15.16b, #8 - +#endif aese v1.16b, v21.16b aesmc v1.16b, v1.16b //AES block 1 - round 3 - ldr q29, [x8, #176] //load rk11 + ld1 {v28.4s}, [x8], #16 //load rk10 aese v3.16b, v20.16b aesmc v3.16b, v3.16b //AES block 3 - round 2 - ldr q26, [x8, #128] //load rk8 + ld1 {v29.4s}, [x8], #16 //load rk11 aese v2.16b, v21.16b aesmc v2.16b, v2.16b //AES block 2 - round 3 @@ -3976,7 +4229,6 @@ _aes_gcm_enc_256_kernel: aese v0.16b, v21.16b aesmc v0.16b, v0.16b //AES block 0 - round 3 - ldp x13, x14, [x8, #224] //load rk14 aese v3.16b, v21.16b aesmc v3.16b, v3.16b //AES block 3 - round 3 @@ -4014,16 +4266,17 @@ _aes_gcm_enc_256_kernel: aese v3.16b, v24.16b aesmc v3.16b, v3.16b //AES block 3 - round 6 - ldr q27, [x8, #144] //load rk9 + ld1 {v30.4s}, [x8], #16 //load rk12 aese v0.16b, v24.16b aesmc v0.16b, v0.16b //AES block 0 - round 6 ldr q12, [x3, #32] //load h1l | h1h +#ifndef __AARCH64EB__ ext v12.16b, v12.16b, v12.16b, #8 - +#endif aese v2.16b, v24.16b aesmc v2.16b, v2.16b //AES block 2 - round 6 - ldr q28, [x8, #160] //load rk10 + ld1 {v31.4s}, [x8], #16 //load rk13 aese v1.16b, v25.16b aesmc v1.16b, v1.16b //AES block 1 - round 7 @@ -4112,13 +4365,26 @@ _aes_gcm_enc_256_kernel: b.ge L256_enc_tail //handle tail ldp x19, x20, [x0, #16] //AES block 1 - load plaintext - +#ifdef __AARCH64EB__ + rev x19, x19 + rev x20, x20 +#endif rev w9, w12 //CTR block 4 ldp x6, x7, [x0, #0] //AES block 0 - load plaintext - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif ldp x23, x24, [x0, #48] //AES block 3 - load plaintext - +#ifdef __AARCH64EB__ + rev x23, x23 + rev x24, x24 +#endif ldp x21, x22, [x0, #32] //AES block 2 - load plaintext +#ifdef __AARCH64EB__ + rev x21, x21 + rev x22, x22 +#endif add x0, x0, #64 //AES input_ptr update eor x19, x19, x13 //AES block 1 - round 14 low @@ -4201,11 +4467,17 @@ L256_enc_main_loop: //main loop start aese v1.16b, v19.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 1 ldp x23, x24, [x0, #48] //AES block 4k+7 - load plaintext - +#ifdef __AARCH64EB__ + rev x23, x23 + rev x24, x24 +#endif aese v2.16b, v19.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 1 ldp x21, x22, [x0, #32] //AES block 4k+6 - load plaintext - +#ifdef __AARCH64EB__ + rev x21, x21 + rev x22, x22 +#endif aese v0.16b, v20.16b aesmc v0.16b, v0.16b //AES block 4k+4 - round 2 eor v4.16b, v4.16b, v11.16b //PRE 1 @@ -4315,7 +4587,10 @@ L256_enc_main_loop: //main loop start aese v3.16b, v24.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 6 ldp x19, x20, [x0, #16] //AES block 4k+5 - load plaintext - +#ifdef __AARCH64EB__ + rev x19, x19 + rev x20, x20 +#endif aese v1.16b, v26.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 8 mov d4, v7.d[1] //GHASH block 4k+3 - mid @@ -4352,7 +4627,10 @@ L256_enc_main_loop: //main loop start aese v2.16b, v26.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 8 ldp x6, x7, [x0, #0] //AES block 4k+4 - load plaintext - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif aese v0.16b, v28.16b aesmc v0.16b, v0.16b //AES block 4k+4 - round 10 shl d8, d8, #56 //mod_constant @@ -4714,7 +4992,10 @@ L256_enc_tail: //TAIL ext v8.16b, v11.16b, v11.16b, #8 //prepare final partial tag sub x5, x4, x0 //main_end_input_ptr is number of bytes left to process ldp x6, x7, [x0], #16 //AES block 4k+4 - load plaintext - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif eor x6, x6, x13 //AES block 4k+4 - round 14 low eor x7, x7, x14 //AES block 4k+4 - round 14 high @@ -4749,7 +5030,10 @@ L256_enc_blocks_more_than_3: //blocks left > 3 st1 { v5.16b}, [x2], #16 //AES final-3 block - store result ldp x6, x7, [x0], #16 //AES final-2 block - load input low & high - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif rev64 v4.16b, v5.16b //GHASH final-3 block eor x6, x6, x13 //AES final-2 block - round 14 low @@ -4778,7 +5062,10 @@ L256_enc_blocks_more_than_2: //blocks left > 2 st1 { v5.16b}, [x2], #16 //AES final-2 block - store result ldp x6, x7, [x0], #16 //AES final-1 block - load input low & high - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif rev64 v4.16b, v5.16b //GHASH final-2 block eor x6, x6, x13 //AES final-1 block - round 14 low @@ -4814,7 +5101,10 @@ L256_enc_blocks_more_than_1: //blocks left > 1 rev64 v4.16b, v5.16b //GHASH final-1 block ldp x6, x7, [x0], #16 //AES final block - load input low & high - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif eor v4.16b, v4.16b, v8.16b //feed in partial tag movi v8.8b, #0 //suppress further partial tag feed in @@ -4875,7 +5165,11 @@ L256_enc_blocks_less_than_1: //blocks left <= 1 pmull2 v20.1q, v4.2d, v12.2d //GHASH final block - high mov d8, v4.d[1] //GHASH final block - mid +#ifndef __AARCH64EB__ rev w9, w12 +#else + mov w9, w12 +#endif pmull v21.1q, v4.1d, v12.1d //GHASH final block - low @@ -4949,21 +5243,29 @@ _aes_gcm_dec_256_kernel: lsr x5, x1, #3 //byte_len mov x15, x5 ldp x10, x11, [x16] //ctr96_b64, ctr96_t32 - - ldr q26, [x8, #128] //load rk8 +#ifdef __AARCH64EB__ + rev x10, x10 + rev x11, x11 +#endif + ldp x13, x14, [x8, #224] //load rk14 +#ifdef __AARCH64EB__ + ror x14, x14, #32 + ror x13, x13, #32 +#endif + ld1 {v18.4s}, [x8], #16 //load rk0 sub x5, x5, #1 //byte_len - 1 - ldr q25, [x8, #112] //load rk7 + ld1 {v19.4s}, [x8], #16 //load rk1 and x5, x5, #0xffffffffffffffc0 //number of bytes to be processed in main loop (at least 1 byte must be handled by tail) add x4, x0, x1, lsr #3 //end_input_ptr - ldr q24, [x8, #96] //load rk6 + ld1 {v20.4s}, [x8], #16 //load rk2 lsr x12, x11, #32 - ldr q23, [x8, #80] //load rk5 + ld1 {v21.4s}, [x8], #16 //load rk3 orr w11, w11, w11 - ldr q21, [x8, #48] //load rk3 + ld1 {v22.4s}, [x8], #16 //load rk4 add x5, x5, x0 rev w12, w12 //rev_ctr32 @@ -4988,39 +5290,44 @@ _aes_gcm_dec_256_kernel: rev w9, w12 //CTR block 3 orr x9, x11, x9, lsl #32 //CTR block 3 - ldr q18, [x8, #0] //load rk0 + ld1 {v23.4s}, [x8], #16 //load rk5 fmov v3.d[1], x9 //CTR block 3 add w12, w12, #1 //CTR block 3 - ldr q22, [x8, #64] //load rk4 + ld1 {v24.4s}, [x8], #16 //load rk6 - ldr q31, [x8, #208] //load rk13 + ld1 {v25.4s}, [x8], #16 //load rk7 - ldr q19, [x8, #16] //load rk1 + ld1 {v26.4s}, [x8], #16 //load rk8 aese v0.16b, v18.16b aesmc v0.16b, v0.16b //AES block 0 - round 0 ldr q14, [x3, #80] //load h3l | h3h +#ifndef __AARCH64EB__ ext v14.16b, v14.16b, v14.16b, #8 +#endif aese v3.16b, v18.16b aesmc v3.16b, v3.16b //AES block 3 - round 0 ldr q15, [x3, #112] //load h4l | h4h +#ifndef __AARCH64EB__ ext v15.16b, v15.16b, v15.16b, #8 +#endif aese v1.16b, v18.16b aesmc v1.16b, v1.16b //AES block 1 - round 0 ldr q13, [x3, #64] //load h2l | h2h +#ifndef __AARCH64EB__ ext v13.16b, v13.16b, v13.16b, #8 +#endif aese v2.16b, v18.16b aesmc v2.16b, v2.16b //AES block 2 - round 0 - ldr q20, [x8, #32] //load rk2 + ld1 {v27.4s}, [x8], #16 //load rk9 aese v0.16b, v19.16b aesmc v0.16b, v0.16b //AES block 0 - round 1 - ldp x13, x14, [x8, #224] //load rk14 aese v1.16b, v19.16b aesmc v1.16b, v1.16b //AES block 1 - round 1 @@ -5030,20 +5337,21 @@ _aes_gcm_dec_256_kernel: aese v2.16b, v19.16b aesmc v2.16b, v2.16b //AES block 2 - round 1 - ldr q27, [x8, #144] //load rk9 + ld1 {v28.4s}, [x8], #16 //load rk10 aese v3.16b, v19.16b aesmc v3.16b, v3.16b //AES block 3 - round 1 - ldr q30, [x8, #192] //load rk12 + ld1 {v29.4s}, [x8], #16 //load rk11 aese v0.16b, v20.16b aesmc v0.16b, v0.16b //AES block 0 - round 2 ldr q12, [x3, #32] //load h1l | h1h +#ifndef __AARCH64EB__ ext v12.16b, v12.16b, v12.16b, #8 - +#endif aese v2.16b, v20.16b aesmc v2.16b, v2.16b //AES block 2 - round 2 - ldr q28, [x8, #160] //load rk10 + ld1 {v30.4s}, [x8], #16 //load rk12 aese v3.16b, v20.16b aesmc v3.16b, v3.16b //AES block 3 - round 2 @@ -5126,7 +5434,7 @@ _aes_gcm_dec_256_kernel: aese v2.16b, v26.16b aesmc v2.16b, v2.16b //AES block 2 - round 8 - ldr q29, [x8, #176] //load rk11 + ld1 {v31.4s}, [x8], #16 //load rk13 aese v1.16b, v27.16b aesmc v1.16b, v1.16b //AES block 1 - round 9 @@ -5191,9 +5499,7 @@ _aes_gcm_dec_256_kernel: aese v0.16b, v31.16b //AES block 0 - round 13 b.ge L256_dec_tail //handle tail - ldr q4, [x0, #0] //AES block 0 - load ciphertext - - ldr q5, [x0, #16] //AES block 1 - load ciphertext + ld1 {v4.16b, v5.16b}, [x0], #32 //AES block 0,1 - load ciphertext rev w9, w12 //CTR block 4 @@ -5201,7 +5507,7 @@ _aes_gcm_dec_256_kernel: eor v1.16b, v5.16b, v1.16b //AES block 1 - result rev64 v5.16b, v5.16b //GHASH block 1 - ldr q7, [x0, #48] //AES block 3 - load ciphertext + ld1 {v6.16b}, [x0], #16 //AES block 2 - load ciphertext mov x7, v0.d[1] //AES block 0 - mov high @@ -5221,22 +5527,32 @@ _aes_gcm_dec_256_kernel: orr x9, x11, x9, lsl #32 //CTR block 5 mov x20, v1.d[1] //AES block 1 - mov high eor x7, x7, x14 //AES block 0 - round 14 high - +#ifdef __AARCH64EB__ + rev x7, x7 +#endif eor x6, x6, x13 //AES block 0 - round 14 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif stp x6, x7, [x2], #16 //AES block 0 - store result fmov d1, x10 //CTR block 5 - ldr q6, [x0, #32] //AES block 2 - load ciphertext - add x0, x0, #64 //AES input_ptr update + ld1 {v7.16b}, [x0], #16 //AES block 3 - load ciphertext fmov v1.d[1], x9 //CTR block 5 rev w9, w12 //CTR block 6 add w12, w12, #1 //CTR block 6 eor x19, x19, x13 //AES block 1 - round 14 low +#ifdef __AARCH64EB__ + rev x19, x19 +#endif orr x9, x11, x9, lsl #32 //CTR block 6 eor x20, x20, x14 //AES block 1 - round 14 high +#ifdef __AARCH64EB__ + rev x20, x20 +#endif stp x19, x20, [x2], #16 //AES block 1 - store result eor v2.16b, v6.16b, v2.16b //AES block 2 - result @@ -5287,7 +5603,9 @@ L256_dec_main_loop: //main loop start aese v0.16b, v21.16b aesmc v0.16b, v0.16b //AES block 4k+4 - round 3 eor x22, x22, x14 //AES block 4k+2 - round 14 high - +#ifdef __AARCH64EB__ + rev x22, x22 +#endif aese v2.16b, v19.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 1 mov d10, v17.d[1] //GHASH block 4k - mid @@ -5299,7 +5617,9 @@ L256_dec_main_loop: //main loop start aese v3.16b, v18.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 0 eor x21, x21, x13 //AES block 4k+2 - round 14 low - +#ifdef __AARCH64EB__ + rev x21, x21 +#endif aese v2.16b, v20.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 2 stp x21, x22, [x2], #16 //AES block 4k+2 - store result @@ -5314,9 +5634,14 @@ L256_dec_main_loop: //main loop start pmull v10.1q, v8.1d, v10.1d //GHASH block 4k - mid eor x23, x23, x13 //AES block 4k+3 - round 14 low - +#ifdef __AARCH64EB__ + rev x23, x23 +#endif pmull v8.1q, v5.1d, v14.1d //GHASH block 4k+1 - low eor x24, x24, x14 //AES block 4k+3 - round 14 high +#ifdef __AARCH64EB__ + rev x24, x24 +#endif eor v9.16b, v9.16b, v4.16b //GHASH block 4k+1 - high aese v2.16b, v22.16b @@ -5437,7 +5762,7 @@ L256_dec_main_loop: //main loop start aese v1.16b, v27.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 9 - ldr q4, [x0, #0] //AES block 4k+4 - load ciphertext + ld1 {v4.16b}, [x0], #16 //AES block 4k+4 - load ciphertext aese v0.16b, v31.16b //AES block 4k+4 - round 13 ext v9.16b, v9.16b, v9.16b, #8 //MODULO - other top alignment @@ -5448,7 +5773,7 @@ L256_dec_main_loop: //main loop start aese v2.16b, v27.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 9 - ldr q5, [x0, #16] //AES block 4k+5 - load ciphertext + ld1 {v5.16b}, [x0], #16 //AES block 4k+5 - load ciphertext aese v3.16b, v26.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 8 @@ -5464,11 +5789,11 @@ L256_dec_main_loop: //main loop start aese v3.16b, v27.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 9 - ldr q7, [x0, #48] //AES block 4k+7 - load ciphertext + ld1 {v6.16b}, [x0], #16 //AES block 4k+6 - load ciphertext aese v1.16b, v30.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 12 - ldr q6, [x0, #32] //AES block 4k+6 - load ciphertext + ld1 {v7.16b}, [x0], #16 //AES block 4k+7 - load ciphertext aese v2.16b, v29.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 11 @@ -5479,7 +5804,6 @@ L256_dec_main_loop: //main loop start eor v10.16b, v10.16b, v9.16b //MODULO - fold into mid aese v1.16b, v31.16b //AES block 4k+5 - round 13 - add x0, x0, #64 //AES input_ptr update mov x6, v0.d[0] //AES block 4k+4 - mov low aese v2.16b, v30.16b @@ -5501,8 +5825,13 @@ L256_dec_main_loop: //main loop start add w12, w12, #1 //CTR block 4k+9 eor x6, x6, x13 //AES block 4k+4 - round 14 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif eor x7, x7, x14 //AES block 4k+4 - round 14 high - +#ifdef __AARCH64EB__ + rev x7, x7 +#endif mov x20, v1.d[1] //AES block 4k+5 - mov high eor v2.16b, v6.16b, v2.16b //AES block 4k+6 - result eor v11.16b, v11.16b, v8.16b //MODULO - fold into low @@ -5523,9 +5852,15 @@ L256_dec_main_loop: //main loop start rev64 v5.16b, v5.16b //GHASH block 4k+5 eor x20, x20, x14 //AES block 4k+5 - round 14 high +#ifdef __AARCH64EB__ + rev x20, x20 +#endif stp x6, x7, [x2], #16 //AES block 4k+4 - store result eor x19, x19, x13 //AES block 4k+5 - round 14 low +#ifdef __AARCH64EB__ + rev x19, x19 +#endif stp x19, x20, [x2], #16 //AES block 4k+5 - store result rev64 v4.16b, v4.16b //GHASH block 4k+4 @@ -5732,11 +6067,15 @@ L256_dec_prepretail: //PREPRETAIL aese v0.16b, v28.16b aesmc v0.16b, v0.16b //AES block 4k+4 - round 10 eor x22, x22, x14 //AES block 4k+2 - round 14 high - +#ifdef __AARCH64EB__ + rev x22, x22 +#endif aese v1.16b, v28.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 10 eor x23, x23, x13 //AES block 4k+3 - round 14 low - +#ifdef __AARCH64EB__ + rev x23, x23 +#endif aese v2.16b, v29.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 11 eor v10.16b, v10.16b, v9.16b //MODULO - fold into mid @@ -5748,12 +6087,18 @@ L256_dec_prepretail: //PREPRETAIL aese v1.16b, v29.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 11 eor x21, x21, x13 //AES block 4k+2 - round 14 low +#ifdef __AARCH64EB__ + rev x21, x21 +#endif aese v2.16b, v30.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 12 pmull v8.1q, v10.1d, v8.1d //MODULO - mid 64b align with low eor x24, x24, x14 //AES block 4k+3 - round 14 high +#ifdef __AARCH64EB__ + rev x24, x24 +#endif aese v3.16b, v29.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 11 @@ -5794,8 +6139,14 @@ L256_dec_tail: //TAIL cmp x5, #48 eor x6, x6, x13 //AES block 4k+4 - round 14 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif eor x7, x7, x14 //AES block 4k+4 - round 14 high +#ifdef __AARCH64EB__ + rev x7, x7 +#endif b.gt L256_dec_blocks_more_than_3 sub w12, w12, #1 @@ -5843,9 +6194,15 @@ L256_dec_blocks_more_than_3: //blocks left > 3 pmull v10.1q, v22.1d, v10.1d //GHASH final-3 block - mid eor x6, x6, x13 //AES final-2 block - round 14 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif pmull v11.1q, v4.1d, v15.1d //GHASH final-3 block - low eor x7, x7, x14 //AES final-2 block - round 14 high +#ifdef __AARCH64EB__ + rev x7, x7 +#endif L256_dec_blocks_more_than_2: //blocks left > 2 rev64 v4.16b, v5.16b //GHASH final-2 block @@ -5873,9 +6230,15 @@ L256_dec_blocks_more_than_2: //blocks left > 2 eor v9.16b, v9.16b, v20.16b //GHASH final-2 block - high eor x6, x6, x13 //AES final-1 block - round 14 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif eor v10.16b, v10.16b, v22.16b //GHASH final-2 block - mid eor x7, x7, x14 //AES final-1 block - round 14 high +#ifdef __AARCH64EB__ + rev x7, x7 +#endif L256_dec_blocks_more_than_1: //blocks left > 1 stp x6, x7, [x2], #16 //AES final-1 block - store result @@ -5903,13 +6266,18 @@ L256_dec_blocks_more_than_1: //blocks left > 1 pmull2 v22.1q, v22.2d, v16.2d //GHASH final-1 block - mid eor x6, x6, x13 //AES final block - round 14 low - +#ifdef __AARCH64EB__ + rev x6, x6 +#endif eor v11.16b, v11.16b, v21.16b //GHASH final-1 block - low eor v9.16b, v9.16b, v20.16b //GHASH final-1 block - high eor v10.16b, v10.16b, v22.16b //GHASH final-1 block - mid eor x7, x7, x14 //AES final block - round 14 high +#ifdef __AARCH64EB__ + rev x7, x7 +#endif L256_dec_blocks_less_than_1: //blocks left <= 1 and x1, x1, #127 //bit_length %= 128 @@ -5935,7 +6303,11 @@ L256_dec_blocks_less_than_1: //blocks left <= 1 mov v0.d[1], x10 bic x4, x4, x9 //mask out low existing bytes +#ifndef __AARCH64EB__ rev w9, w12 +#else + mov w9, w12 +#endif bic x5, x5, x10 //mask out high existing bytes diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/cmp.h b/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/cmp.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm/openssl-fips.gypi b/deps/openssl/config/archs/darwin64-arm64-cc/asm/openssl-fips.gypi index f023aa6c56ea4a..92ce5d9a95d7db 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm/openssl-fips.gypi @@ -33,7 +33,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/des_enc.c', diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm/openssl.gypi b/deps/openssl/config/archs/darwin64-arm64-cc/asm/openssl.gypi index a8503ec74dce20..91173eeb093184 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm/openssl.gypi +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm/openssl.gypi @@ -192,7 +192,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/camellia.c', diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/configdata.pm b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/configdata.pm index 4634922f920ee9..051e75f55a534a 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/configdata.pm @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,7 +206,7 @@ our %config = ( ], "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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -258,11 +258,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "darwin64-arm64-cc", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1322,6 +1322,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3941,6 +3944,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4049,6 +4055,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6314,6 +6323,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6422,6 +6434,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7763,6 +7778,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8434,7 +8453,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-armv8-mont.o", "crypto/bn/libfips-lib-bn_add.o", "crypto/bn/libfips-lib-bn_asm.o", @@ -8463,8 +8481,7 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_shift.o", "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", - "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o" + "crypto/bn/libfips-lib-bn_word.o" ], "products" => { "lib" => [ @@ -12923,6 +12940,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -13031,6 +13051,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15296,6 +15319,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15404,6 +15430,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16899,6 +16928,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -16935,6 +16965,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18898,6 +18929,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19922,6 +19957,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19958,6 +19994,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20223,6 +20260,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -21075,9 +21113,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_x931p.o" => [ "crypto/bn/bn_x931p.c" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-armv8-mont.o" => [ "crypto/bn/armv8-mont.S" ], @@ -21165,9 +21200,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_word.o" => [ "crypto/bn/bn_word.c" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/buffer/libcrypto-lib-buf_err.o" => [ "crypto/buffer/buf_err.c" ], @@ -23718,7 +23750,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/buffer/libcrypto-lib-buf_err.o", "crypto/buffer/libcrypto-lib-buffer.o", "crypto/camellia/libcrypto-lib-camellia.o", @@ -25297,7 +25328,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/buffer/libfips-lib-buffer.o", "crypto/cmac/libfips-lib-cmac.o", "crypto/des/libfips-lib-des_enc.o", @@ -26815,6 +26845,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27512,8 +27548,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27540,7 +27576,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27557,8 +27593,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/crypto/aes/aesv8-armx.S b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/crypto/aes/aesv8-armx.S index 62840b3d2bb605..5e3afc1ced813d 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/crypto/aes/aesv8-armx.S +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/crypto/aes/aesv8-armx.S @@ -1859,10 +1859,10 @@ _aes_v8_xts_encrypt: b.ne Lxts_enc_big_size // Encrypt the iv with key2, as the first XEX iv. ldr w6,[x4,#240] - ld1 {v0.16b},[x4],#16 + ld1 {v0.4s},[x4],#16 ld1 {v6.16b},[x5] sub w6,w6,#2 - ld1 {v1.16b},[x4],#16 + ld1 {v1.4s},[x4],#16 Loop_enc_iv_enc: aese v6.16b,v0.16b @@ -2462,9 +2462,9 @@ Lxts_enc_load_done: // Encrypt the composite block to get the last second encrypted text block ldr w6,[x3,#240] // load key schedule... - ld1 {v0.16b},[x3],#16 + ld1 {v0.4s},[x3],#16 sub w6,w6,#2 - ld1 {v1.16b},[x3],#16 // load key schedule... + ld1 {v1.4s},[x3],#16 // load key schedule... Loop_final_enc: aese v26.16b,v0.16b aesmc v26.16b,v26.16b @@ -2500,10 +2500,10 @@ _aes_v8_xts_decrypt: b.ne Lxts_dec_big_size // Encrypt the iv with key2, as the first XEX iv. ldr w6,[x4,#240] - ld1 {v0.16b},[x4],#16 + ld1 {v0.4s},[x4],#16 ld1 {v6.16b},[x5] sub w6,w6,#2 - ld1 {v1.16b},[x4],#16 + ld1 {v1.4s},[x4],#16 Loop_dec_small_iv_enc: aese v6.16b,v0.16b @@ -2581,10 +2581,10 @@ Lxts_dec_big_size: // Encrypt the iv with key2, as the first XEX iv ldr w6,[x4,#240] - ld1 {v0.16b},[x4],#16 + ld1 {v0.4s},[x4],#16 ld1 {v6.16b},[x5] sub w6,w6,#2 - ld1 {v1.16b},[x4],#16 + ld1 {v1.4s},[x4],#16 Loop_dec_iv_enc: aese v6.16b,v0.16b @@ -2914,7 +2914,7 @@ Loop5x_dec_after: .align 4 Lxts_dec_tail4x: add x0,x0,#16 - ld1 {v0.4s},[x0],#16 + tst x21,#0xf eor v5.16b,v1.16b,v4.16b st1 {v5.16b},[x1],#16 eor v17.16b,v24.16b,v17.16b @@ -2923,6 +2923,8 @@ Lxts_dec_tail4x: eor v31.16b,v26.16b,v31.16b st1 {v30.16b,v31.16b},[x1],#32 + b.eq Lxts_dec_abort + ld1 {v0.16b},[x0],#16 b Lxts_done .align 4 Lxts_outer_dec_tail: @@ -3100,7 +3102,7 @@ Lxts_done: // Processing the last two blocks with cipher stealing. mov x7,x3 cbnz x2,Lxts_dec_1st_done - ld1 {v0.4s},[x0],#16 + ld1 {v0.16b},[x0],#16 // Decrypt the last secod block to get the last plain text block Lxts_dec_1st_done: @@ -3145,9 +3147,9 @@ Lxts_dec_load_done: // Decrypt the composite block to get the last second plain text block ldr w6,[x7,#240] - ld1 {v0.16b},[x7],#16 + ld1 {v0.4s},[x7],#16 sub w6,w6,#2 - ld1 {v1.16b},[x7],#16 + ld1 {v1.4s},[x7],#16 Loop_final_dec: aesd v26.16b,v0.16b aesimc v26.16b,v26.16b diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/crypto/buildinf.h index 12212d9c4efe56..7e1526a94e38f5 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin64-arm64-cc" -#define DATE "built on: Mon Feb 13 14:06:42 2023 UTC" +#define DATE "built on: Fri Jun 9 12:03:16 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/crypto/modes/aes-gcm-armv8_64.S b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/crypto/modes/aes-gcm-armv8_64.S index 777c55f9fb3dfb..6fcafd5805448e 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/crypto/modes/aes-gcm-armv8_64.S +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/crypto/modes/aes-gcm-armv8_64.S @@ -19,28 +19,36 @@ _aes_gcm_enc_128_kernel: stp d14, d15, [sp, #96] ldp x10, x11, [x16] //ctr96_b64, ctr96_t32 +#ifdef __AARCH64EB__ + rev x10, x10 + rev x11, x11 +#endif ldp x13, x14, [x8, #160] //load rk10 - +#ifdef __AARCH64EB__ + ror x13, x13, #32 + ror x14, x14, #32 +#endif ld1 {v11.16b}, [x3] ext v11.16b, v11.16b, v11.16b, #8 rev64 v11.16b, v11.16b lsr x5, x1, #3 //byte_len mov x15, x5 - ldr q27, [x8, #144] //load rk9 + ld1 {v18.4s}, [x8], #16 //load rk0 add x4, x0, x1, lsr #3 //end_input_ptr sub x5, x5, #1 //byte_len - 1 lsr x12, x11, #32 ldr q15, [x3, #112] //load h4l | h4h +#ifndef __AARCH64EB__ ext v15.16b, v15.16b, v15.16b, #8 - +#endif fmov d1, x10 //CTR block 1 rev w12, w12 //rev_ctr32 add w12, w12, #1 //increment rev_ctr32 orr w11, w11, w11 - ldr q18, [x8, #0] //load rk0 + ld1 {v19.4s}, [x8], #16 //load rk1 rev w9, w12 //CTR block 1 add w12, w12, #1 //CTR block 1 @@ -60,30 +68,33 @@ _aes_gcm_enc_128_kernel: rev w9, w12 //CTR block 3 orr x9, x11, x9, lsl #32 //CTR block 3 - ldr q19, [x8, #16] //load rk1 + ld1 {v20.4s}, [x8], #16 //load rk2 add w12, w12, #1 //CTR block 3 fmov v3.d[1], x9 //CTR block 3 ldr q14, [x3, #80] //load h3l | h3h +#ifndef __AARCH64EB__ ext v14.16b, v14.16b, v14.16b, #8 - +#endif aese v1.16b, v18.16b aesmc v1.16b, v1.16b //AES block 1 - round 0 - ldr q20, [x8, #32] //load rk2 + ld1 {v21.4s}, [x8], #16 //load rk3 aese v2.16b, v18.16b aesmc v2.16b, v2.16b //AES block 2 - round 0 ldr q12, [x3, #32] //load h1l | h1h +#ifndef __AARCH64EB__ ext v12.16b, v12.16b, v12.16b, #8 +#endif aese v0.16b, v18.16b aesmc v0.16b, v0.16b //AES block 0 - round 0 - ldr q26, [x8, #128] //load rk8 + ld1 {v22.4s}, [x8], #16 //load rk4 aese v3.16b, v18.16b aesmc v3.16b, v3.16b //AES block 3 - round 0 - ldr q21, [x8, #48] //load rk3 + ld1 {v23.4s}, [x8], #16 //load rk5 aese v2.16b, v19.16b aesmc v2.16b, v2.16b //AES block 2 - round 1 @@ -91,11 +102,11 @@ _aes_gcm_enc_128_kernel: aese v0.16b, v19.16b aesmc v0.16b, v0.16b //AES block 0 - round 1 - ldr q24, [x8, #96] //load rk6 + ld1 {v24.4s}, [x8], #16 //load rk6 aese v1.16b, v19.16b aesmc v1.16b, v1.16b //AES block 1 - round 1 - ldr q25, [x8, #112] //load rk7 + ld1 {v25.4s}, [x8], #16 //load rk7 aese v3.16b, v19.16b aesmc v3.16b, v3.16b //AES block 3 - round 1 @@ -103,12 +114,14 @@ _aes_gcm_enc_128_kernel: aese v0.16b, v20.16b aesmc v0.16b, v0.16b //AES block 0 - round 2 - ldr q23, [x8, #80] //load rk5 + ld1 {v26.4s}, [x8], #16 //load rk8 aese v1.16b, v20.16b aesmc v1.16b, v1.16b //AES block 1 - round 2 ldr q13, [x3, #64] //load h2l | h2h +#ifndef __AARCH64EB__ ext v13.16b, v13.16b, v13.16b, #8 +#endif aese v3.16b, v20.16b aesmc v3.16b, v3.16b //AES block 3 - round 2 @@ -125,7 +138,7 @@ _aes_gcm_enc_128_kernel: aese v2.16b, v21.16b aesmc v2.16b, v2.16b //AES block 2 - round 3 - ldr q22, [x8, #64] //load rk4 + ld1 {v27.4s}, [x8], #16 //load rk9 aese v3.16b, v21.16b aesmc v3.16b, v3.16b //AES block 3 - round 3 @@ -208,13 +221,25 @@ _aes_gcm_enc_128_kernel: b.ge L128_enc_tail //handle tail ldp x6, x7, [x0, #0] //AES block 0 - load plaintext - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif ldp x21, x22, [x0, #32] //AES block 2 - load plaintext - +#ifdef __AARCH64EB__ + rev x21, x21 + rev x22, x22 +#endif ldp x19, x20, [x0, #16] //AES block 1 - load plaintext - +#ifdef __AARCH64EB__ + rev x19, x19 + rev x20, x20 +#endif ldp x23, x24, [x0, #48] //AES block 3 - load plaintext - +#ifdef __AARCH64EB__ + rev x23, x23 + rev x24, x24 +#endif eor x6, x6, x13 //AES block 0 - round 10 low eor x7, x7, x14 //AES block 0 - round 10 high @@ -279,6 +304,10 @@ _aes_gcm_enc_128_kernel: L128_enc_main_loop: //main loop start ldp x23, x24, [x0, #48] //AES block 4k+3 - load plaintext +#ifdef __AARCH64EB__ + rev x23, x23 + rev x24, x24 +#endif rev64 v4.16b, v4.16b //GHASH block 4k (only t0 is free) rev64 v6.16b, v6.16b //GHASH block 4k+2 (t0, t1, and t2 free) @@ -313,7 +342,10 @@ L128_enc_main_loop: //main loop start pmull2 v28.1q, v5.2d, v14.2d //GHASH block 4k+1 - high eor v31.8b, v31.8b, v6.8b //GHASH block 4k+2 - mid ldp x6, x7, [x0, #0] //AES block 4k+4 - load plaintext - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif aese v0.16b, v19.16b aesmc v0.16b, v0.16b //AES block 4k+4 - round 1 rev w9, w12 //CTR block 4k+8 @@ -395,7 +427,10 @@ L128_enc_main_loop: //main loop start aese v1.16b, v23.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 5 ldp x19, x20, [x0, #16] //AES block 4k+5 - load plaintext - +#ifdef __AARCH64EB__ + rev x19, x19 + rev x20, x20 +#endif aese v3.16b, v21.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 3 eor v10.16b, v10.16b, v31.16b //GHASH block 4k+2 - mid @@ -403,7 +438,10 @@ L128_enc_main_loop: //main loop start aese v0.16b, v23.16b aesmc v0.16b, v0.16b //AES block 4k+4 - round 5 ldp x21, x22, [x0, #32] //AES block 4k+6 - load plaintext - +#ifdef __AARCH64EB__ + rev x21, x21 + rev x22, x22 +#endif pmull v31.1q, v9.1d, v8.1d //MODULO - top 64b align with mid eor v11.16b, v11.16b, v29.16b //GHASH block 4k+3 - low @@ -712,7 +750,10 @@ L128_enc_tail: //TAIL sub x5, x4, x0 //main_end_input_ptr is number of bytes left to process ldp x6, x7, [x0], #16 //AES block 4k+4 - load plaintext - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif cmp x5, #48 ext v8.16b, v11.16b, v11.16b, #8 //prepare final partial tag @@ -750,7 +791,10 @@ L128_enc_blocks_more_than_3: //blocks left > 3 st1 { v5.16b}, [x2], #16 //AES final-3 block - store result ldp x6, x7, [x0], #16 //AES final-2 block - load input low & high - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif rev64 v4.16b, v5.16b //GHASH final-3 block eor v4.16b, v4.16b, v8.16b //feed in partial tag @@ -779,7 +823,10 @@ L128_enc_blocks_more_than_2: //blocks left > 2 rev64 v4.16b, v5.16b //GHASH final-2 block ldp x6, x7, [x0], #16 //AES final-1 block - load input low & high - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif eor v4.16b, v4.16b, v8.16b //feed in partial tag eor x6, x6, x13 //AES final-1 block - round 10 low @@ -813,7 +860,10 @@ L128_enc_blocks_more_than_1: //blocks left > 1 rev64 v4.16b, v5.16b //GHASH final-1 block ldp x6, x7, [x0], #16 //AES final block - load input low & high - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif eor v4.16b, v4.16b, v8.16b //feed in partial tag eor x7, x7, x14 //AES final block - round 10 high @@ -876,9 +926,11 @@ L128_enc_blocks_less_than_1: //blocks left <= 1 ld1 { v18.16b}, [x2] //load existing bytes where the possibly partial last block is to be stored eor v8.8b, v8.8b, v4.8b //GHASH final block - mid - +#ifndef __AARCH64EB__ rev w9, w12 - +#else + mov w9, w12 +#endif pmull2 v20.1q, v4.2d, v12.2d //GHASH final block - high pmull v8.1q, v8.1d, v16.1d //GHASH final block - mid @@ -951,20 +1003,29 @@ _aes_gcm_dec_128_kernel: lsr x5, x1, #3 //byte_len mov x15, x5 ldp x10, x11, [x16] //ctr96_b64, ctr96_t32 - +#ifdef __AARCH64EB__ + rev x10, x10 + rev x11, x11 +#endif + ldp x13, x14, [x8, #160] //load rk10 +#ifdef __AARCH64EB__ + ror x14, x14, 32 + ror x13, x13, 32 +#endif sub x5, x5, #1 //byte_len - 1 - ldr q18, [x8, #0] //load rk0 + ld1 {v18.4s}, [x8], #16 //load rk0 and x5, x5, #0xffffffffffffffc0 //number of bytes to be processed in main loop (at least 1 byte must be handled by tail) ld1 { v0.16b}, [x16] //special case vector load initial counter so we can start first AES block as quickly as possible ldr q13, [x3, #64] //load h2l | h2h +#ifndef __AARCH64EB__ ext v13.16b, v13.16b, v13.16b, #8 - +#endif lsr x12, x11, #32 fmov d2, x10 //CTR block 2 - ldr q19, [x8, #16] //load rk1 + ld1 {v19.4s}, [x8], #16 //load rk1 orr w11, w11, w11 rev w12, w12 //rev_ctr32 @@ -976,7 +1037,7 @@ _aes_gcm_dec_128_kernel: rev w9, w12 //CTR block 1 orr x9, x11, x9, lsl #32 //CTR block 1 - ldr q20, [x8, #32] //load rk2 + ld1 {v20.4s}, [x8], #16 //load rk2 add w12, w12, #1 //CTR block 1 fmov v1.d[1], x9 //CTR block 1 @@ -999,19 +1060,19 @@ _aes_gcm_dec_128_kernel: aese v1.16b, v18.16b aesmc v1.16b, v1.16b //AES block 1 - round 0 - ldr q21, [x8, #48] //load rk3 + ld1 {v21.4s}, [x8], #16 //load rk3 aese v0.16b, v20.16b aesmc v0.16b, v0.16b //AES block 0 - round 2 - ldr q24, [x8, #96] //load rk6 + ld1 {v22.4s}, [x8], #16 //load rk4 aese v2.16b, v18.16b aesmc v2.16b, v2.16b //AES block 2 - round 0 - ldr q25, [x8, #112] //load rk7 + ld1 {v23.4s}, [x8], #16 //load rk5 aese v1.16b, v19.16b aesmc v1.16b, v1.16b //AES block 1 - round 1 - ldr q22, [x8, #64] //load rk4 + ld1 {v24.4s}, [x8], #16 //load rk6 aese v3.16b, v18.16b aesmc v3.16b, v3.16b //AES block 3 - round 0 @@ -1021,7 +1082,6 @@ _aes_gcm_dec_128_kernel: aese v1.16b, v20.16b aesmc v1.16b, v1.16b //AES block 1 - round 2 - ldp x13, x14, [x8, #160] //load rk10 aese v3.16b, v19.16b aesmc v3.16b, v3.16b //AES block 3 - round 1 @@ -1031,7 +1091,7 @@ _aes_gcm_dec_128_kernel: aese v0.16b, v21.16b aesmc v0.16b, v0.16b //AES block 0 - round 3 - ldr q23, [x8, #80] //load rk5 + ld1 {v25.4s}, [x8], #16 //load rk7 aese v1.16b, v21.16b aesmc v1.16b, v1.16b //AES block 1 - round 3 @@ -1041,7 +1101,7 @@ _aes_gcm_dec_128_kernel: aese v2.16b, v20.16b aesmc v2.16b, v2.16b //AES block 2 - round 2 - ldr q27, [x8, #144] //load rk9 + ld1 {v26.4s}, [x8], #16 //load rk8 aese v1.16b, v22.16b aesmc v1.16b, v1.16b //AES block 1 - round 4 @@ -1052,11 +1112,12 @@ _aes_gcm_dec_128_kernel: aese v2.16b, v21.16b aesmc v2.16b, v2.16b //AES block 2 - round 3 ldr q14, [x3, #80] //load h3l | h3h +#ifndef __AARCH64EB__ ext v14.16b, v14.16b, v14.16b, #8 - +#endif aese v0.16b, v22.16b aesmc v0.16b, v0.16b //AES block 0 - round 4 - ldr q26, [x8, #128] //load rk8 + ld1 {v27.4s}, [x8], #16 //load rk9 aese v1.16b, v23.16b aesmc v1.16b, v1.16b //AES block 1 - round 5 @@ -1073,8 +1134,9 @@ _aes_gcm_dec_128_kernel: aese v2.16b, v23.16b aesmc v2.16b, v2.16b //AES block 2 - round 5 ldr q12, [x3, #32] //load h1l | h1h +#ifndef __AARCH64EB__ ext v12.16b, v12.16b, v12.16b, #8 - +#endif aese v3.16b, v23.16b aesmc v3.16b, v3.16b //AES block 3 - round 5 @@ -1092,7 +1154,9 @@ _aes_gcm_dec_128_kernel: trn1 v8.2d, v12.2d, v13.2d //h2h | h1h ldr q15, [x3, #112] //load h4l | h4h +#ifndef __AARCH64EB__ ext v15.16b, v15.16b, v15.16b, #8 +#endif trn2 v16.2d, v12.2d, v13.2d //h2l | h1l add x5, x5, x0 @@ -1134,12 +1198,10 @@ _aes_gcm_dec_128_kernel: eor v17.16b, v17.16b, v9.16b //h4k | h3k b.ge L128_dec_tail //handle tail - ldr q5, [x0, #16] //AES block 1 - load ciphertext - - ldr q4, [x0, #0] //AES block 0 - load ciphertext + ld1 {v4.16b, v5.16b}, [x0], #32 //AES block 0 - load ciphertext; AES block 1 - load ciphertext eor v1.16b, v5.16b, v1.16b //AES block 1 - result - ldr q6, [x0, #32] //AES block 2 - load ciphertext + ld1 {v6.16b}, [x0], #16 //AES block 2 - load ciphertext eor v0.16b, v4.16b, v0.16b //AES block 0 - result rev64 v4.16b, v4.16b //GHASH block 0 @@ -1147,10 +1209,9 @@ _aes_gcm_dec_128_kernel: orr x9, x11, x9, lsl #32 //CTR block 4 add w12, w12, #1 //CTR block 4 - ldr q7, [x0, #48] //AES block 3 - load ciphertext + ld1 {v7.16b}, [x0], #16 //AES block 3 - load ciphertext rev64 v5.16b, v5.16b //GHASH block 1 - add x0, x0, #64 //AES input_ptr update mov x19, v1.d[0] //AES block 1 - mov low mov x20, v1.d[1] //AES block 1 - mov high @@ -1165,7 +1226,9 @@ _aes_gcm_dec_128_kernel: fmov v0.d[1], x9 //CTR block 4 rev w9, w12 //CTR block 5 eor x19, x19, x13 //AES block 1 - round 10 low - +#ifdef __AARCH64EB__ + rev x19, x19 +#endif fmov d1, x10 //CTR block 5 add w12, w12, #1 //CTR block 5 orr x9, x11, x9, lsl #32 //CTR block 5 @@ -1177,10 +1240,19 @@ _aes_gcm_dec_128_kernel: orr x9, x11, x9, lsl #32 //CTR block 6 eor x20, x20, x14 //AES block 1 - round 10 high +#ifdef __AARCH64EB__ + rev x20, x20 +#endif eor x6, x6, x13 //AES block 0 - round 10 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif eor v2.16b, v6.16b, v2.16b //AES block 2 - result eor x7, x7, x14 //AES block 0 - round 10 high +#ifdef __AARCH64EB__ + rev x7, x7 +#endif stp x6, x7, [x2], #16 //AES block 0 - store result stp x19, x20, [x2], #16 //AES block 1 - store result @@ -1248,9 +1320,14 @@ L128_dec_main_loop: //main loop start aese v3.16b, v19.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 1 eor x23, x23, x13 //AES block 4k+3 - round 10 low - +#ifdef __AARCH64EB__ + rev x23, x23 +#endif pmull v30.1q, v30.1d, v17.1d //GHASH block 4k+1 - mid eor x22, x22, x14 //AES block 4k+2 - round 10 high +#ifdef __AARCH64EB__ + rev x22, x22 +#endif mov d31, v6.d[1] //GHASH block 4k+2 - mid aese v0.16b, v19.16b @@ -1288,7 +1365,9 @@ L128_dec_main_loop: //main loop start pmull2 v31.1q, v31.2d, v16.2d //GHASH block 4k+2 - mid eor x24, x24, x14 //AES block 4k+3 - round 10 high - +#ifdef __AARCH64EB__ + rev x24, x24 +#endif aese v2.16b, v20.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 2 eor v30.8b, v30.8b, v7.8b //GHASH block 4k+3 - mid @@ -1296,7 +1375,9 @@ L128_dec_main_loop: //main loop start aese v1.16b, v23.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 5 eor x21, x21, x13 //AES block 4k+2 - round 10 low - +#ifdef __AARCH64EB__ + rev x21, x21 +#endif aese v0.16b, v23.16b aesmc v0.16b, v0.16b //AES block 4k+4 - round 5 movi v8.8b, #0xc2 @@ -1318,7 +1399,7 @@ L128_dec_main_loop: //main loop start pmull v30.1q, v30.1d, v16.1d //GHASH block 4k+3 - mid eor v9.16b, v9.16b, v4.16b //GHASH block 4k+3 - high - ldr q4, [x0, #0] //AES block 4k+4 - load ciphertext + ld1 {v4.16b}, [x0], #16 //AES block 4k+3 - load ciphertext aese v1.16b, v25.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 7 @@ -1345,7 +1426,7 @@ L128_dec_main_loop: //main loop start rev w9, w12 //CTR block 4k+8 pmull v31.1q, v9.1d, v8.1d //MODULO - top 64b align with mid - ldr q5, [x0, #16] //AES block 4k+5 - load ciphertext + ld1 {v5.16b}, [x0], #16 //AES block 4k+4 - load ciphertext ext v9.16b, v9.16b, v9.16b, #8 //MODULO - other top alignment aese v0.16b, v27.16b //AES block 4k+4 - round 9 @@ -1363,7 +1444,7 @@ L128_dec_main_loop: //main loop start aese v3.16b, v23.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 5 - ldr q6, [x0, #32] //AES block 4k+6 - load ciphertext + ld1 {v6.16b}, [x0], #16 //AES block 4k+5 - load ciphertext add w12, w12, #1 //CTR block 4k+8 eor v10.16b, v10.16b, v31.16b //MODULO - fold into mid @@ -1371,11 +1452,10 @@ L128_dec_main_loop: //main loop start aese v2.16b, v25.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 7 - ldr q7, [x0, #48] //AES block 4k+3 - load ciphertext + ld1 {v7.16b}, [x0], #16 //AES block 4k+6 - load ciphertext aese v3.16b, v24.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 6 - add x0, x0, #64 //AES input_ptr update rev64 v5.16b, v5.16b //GHASH block 4k+5 eor v10.16b, v10.16b, v9.16b //MODULO - fold into mid @@ -1400,11 +1480,15 @@ L128_dec_main_loop: //main loop start aese v3.16b, v26.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 8 eor x7, x7, x14 //AES block 4k+4 - round 10 high - +#ifdef __AARCH64EB__ + rev x7, x7 +#endif eor v11.16b, v11.16b, v8.16b //MODULO - fold into low mov x20, v1.d[1] //AES block 4k+5 - mov high eor x6, x6, x13 //AES block 4k+4 - round 10 low - +#ifdef __AARCH64EB__ + rev x6, x6 +#endif eor v2.16b, v6.16b, v2.16b //AES block 4k+6 - result mov x19, v1.d[0] //AES block 4k+5 - mov low add w12, w12, #1 //CTR block 4k+9 @@ -1421,9 +1505,15 @@ L128_dec_main_loop: //main loop start add w12, w12, #1 //CTR block 4k+10 eor x20, x20, x14 //AES block 4k+5 - round 10 high +#ifdef __AARCH64EB__ + rev x20, x20 +#endif stp x6, x7, [x2], #16 //AES block 4k+4 - store result eor x19, x19, x13 //AES block 4k+5 - round 10 low +#ifdef __AARCH64EB__ + rev x19, x19 +#endif stp x19, x20, [x2], #16 //AES block 4k+5 - store result orr x9, x11, x9, lsl #32 //CTR block 4k+10 @@ -1528,9 +1618,14 @@ L128_dec_prepretail: //PREPRETAIL aese v3.16b, v20.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 2 eor x23, x23, x13 //AES block 4k+3 - round 10 low - +#ifdef __AARCH64EB__ + rev x23, x23 +#endif pmull v30.1q, v30.1d, v16.1d //GHASH block 4k+3 - mid eor x21, x21, x13 //AES block 4k+2 - round 10 low +#ifdef __AARCH64EB__ + rev x21, x21 +#endif eor v11.16b, v11.16b, v29.16b //GHASH block 4k+3 - low aese v2.16b, v21.16b @@ -1603,7 +1698,9 @@ L128_dec_prepretail: //PREPRETAIL pmull v8.1q, v10.1d, v8.1d //MODULO - mid 64b align with low eor x24, x24, x14 //AES block 4k+3 - round 10 high - +#ifdef __AARCH64EB__ + rev x24, x24 +#endif aese v2.16b, v25.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 7 ext v10.16b, v10.16b, v10.16b, #8 //MODULO - other mid alignment @@ -1621,7 +1718,9 @@ L128_dec_prepretail: //PREPRETAIL aese v3.16b, v26.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 8 eor x22, x22, x14 //AES block 4k+2 - round 10 high - +#ifdef __AARCH64EB__ + rev x22, x22 +#endif aese v0.16b, v27.16b //AES block 4k+4 - round 9 stp x21, x22, [x2], #16 //AES block 4k+2 - store result @@ -1645,9 +1744,14 @@ L128_dec_tail: //TAIL cmp x5, #48 eor x7, x7, x14 //AES block 4k+4 - round 10 high - +#ifdef __AARCH64EB__ + rev x7, x7 +#endif ext v8.16b, v11.16b, v11.16b, #8 //prepare final partial tag eor x6, x6, x13 //AES block 4k+4 - round 10 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif b.gt L128_dec_blocks_more_than_3 mov v3.16b, v2.16b @@ -1691,9 +1795,14 @@ L128_dec_blocks_more_than_3: //blocks left > 3 movi v8.8b, #0 //suppress further partial tag feed in eor x7, x7, x14 //AES final-2 block - round 10 high - +#ifdef __AARCH64EB__ + rev x7, x7 +#endif pmull v10.1q, v22.1d, v10.1d //GHASH final-3 block - mid eor x6, x6, x13 //AES final-2 block - round 10 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif L128_dec_blocks_more_than_2: //blocks left > 2 rev64 v4.16b, v5.16b //GHASH final-2 block @@ -1719,12 +1828,18 @@ L128_dec_blocks_more_than_2: //blocks left > 2 pmull v22.1q, v22.1d, v17.1d //GHASH final-2 block - mid eor x6, x6, x13 //AES final-1 block - round 10 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif eor v11.16b, v11.16b, v21.16b //GHASH final-2 block - low eor v9.16b, v9.16b, v20.16b //GHASH final-2 block - high eor v10.16b, v10.16b, v22.16b //GHASH final-2 block - mid eor x7, x7, x14 //AES final-1 block - round 10 high +#ifdef __AARCH64EB__ + rev x7, x7 +#endif L128_dec_blocks_more_than_1: //blocks left > 1 rev64 v4.16b, v5.16b //GHASH final-1 block @@ -1755,8 +1870,13 @@ L128_dec_blocks_more_than_1: //blocks left > 1 eor v9.16b, v9.16b, v20.16b //GHASH final-1 block - high eor x7, x7, x14 //AES final block - round 10 high - +#ifdef __AARCH64EB__ + rev x7, x7 +#endif eor x6, x6, x13 //AES final block - round 10 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif eor v10.16b, v10.16b, v22.16b //GHASH final-1 block - mid L128_dec_blocks_less_than_1: //blocks left <= 1 @@ -1802,7 +1922,11 @@ L128_dec_blocks_less_than_1: //blocks left <= 1 bic x4, x4, x9 //mask out low existing bytes and x6, x6, x9 +#ifndef __AARCH64EB__ rev w9, w12 +#else + mov w9, w12 +#endif eor v10.16b, v10.16b, v8.16b //GHASH final block - mid movi v8.8b, #0xc2 @@ -1869,18 +1993,26 @@ _aes_gcm_enc_192_kernel: stp d14, d15, [sp, #96] ldp x10, x11, [x16] //ctr96_b64, ctr96_t32 +#ifdef __AARCH64EB__ + rev x10, x10 + rev x11, x11 +#endif + ldp x13, x14, [x8, #192] //load rk12 +#ifdef __AARCH64EB__ + ror x13, x13, #32 + ror x14, x14, #32 +#endif + ld1 {v18.4s}, [x8], #16 //load rk0 - ldr q23, [x8, #80] //load rk5 - - ldr q22, [x8, #64] //load rk4 + ld1 {v19.4s}, [x8], #16 //load rk1 - ldr q26, [x8, #128] //load rk8 + ld1 {v20.4s}, [x8], #16 //load rk2 lsr x12, x11, #32 - ldr q24, [x8, #96] //load rk6 + ld1 {v21.4s}, [x8], #16 //load rk3 orr w11, w11, w11 - ldr q25, [x8, #112] //load rk7 + ld1 {v22.4s}, [x8], #16 //load rk4 rev w12, w12 //rev_ctr32 add w12, w12, #1 //increment rev_ctr32 @@ -1904,15 +2036,13 @@ _aes_gcm_enc_192_kernel: rev w9, w12 //CTR block 3 orr x9, x11, x9, lsl #32 //CTR block 3 - ldr q18, [x8, #0] //load rk0 + ld1 {v23.4s}, [x8], #16 //load rk5 fmov v3.d[1], x9 //CTR block 3 - ldr q21, [x8, #48] //load rk3 + ld1 {v24.4s}, [x8], #16 //load rk6 - ldp x13, x14, [x8, #192] //load rk12 - - ldr q19, [x8, #16] //load rk1 + ld1 {v25.4s}, [x8], #16 //load rk7 aese v0.16b, v18.16b aesmc v0.16b, v0.16b //AES block 0 - round 0 @@ -1922,35 +2052,38 @@ _aes_gcm_enc_192_kernel: aese v3.16b, v18.16b aesmc v3.16b, v3.16b //AES block 3 - round 0 - ldr q29, [x8, #176] //load rk11 + ld1 {v26.4s}, [x8], #16 //load rk8 aese v1.16b, v18.16b aesmc v1.16b, v1.16b //AES block 1 - round 0 ldr q15, [x3, #112] //load h4l | h4h +#ifndef __AARCH64EB__ ext v15.16b, v15.16b, v15.16b, #8 - +#endif aese v2.16b, v18.16b aesmc v2.16b, v2.16b //AES block 2 - round 0 - ldr q20, [x8, #32] //load rk2 + ld1 {v27.4s}, [x8], #16 //load rk9 aese v0.16b, v19.16b aesmc v0.16b, v0.16b //AES block 0 - round 1 - ldr q28, [x8, #160] //load rk10 + ld1 {v28.4s}, [x8], #16 //load rk10 aese v1.16b, v19.16b aesmc v1.16b, v1.16b //AES block 1 - round 1 ldr q12, [x3, #32] //load h1l | h1h +#ifndef __AARCH64EB__ ext v12.16b, v12.16b, v12.16b, #8 - +#endif aese v2.16b, v19.16b aesmc v2.16b, v2.16b //AES block 2 - round 1 - ldr q27, [x8, #144] //load rk9 + ld1 {v29.4s}, [x8], #16 //load rk11 aese v3.16b, v19.16b aesmc v3.16b, v3.16b //AES block 3 - round 1 ldr q14, [x3, #80] //load h3l | h3h +#ifndef __AARCH64EB__ ext v14.16b, v14.16b, v14.16b, #8 - +#endif aese v0.16b, v20.16b aesmc v0.16b, v0.16b //AES block 0 - round 2 @@ -2007,8 +2140,9 @@ _aes_gcm_enc_192_kernel: aese v2.16b, v24.16b aesmc v2.16b, v2.16b //AES block 2 - round 6 ldr q13, [x3, #64] //load h2l | h2h +#ifndef __AARCH64EB__ ext v13.16b, v13.16b, v13.16b, #8 - +#endif aese v1.16b, v24.16b aesmc v1.16b, v1.16b //AES block 1 - round 6 @@ -2088,13 +2222,26 @@ _aes_gcm_enc_192_kernel: rev w9, w12 //CTR block 4 ldp x6, x7, [x0, #0] //AES block 0 - load plaintext - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif orr x9, x11, x9, lsl #32 //CTR block 4 ldp x21, x22, [x0, #32] //AES block 2 - load plaintext - +#ifdef __AARCH64EB__ + rev x21, x21 + rev x22, x22 +#endif ldp x23, x24, [x0, #48] //AES block 3 - load plaintext - +#ifdef __AARCH64EB__ + rev x23, x23 + rev x24, x24 +#endif ldp x19, x20, [x0, #16] //AES block 1 - load plaintext +#ifdef __AARCH64EB__ + rev x19, x19 + rev x20, x20 +#endif add x0, x0, #64 //AES input_ptr update cmp x0, x5 //check if we have <= 8 blocks @@ -2166,7 +2313,10 @@ L192_enc_main_loop: //main loop start aese v1.16b, v18.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 0 ldp x19, x20, [x0, #16] //AES block 4k+5 - load plaintext - +#ifdef __AARCH64EB__ + rev x19, x19 + rev x20, x20 +#endif ext v11.16b, v11.16b, v11.16b, #8 //PRE 0 fmov d3, x10 //CTR block 4k+3 rev64 v4.16b, v4.16b //GHASH block 4k (only t0 is free) @@ -2178,11 +2328,17 @@ L192_enc_main_loop: //main loop start pmull2 v30.1q, v5.2d, v14.2d //GHASH block 4k+1 - high rev64 v7.16b, v7.16b //GHASH block 4k+3 (t0, t1, t2 and t3 free) ldp x21, x22, [x0, #32] //AES block 4k+6 - load plaintext - +#ifdef __AARCH64EB__ + rev x21, x21 + rev x22, x22 +#endif aese v0.16b, v18.16b aesmc v0.16b, v0.16b //AES block 4k+4 - round 0 ldp x23, x24, [x0, #48] //AES block 4k+3 - load plaintext - +#ifdef __AARCH64EB__ + rev x23, x23 + rev x24, x24 +#endif pmull v31.1q, v5.1d, v14.1d //GHASH block 4k+1 - low eor v4.16b, v4.16b, v11.16b //PRE 1 @@ -2275,7 +2431,10 @@ L192_enc_main_loop: //main loop start aese v1.16b, v22.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 4 ldp x6, x7, [x0, #0] //AES block 4k+4 - load plaintext - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif aese v0.16b, v24.16b aesmc v0.16b, v0.16b //AES block 4k+4 - round 6 eor v11.16b, v11.16b, v8.16b //GHASH block 4k+2 - low @@ -2640,7 +2799,10 @@ L192_enc_tail: //TAIL sub x5, x4, x0 //main_end_input_ptr is number of bytes left to process ldp x6, x7, [x0], #16 //AES block 4k+4 - load plaintext - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif eor x6, x6, x13 //AES block 4k+4 - round 12 low eor x7, x7, x14 //AES block 4k+4 - round 12 high @@ -2677,7 +2839,10 @@ L192_enc_blocks_more_than_3: //blocks left > 3 st1 { v5.16b}, [x2], #16 //AES final-3 block - store result ldp x6, x7, [x0], #16 //AES final-2 block - load input low & high - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif rev64 v4.16b, v5.16b //GHASH final-3 block eor x6, x6, x13 //AES final-2 block - round 12 low @@ -2708,7 +2873,10 @@ L192_enc_blocks_more_than_2: //blocks left > 2 rev64 v4.16b, v5.16b //GHASH final-2 block ldp x6, x7, [x0], #16 //AES final-1 block - load input low & high - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif eor v4.16b, v4.16b, v8.16b //feed in partial tag eor x7, x7, x14 //AES final-1 block - round 12 high @@ -2739,7 +2907,10 @@ L192_enc_blocks_more_than_1: //blocks left > 1 st1 { v5.16b}, [x2], #16 //AES final-1 block - store result ldp x6, x7, [x0], #16 //AES final block - load input low & high - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif rev64 v4.16b, v5.16b //GHASH final-1 block eor x6, x6, x13 //AES final block - round 12 low @@ -2771,7 +2942,11 @@ L192_enc_blocks_more_than_1: //blocks left > 1 L192_enc_blocks_less_than_1: //blocks left <= 1 ld1 { v18.16b}, [x2] //load existing bytes where the possibly partial last block is to be stored +#ifndef __AARCH64EB__ rev w9, w12 +#else + mov w9, w12 +#endif and x1, x1, #127 //bit_length %= 128 sub x1, x1, #128 //bit_length -= 128 @@ -2876,14 +3051,22 @@ _aes_gcm_dec_192_kernel: add x4, x0, x1, lsr #3 //end_input_ptr ldp x10, x11, [x16] //ctr96_b64, ctr96_t32 - +#ifdef __AARCH64EB__ + rev x10, x10 + rev x11, x11 +#endif + ldp x13, x14, [x8, #192] //load rk12 +#ifdef __AARCH64EB__ + ror x13, x13, #32 + ror x14, x14, #32 +#endif ld1 { v0.16b}, [x16] //special case vector load initial counter so we can start first AES block as quickly as possible - ldr q18, [x8, #0] //load rk0 + ld1 {v18.4s}, [x8], #16 //load rk0 lsr x5, x1, #3 //byte_len mov x15, x5 - ldr q20, [x8, #32] //load rk2 + ld1 {v19.4s}, [x8], #16 //load rk1 lsr x12, x11, #32 orr w11, w11, w11 @@ -2893,7 +3076,7 @@ _aes_gcm_dec_192_kernel: fmov d1, x10 //CTR block 1 add w12, w12, #1 //increment rev_ctr32 - ldr q19, [x8, #16] //load rk1 + ld1 {v20.4s}, [x8], #16 //load rk2 aese v0.16b, v18.16b aesmc v0.16b, v0.16b //AES block 0 - round 0 @@ -2901,7 +3084,7 @@ _aes_gcm_dec_192_kernel: add w12, w12, #1 //CTR block 1 orr x9, x11, x9, lsl #32 //CTR block 1 - ldr q21, [x8, #48] //load rk3 + ld1 {v21.4s}, [x8], #16 //load rk3 fmov v1.d[1], x9 //CTR block 1 rev w9, w12 //CTR block 2 @@ -2919,54 +3102,57 @@ _aes_gcm_dec_192_kernel: fmov v3.d[1], x9 //CTR block 3 - ldr q26, [x8, #128] //load rk8 + ld1 {v22.4s}, [x8], #16 //load rk4 aese v0.16b, v20.16b aesmc v0.16b, v0.16b //AES block 0 - round 2 aese v2.16b, v18.16b aesmc v2.16b, v2.16b //AES block 2 - round 0 - ldr q29, [x8, #176] //load rk11 + ld1 {v23.4s}, [x8], #16 //load rk5 aese v1.16b, v18.16b aesmc v1.16b, v1.16b //AES block 1 - round 0 ldr q15, [x3, #112] //load h4l | h4h +#ifndef __AARCH64EB__ ext v15.16b, v15.16b, v15.16b, #8 - +#endif aese v3.16b, v18.16b aesmc v3.16b, v3.16b //AES block 3 - round 0 ldr q13, [x3, #64] //load h2l | h2h +#ifndef __AARCH64EB__ ext v13.16b, v13.16b, v13.16b, #8 - +#endif aese v2.16b, v19.16b aesmc v2.16b, v2.16b //AES block 2 - round 1 ldr q14, [x3, #80] //load h3l | h3h +#ifndef __AARCH64EB__ ext v14.16b, v14.16b, v14.16b, #8 - +#endif aese v1.16b, v19.16b aesmc v1.16b, v1.16b //AES block 1 - round 1 - ldp x13, x14, [x8, #192] //load rk12 aese v3.16b, v19.16b aesmc v3.16b, v3.16b //AES block 3 - round 1 ldr q12, [x3, #32] //load h1l | h1h +#ifndef __AARCH64EB__ ext v12.16b, v12.16b, v12.16b, #8 - +#endif aese v2.16b, v20.16b aesmc v2.16b, v2.16b //AES block 2 - round 2 - ldr q28, [x8, #160] //load rk10 + ld1 {v24.4s}, [x8], #16 //load rk6 aese v0.16b, v21.16b aesmc v0.16b, v0.16b //AES block 0 - round 3 - ldr q27, [x8, #144] //load rk9 + ld1 {v25.4s}, [x8], #16 //load rk7 aese v1.16b, v20.16b aesmc v1.16b, v1.16b //AES block 1 - round 2 - ldr q25, [x8, #112] //load rk7 + ld1 {v26.4s}, [x8], #16 //load rk8 aese v3.16b, v20.16b aesmc v3.16b, v3.16b //AES block 3 - round 2 - ldr q22, [x8, #64] //load rk4 + ld1 {v27.4s}, [x8], #16 //load rk9 aese v2.16b, v21.16b aesmc v2.16b, v2.16b //AES block 2 - round 3 @@ -2984,7 +3170,7 @@ _aes_gcm_dec_192_kernel: aese v0.16b, v22.16b aesmc v0.16b, v0.16b //AES block 0 - round 4 - ldr q23, [x8, #80] //load rk5 + ld1 {v28.4s}, [x8], #16 //load rk10 aese v1.16b, v22.16b aesmc v1.16b, v1.16b //AES block 1 - round 4 @@ -2999,7 +3185,7 @@ _aes_gcm_dec_192_kernel: aese v0.16b, v23.16b aesmc v0.16b, v0.16b //AES block 0 - round 5 - ldr q24, [x8, #96] //load rk6 + ld1 {v29.4s}, [x8], #16 //load rk11 aese v1.16b, v23.16b aesmc v1.16b, v1.16b //AES block 1 - round 5 @@ -3086,17 +3272,13 @@ _aes_gcm_dec_192_kernel: aese v0.16b, v29.16b //AES block 0 - round 11 b.ge L192_dec_tail //handle tail - ldr q5, [x0, #16] //AES block 1 - load ciphertext - - ldr q4, [x0, #0] //AES block 0 - load ciphertext + ld1 {v4.16b, v5.16b}, [x0], #32 //AES block 0,1 - load ciphertext eor v1.16b, v5.16b, v1.16b //AES block 1 - result eor v0.16b, v4.16b, v0.16b //AES block 0 - result rev w9, w12 //CTR block 4 - ldr q7, [x0, #48] //AES block 3 - load ciphertext - - ldr q6, [x0, #32] //AES block 2 - load ciphertext + ld1 {v6.16b, v7.16b}, [x0], #32 //AES block 2,3 - load ciphertext mov x19, v1.d[0] //AES block 1 - mov low @@ -3108,27 +3290,35 @@ _aes_gcm_dec_192_kernel: mov x7, v0.d[1] //AES block 0 - mov high rev64 v4.16b, v4.16b //GHASH block 0 - add x0, x0, #64 //AES input_ptr update fmov d0, x10 //CTR block 4 rev64 v5.16b, v5.16b //GHASH block 1 cmp x0, x5 //check if we have <= 8 blocks eor x19, x19, x13 //AES block 1 - round 12 low +#ifdef __AARCH64EB__ + rev x19, x19 +#endif fmov v0.d[1], x9 //CTR block 4 rev w9, w12 //CTR block 5 orr x9, x11, x9, lsl #32 //CTR block 5 fmov d1, x10 //CTR block 5 eor x20, x20, x14 //AES block 1 - round 12 high - +#ifdef __AARCH64EB__ + rev x20, x20 +#endif add w12, w12, #1 //CTR block 5 fmov v1.d[1], x9 //CTR block 5 eor x6, x6, x13 //AES block 0 - round 12 low - +#ifdef __AARCH64EB__ + rev x6, x6 +#endif rev w9, w12 //CTR block 6 eor x7, x7, x14 //AES block 0 - round 12 high - +#ifdef __AARCH64EB__ + rev x7, x7 +#endif stp x6, x7, [x2], #16 //AES block 0 - store result orr x9, x11, x9, lsl #32 //CTR block 6 @@ -3191,7 +3381,9 @@ L192_dec_main_loop: //main loop start aese v0.16b, v20.16b aesmc v0.16b, v0.16b //AES block 4k+4 - round 2 eor x22, x22, x14 //AES block 4k+2 - round 12 high - +#ifdef __AARCH64EB__ + rev x22, x22 +#endif aese v2.16b, v19.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 1 eor v4.8b, v4.8b, v5.8b //GHASH block 4k+1 - mid @@ -3208,7 +3400,9 @@ L192_dec_main_loop: //main loop start pmull v4.1q, v4.1d, v17.1d //GHASH block 4k+1 - mid eor v11.16b, v11.16b, v31.16b //GHASH block 4k+1 - low eor x21, x21, x13 //AES block 4k+2 - round 12 low - +#ifdef __AARCH64EB__ + rev x21, x21 +#endif aese v1.16b, v22.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 4 @@ -3310,16 +3504,18 @@ L192_dec_main_loop: //main loop start aese v2.16b, v24.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 6 - ldr q6, [x0, #32] //AES block 4k+6 - load ciphertext + ld1 {v4.16b}, [x0], #16 //AES block 4k+4 - load ciphertext aese v3.16b, v24.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 6 eor v10.16b, v10.16b, v30.16b //MODULO - karatsuba tidy up pmull v31.1q, v9.1d, v8.1d //MODULO - top 64b align with mid - ldr q7, [x0, #48] //AES block 4k+7 - load ciphertext + ld1 {v5.16b}, [x0], #16 //AES block 4k+5 - load ciphertext eor x23, x23, x13 //AES block 4k+3 - round 12 low - +#ifdef __AARCH64EB__ + rev x23, x23 +#endif aese v2.16b, v25.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 7 ext v9.16b, v9.16b, v9.16b, #8 //MODULO - other top alignment @@ -3333,10 +3529,10 @@ L192_dec_main_loop: //main loop start aese v2.16b, v26.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 8 - ldr q4, [x0, #0] //AES block 4k+4 - load ciphertext + ld1 {v6.16b}, [x0], #16 //AES block 4k+6 - load ciphertext aese v1.16b, v29.16b //AES block 4k+5 - round 11 - ldr q5, [x0, #16] //AES block 4k+5 - load ciphertext + ld1 {v7.16b}, [x0], #16 //AES block 4k+7 - load ciphertext rev w9, w12 //CTR block 4k+8 aese v3.16b, v26.16b @@ -3347,11 +3543,13 @@ L192_dec_main_loop: //main loop start aesmc v2.16b, v2.16b //AES block 4k+6 - round 9 eor v10.16b, v10.16b, v9.16b //MODULO - fold into mid - add x0, x0, #64 //AES input_ptr update cmp x0, x5 //LOOP CONTROL eor v0.16b, v4.16b, v0.16b //AES block 4k+4 - result eor x24, x24, x14 //AES block 4k+3 - round 12 high +#ifdef __AARCH64EB__ + rev x24, x24 +#endif eor v1.16b, v5.16b, v1.16b //AES block 4k+5 - result aese v2.16b, v28.16b @@ -3384,18 +3582,28 @@ L192_dec_main_loop: //main loop start rev w9, w12 //CTR block 4k+9 eor x6, x6, x13 //AES block 4k+4 - round 12 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif orr x9, x11, x9, lsl #32 //CTR block 4k+9 eor v11.16b, v11.16b, v8.16b //MODULO - fold into low fmov d1, x10 //CTR block 4k+9 add w12, w12, #1 //CTR block 4k+9 eor x19, x19, x13 //AES block 4k+5 - round 12 low - +#ifdef __AARCH64EB__ + rev x19, x19 +#endif fmov v1.d[1], x9 //CTR block 4k+9 rev w9, w12 //CTR block 4k+10 eor x20, x20, x14 //AES block 4k+5 - round 12 high - +#ifdef __AARCH64EB__ + rev x20, x20 +#endif eor x7, x7, x14 //AES block 4k+4 - round 12 high +#ifdef __AARCH64EB__ + rev x7, x7 +#endif stp x6, x7, [x2], #16 //AES block 4k+4 - store result eor v11.16b, v11.16b, v10.16b //MODULO - fold into low @@ -3449,18 +3657,29 @@ L192_dec_prepretail: //PREPRETAIL pmull v31.1q, v5.1d, v14.1d //GHASH block 4k+1 - low eor x24, x24, x14 //AES block 4k+3 - round 12 high +#ifdef __AARCH64EB__ + rev x24, x24 +#endif fmov v3.d[1], x9 //CTR block 4k+7 aese v0.16b, v20.16b aesmc v0.16b, v0.16b //AES block 4k+4 - round 2 eor x21, x21, x13 //AES block 4k+2 - round 12 low - +#ifdef __AARCH64EB__ + rev x21, x21 +#endif pmull2 v30.1q, v5.2d, v14.2d //GHASH block 4k+1 - high eor x22, x22, x14 //AES block 4k+2 - round 12 high +#ifdef __AARCH64EB__ + rev x22, x22 +#endif eor v4.8b, v4.8b, v5.8b //GHASH block 4k+1 - mid pmull v10.1q, v8.1d, v10.1d //GHASH block 4k - mid eor x23, x23, x13 //AES block 4k+3 - round 12 low +#ifdef __AARCH64EB__ + rev x23, x23 +#endif stp x21, x22, [x2], #16 //AES block 4k+2 - store result rev64 v7.16b, v7.16b //GHASH block 4k+3 @@ -3650,8 +3869,13 @@ L192_dec_tail: //TAIL cmp x5, #48 eor x7, x7, x14 //AES block 4k+4 - round 12 high - +#ifdef __AARCH64EB__ + rev x7, x7 +#endif eor x6, x6, x13 //AES block 4k+4 - round 12 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif b.gt L192_dec_blocks_more_than_3 movi v11.8b, #0 @@ -3695,10 +3919,16 @@ L192_dec_blocks_more_than_3: //blocks left > 3 pmull2 v9.1q, v4.2d, v15.2d //GHASH final-3 block - high eor x6, x6, x13 //AES final-2 block - round 12 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif movi v8.8b, #0 //suppress further partial tag feed in pmull v10.1q, v22.1d, v10.1d //GHASH final-3 block - mid eor x7, x7, x14 //AES final-2 block - round 12 high +#ifdef __AARCH64EB__ + rev x7, x7 +#endif L192_dec_blocks_more_than_2: //blocks left > 2 rev64 v4.16b, v5.16b //GHASH final-2 block @@ -3728,8 +3958,13 @@ L192_dec_blocks_more_than_2: //blocks left > 2 eor v9.16b, v9.16b, v20.16b //GHASH final-2 block - high eor x7, x7, x14 //AES final-1 block - round 12 high - +#ifdef __AARCH64EB__ + rev x7, x7 +#endif eor x6, x6, x13 //AES final-1 block - round 12 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif eor v10.16b, v10.16b, v22.16b //GHASH final-2 block - mid L192_dec_blocks_more_than_1: //blocks left > 1 @@ -3760,9 +3995,13 @@ L192_dec_blocks_more_than_1: //blocks left > 1 movi v8.8b, #0 //suppress further partial tag feed in eor v11.16b, v11.16b, v21.16b //GHASH final-1 block - low eor x7, x7, x14 //AES final block - round 12 high - +#ifdef __AARCH64EB__ + rev x7, x7 +#endif eor x6, x6, x13 //AES final block - round 12 low - +#ifdef __AARCH64EB__ + rev x6, x6 +#endif eor v10.16b, v10.16b, v22.16b //GHASH final-1 block - mid L192_dec_blocks_less_than_1: //blocks left <= 1 @@ -3789,8 +4028,11 @@ L192_dec_blocks_less_than_1: //blocks left <= 1 orr x6, x6, x4 mov v0.d[1], x10 - +#ifndef __AARCH64EB__ rev w9, w12 +#else + mov w9, w12 +#endif and v5.16b, v5.16b, v0.16b //possibly partial last block has zeroes in highest bits str w9, [x16, #12] //store the updated counter @@ -3878,14 +4120,22 @@ _aes_gcm_enc_256_kernel: lsr x5, x1, #3 //byte_len mov x15, x5 ldp x10, x11, [x16] //ctr96_b64, ctr96_t32 - +#ifdef __AARCH64EB__ + rev x10, x10 + rev x11, x11 +#endif + ldp x13, x14, [x8, #224] //load rk14 +#ifdef __AARCH64EB__ + ror x13, x13, #32 + ror x14, x14, #32 +#endif ld1 { v0.16b}, [x16] //special case vector load initial counter so we can start first AES block as quickly as possible sub x5, x5, #1 //byte_len - 1 - ldr q18, [x8, #0] //load rk0 + ld1 {v18.4s}, [x8], #16 //load rk0 and x5, x5, #0xffffffffffffffc0 //number of bytes to be processed in main loop (at least 1 byte must be handled by tail) - ldr q25, [x8, #112] //load rk7 + ld1 {v19.4s}, [x8], #16 //load rk1 add x5, x5, x0 lsr x12, x11, #32 @@ -3905,14 +4155,14 @@ _aes_gcm_enc_256_kernel: orr x9, x11, x9, lsl #32 //CTR block 1 add w12, w12, #1 //CTR block 1 - ldr q19, [x8, #16] //load rk1 + ld1 {v20.4s}, [x8], #16 //load rk2 fmov v1.d[1], x9 //CTR block 1 rev w9, w12 //CTR block 2 add w12, w12, #1 //CTR block 2 orr x9, x11, x9, lsl #32 //CTR block 2 - ldr q20, [x8, #32] //load rk2 + ld1 {v21.4s}, [x8], #16 //load rk3 fmov v2.d[1], x9 //CTR block 2 rev w9, w12 //CTR block 3 @@ -3925,50 +4175,53 @@ _aes_gcm_enc_256_kernel: aese v1.16b, v18.16b aesmc v1.16b, v1.16b //AES block 1 - round 0 - ldr q21, [x8, #48] //load rk3 + ld1 {v22.4s}, [x8], #16 //load rk4 aese v0.16b, v20.16b aesmc v0.16b, v0.16b //AES block 0 - round 2 - ldr q24, [x8, #96] //load rk6 + ld1 {v23.4s}, [x8], #16 //load rk5 aese v2.16b, v18.16b aesmc v2.16b, v2.16b //AES block 2 - round 0 - ldr q23, [x8, #80] //load rk5 + ld1 {v24.4s}, [x8], #16 //load rk6 aese v1.16b, v19.16b aesmc v1.16b, v1.16b //AES block 1 - round 1 ldr q14, [x3, #80] //load h3l | h3h +#ifndef __AARCH64EB__ ext v14.16b, v14.16b, v14.16b, #8 - +#endif aese v3.16b, v18.16b aesmc v3.16b, v3.16b //AES block 3 - round 0 - ldr q31, [x8, #208] //load rk13 + ld1 {v25.4s}, [x8], #16 //load rk7 aese v2.16b, v19.16b aesmc v2.16b, v2.16b //AES block 2 - round 1 - ldr q22, [x8, #64] //load rk4 + ld1 {v26.4s}, [x8], #16 //load rk8 aese v1.16b, v20.16b aesmc v1.16b, v1.16b //AES block 1 - round 2 ldr q13, [x3, #64] //load h2l | h2h +#ifndef __AARCH64EB__ ext v13.16b, v13.16b, v13.16b, #8 - +#endif aese v3.16b, v19.16b aesmc v3.16b, v3.16b //AES block 3 - round 1 - ldr q30, [x8, #192] //load rk12 + ld1 {v27.4s}, [x8], #16 //load rk9 aese v2.16b, v20.16b aesmc v2.16b, v2.16b //AES block 2 - round 2 ldr q15, [x3, #112] //load h4l | h4h +#ifndef __AARCH64EB__ ext v15.16b, v15.16b, v15.16b, #8 - +#endif aese v1.16b, v21.16b aesmc v1.16b, v1.16b //AES block 1 - round 3 - ldr q29, [x8, #176] //load rk11 + ld1 {v28.4s}, [x8], #16 //load rk10 aese v3.16b, v20.16b aesmc v3.16b, v3.16b //AES block 3 - round 2 - ldr q26, [x8, #128] //load rk8 + ld1 {v29.4s}, [x8], #16 //load rk11 aese v2.16b, v21.16b aesmc v2.16b, v2.16b //AES block 2 - round 3 @@ -3976,7 +4229,6 @@ _aes_gcm_enc_256_kernel: aese v0.16b, v21.16b aesmc v0.16b, v0.16b //AES block 0 - round 3 - ldp x13, x14, [x8, #224] //load rk14 aese v3.16b, v21.16b aesmc v3.16b, v3.16b //AES block 3 - round 3 @@ -4014,16 +4266,17 @@ _aes_gcm_enc_256_kernel: aese v3.16b, v24.16b aesmc v3.16b, v3.16b //AES block 3 - round 6 - ldr q27, [x8, #144] //load rk9 + ld1 {v30.4s}, [x8], #16 //load rk12 aese v0.16b, v24.16b aesmc v0.16b, v0.16b //AES block 0 - round 6 ldr q12, [x3, #32] //load h1l | h1h +#ifndef __AARCH64EB__ ext v12.16b, v12.16b, v12.16b, #8 - +#endif aese v2.16b, v24.16b aesmc v2.16b, v2.16b //AES block 2 - round 6 - ldr q28, [x8, #160] //load rk10 + ld1 {v31.4s}, [x8], #16 //load rk13 aese v1.16b, v25.16b aesmc v1.16b, v1.16b //AES block 1 - round 7 @@ -4112,13 +4365,26 @@ _aes_gcm_enc_256_kernel: b.ge L256_enc_tail //handle tail ldp x19, x20, [x0, #16] //AES block 1 - load plaintext - +#ifdef __AARCH64EB__ + rev x19, x19 + rev x20, x20 +#endif rev w9, w12 //CTR block 4 ldp x6, x7, [x0, #0] //AES block 0 - load plaintext - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif ldp x23, x24, [x0, #48] //AES block 3 - load plaintext - +#ifdef __AARCH64EB__ + rev x23, x23 + rev x24, x24 +#endif ldp x21, x22, [x0, #32] //AES block 2 - load plaintext +#ifdef __AARCH64EB__ + rev x21, x21 + rev x22, x22 +#endif add x0, x0, #64 //AES input_ptr update eor x19, x19, x13 //AES block 1 - round 14 low @@ -4201,11 +4467,17 @@ L256_enc_main_loop: //main loop start aese v1.16b, v19.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 1 ldp x23, x24, [x0, #48] //AES block 4k+7 - load plaintext - +#ifdef __AARCH64EB__ + rev x23, x23 + rev x24, x24 +#endif aese v2.16b, v19.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 1 ldp x21, x22, [x0, #32] //AES block 4k+6 - load plaintext - +#ifdef __AARCH64EB__ + rev x21, x21 + rev x22, x22 +#endif aese v0.16b, v20.16b aesmc v0.16b, v0.16b //AES block 4k+4 - round 2 eor v4.16b, v4.16b, v11.16b //PRE 1 @@ -4315,7 +4587,10 @@ L256_enc_main_loop: //main loop start aese v3.16b, v24.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 6 ldp x19, x20, [x0, #16] //AES block 4k+5 - load plaintext - +#ifdef __AARCH64EB__ + rev x19, x19 + rev x20, x20 +#endif aese v1.16b, v26.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 8 mov d4, v7.d[1] //GHASH block 4k+3 - mid @@ -4352,7 +4627,10 @@ L256_enc_main_loop: //main loop start aese v2.16b, v26.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 8 ldp x6, x7, [x0, #0] //AES block 4k+4 - load plaintext - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif aese v0.16b, v28.16b aesmc v0.16b, v0.16b //AES block 4k+4 - round 10 shl d8, d8, #56 //mod_constant @@ -4714,7 +4992,10 @@ L256_enc_tail: //TAIL ext v8.16b, v11.16b, v11.16b, #8 //prepare final partial tag sub x5, x4, x0 //main_end_input_ptr is number of bytes left to process ldp x6, x7, [x0], #16 //AES block 4k+4 - load plaintext - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif eor x6, x6, x13 //AES block 4k+4 - round 14 low eor x7, x7, x14 //AES block 4k+4 - round 14 high @@ -4749,7 +5030,10 @@ L256_enc_blocks_more_than_3: //blocks left > 3 st1 { v5.16b}, [x2], #16 //AES final-3 block - store result ldp x6, x7, [x0], #16 //AES final-2 block - load input low & high - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif rev64 v4.16b, v5.16b //GHASH final-3 block eor x6, x6, x13 //AES final-2 block - round 14 low @@ -4778,7 +5062,10 @@ L256_enc_blocks_more_than_2: //blocks left > 2 st1 { v5.16b}, [x2], #16 //AES final-2 block - store result ldp x6, x7, [x0], #16 //AES final-1 block - load input low & high - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif rev64 v4.16b, v5.16b //GHASH final-2 block eor x6, x6, x13 //AES final-1 block - round 14 low @@ -4814,7 +5101,10 @@ L256_enc_blocks_more_than_1: //blocks left > 1 rev64 v4.16b, v5.16b //GHASH final-1 block ldp x6, x7, [x0], #16 //AES final block - load input low & high - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif eor v4.16b, v4.16b, v8.16b //feed in partial tag movi v8.8b, #0 //suppress further partial tag feed in @@ -4875,7 +5165,11 @@ L256_enc_blocks_less_than_1: //blocks left <= 1 pmull2 v20.1q, v4.2d, v12.2d //GHASH final block - high mov d8, v4.d[1] //GHASH final block - mid +#ifndef __AARCH64EB__ rev w9, w12 +#else + mov w9, w12 +#endif pmull v21.1q, v4.1d, v12.1d //GHASH final block - low @@ -4949,21 +5243,29 @@ _aes_gcm_dec_256_kernel: lsr x5, x1, #3 //byte_len mov x15, x5 ldp x10, x11, [x16] //ctr96_b64, ctr96_t32 - - ldr q26, [x8, #128] //load rk8 +#ifdef __AARCH64EB__ + rev x10, x10 + rev x11, x11 +#endif + ldp x13, x14, [x8, #224] //load rk14 +#ifdef __AARCH64EB__ + ror x14, x14, #32 + ror x13, x13, #32 +#endif + ld1 {v18.4s}, [x8], #16 //load rk0 sub x5, x5, #1 //byte_len - 1 - ldr q25, [x8, #112] //load rk7 + ld1 {v19.4s}, [x8], #16 //load rk1 and x5, x5, #0xffffffffffffffc0 //number of bytes to be processed in main loop (at least 1 byte must be handled by tail) add x4, x0, x1, lsr #3 //end_input_ptr - ldr q24, [x8, #96] //load rk6 + ld1 {v20.4s}, [x8], #16 //load rk2 lsr x12, x11, #32 - ldr q23, [x8, #80] //load rk5 + ld1 {v21.4s}, [x8], #16 //load rk3 orr w11, w11, w11 - ldr q21, [x8, #48] //load rk3 + ld1 {v22.4s}, [x8], #16 //load rk4 add x5, x5, x0 rev w12, w12 //rev_ctr32 @@ -4988,39 +5290,44 @@ _aes_gcm_dec_256_kernel: rev w9, w12 //CTR block 3 orr x9, x11, x9, lsl #32 //CTR block 3 - ldr q18, [x8, #0] //load rk0 + ld1 {v23.4s}, [x8], #16 //load rk5 fmov v3.d[1], x9 //CTR block 3 add w12, w12, #1 //CTR block 3 - ldr q22, [x8, #64] //load rk4 + ld1 {v24.4s}, [x8], #16 //load rk6 - ldr q31, [x8, #208] //load rk13 + ld1 {v25.4s}, [x8], #16 //load rk7 - ldr q19, [x8, #16] //load rk1 + ld1 {v26.4s}, [x8], #16 //load rk8 aese v0.16b, v18.16b aesmc v0.16b, v0.16b //AES block 0 - round 0 ldr q14, [x3, #80] //load h3l | h3h +#ifndef __AARCH64EB__ ext v14.16b, v14.16b, v14.16b, #8 +#endif aese v3.16b, v18.16b aesmc v3.16b, v3.16b //AES block 3 - round 0 ldr q15, [x3, #112] //load h4l | h4h +#ifndef __AARCH64EB__ ext v15.16b, v15.16b, v15.16b, #8 +#endif aese v1.16b, v18.16b aesmc v1.16b, v1.16b //AES block 1 - round 0 ldr q13, [x3, #64] //load h2l | h2h +#ifndef __AARCH64EB__ ext v13.16b, v13.16b, v13.16b, #8 +#endif aese v2.16b, v18.16b aesmc v2.16b, v2.16b //AES block 2 - round 0 - ldr q20, [x8, #32] //load rk2 + ld1 {v27.4s}, [x8], #16 //load rk9 aese v0.16b, v19.16b aesmc v0.16b, v0.16b //AES block 0 - round 1 - ldp x13, x14, [x8, #224] //load rk14 aese v1.16b, v19.16b aesmc v1.16b, v1.16b //AES block 1 - round 1 @@ -5030,20 +5337,21 @@ _aes_gcm_dec_256_kernel: aese v2.16b, v19.16b aesmc v2.16b, v2.16b //AES block 2 - round 1 - ldr q27, [x8, #144] //load rk9 + ld1 {v28.4s}, [x8], #16 //load rk10 aese v3.16b, v19.16b aesmc v3.16b, v3.16b //AES block 3 - round 1 - ldr q30, [x8, #192] //load rk12 + ld1 {v29.4s}, [x8], #16 //load rk11 aese v0.16b, v20.16b aesmc v0.16b, v0.16b //AES block 0 - round 2 ldr q12, [x3, #32] //load h1l | h1h +#ifndef __AARCH64EB__ ext v12.16b, v12.16b, v12.16b, #8 - +#endif aese v2.16b, v20.16b aesmc v2.16b, v2.16b //AES block 2 - round 2 - ldr q28, [x8, #160] //load rk10 + ld1 {v30.4s}, [x8], #16 //load rk12 aese v3.16b, v20.16b aesmc v3.16b, v3.16b //AES block 3 - round 2 @@ -5126,7 +5434,7 @@ _aes_gcm_dec_256_kernel: aese v2.16b, v26.16b aesmc v2.16b, v2.16b //AES block 2 - round 8 - ldr q29, [x8, #176] //load rk11 + ld1 {v31.4s}, [x8], #16 //load rk13 aese v1.16b, v27.16b aesmc v1.16b, v1.16b //AES block 1 - round 9 @@ -5191,9 +5499,7 @@ _aes_gcm_dec_256_kernel: aese v0.16b, v31.16b //AES block 0 - round 13 b.ge L256_dec_tail //handle tail - ldr q4, [x0, #0] //AES block 0 - load ciphertext - - ldr q5, [x0, #16] //AES block 1 - load ciphertext + ld1 {v4.16b, v5.16b}, [x0], #32 //AES block 0,1 - load ciphertext rev w9, w12 //CTR block 4 @@ -5201,7 +5507,7 @@ _aes_gcm_dec_256_kernel: eor v1.16b, v5.16b, v1.16b //AES block 1 - result rev64 v5.16b, v5.16b //GHASH block 1 - ldr q7, [x0, #48] //AES block 3 - load ciphertext + ld1 {v6.16b}, [x0], #16 //AES block 2 - load ciphertext mov x7, v0.d[1] //AES block 0 - mov high @@ -5221,22 +5527,32 @@ _aes_gcm_dec_256_kernel: orr x9, x11, x9, lsl #32 //CTR block 5 mov x20, v1.d[1] //AES block 1 - mov high eor x7, x7, x14 //AES block 0 - round 14 high - +#ifdef __AARCH64EB__ + rev x7, x7 +#endif eor x6, x6, x13 //AES block 0 - round 14 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif stp x6, x7, [x2], #16 //AES block 0 - store result fmov d1, x10 //CTR block 5 - ldr q6, [x0, #32] //AES block 2 - load ciphertext - add x0, x0, #64 //AES input_ptr update + ld1 {v7.16b}, [x0], #16 //AES block 3 - load ciphertext fmov v1.d[1], x9 //CTR block 5 rev w9, w12 //CTR block 6 add w12, w12, #1 //CTR block 6 eor x19, x19, x13 //AES block 1 - round 14 low +#ifdef __AARCH64EB__ + rev x19, x19 +#endif orr x9, x11, x9, lsl #32 //CTR block 6 eor x20, x20, x14 //AES block 1 - round 14 high +#ifdef __AARCH64EB__ + rev x20, x20 +#endif stp x19, x20, [x2], #16 //AES block 1 - store result eor v2.16b, v6.16b, v2.16b //AES block 2 - result @@ -5287,7 +5603,9 @@ L256_dec_main_loop: //main loop start aese v0.16b, v21.16b aesmc v0.16b, v0.16b //AES block 4k+4 - round 3 eor x22, x22, x14 //AES block 4k+2 - round 14 high - +#ifdef __AARCH64EB__ + rev x22, x22 +#endif aese v2.16b, v19.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 1 mov d10, v17.d[1] //GHASH block 4k - mid @@ -5299,7 +5617,9 @@ L256_dec_main_loop: //main loop start aese v3.16b, v18.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 0 eor x21, x21, x13 //AES block 4k+2 - round 14 low - +#ifdef __AARCH64EB__ + rev x21, x21 +#endif aese v2.16b, v20.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 2 stp x21, x22, [x2], #16 //AES block 4k+2 - store result @@ -5314,9 +5634,14 @@ L256_dec_main_loop: //main loop start pmull v10.1q, v8.1d, v10.1d //GHASH block 4k - mid eor x23, x23, x13 //AES block 4k+3 - round 14 low - +#ifdef __AARCH64EB__ + rev x23, x23 +#endif pmull v8.1q, v5.1d, v14.1d //GHASH block 4k+1 - low eor x24, x24, x14 //AES block 4k+3 - round 14 high +#ifdef __AARCH64EB__ + rev x24, x24 +#endif eor v9.16b, v9.16b, v4.16b //GHASH block 4k+1 - high aese v2.16b, v22.16b @@ -5437,7 +5762,7 @@ L256_dec_main_loop: //main loop start aese v1.16b, v27.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 9 - ldr q4, [x0, #0] //AES block 4k+4 - load ciphertext + ld1 {v4.16b}, [x0], #16 //AES block 4k+4 - load ciphertext aese v0.16b, v31.16b //AES block 4k+4 - round 13 ext v9.16b, v9.16b, v9.16b, #8 //MODULO - other top alignment @@ -5448,7 +5773,7 @@ L256_dec_main_loop: //main loop start aese v2.16b, v27.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 9 - ldr q5, [x0, #16] //AES block 4k+5 - load ciphertext + ld1 {v5.16b}, [x0], #16 //AES block 4k+5 - load ciphertext aese v3.16b, v26.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 8 @@ -5464,11 +5789,11 @@ L256_dec_main_loop: //main loop start aese v3.16b, v27.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 9 - ldr q7, [x0, #48] //AES block 4k+7 - load ciphertext + ld1 {v6.16b}, [x0], #16 //AES block 4k+6 - load ciphertext aese v1.16b, v30.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 12 - ldr q6, [x0, #32] //AES block 4k+6 - load ciphertext + ld1 {v7.16b}, [x0], #16 //AES block 4k+7 - load ciphertext aese v2.16b, v29.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 11 @@ -5479,7 +5804,6 @@ L256_dec_main_loop: //main loop start eor v10.16b, v10.16b, v9.16b //MODULO - fold into mid aese v1.16b, v31.16b //AES block 4k+5 - round 13 - add x0, x0, #64 //AES input_ptr update mov x6, v0.d[0] //AES block 4k+4 - mov low aese v2.16b, v30.16b @@ -5501,8 +5825,13 @@ L256_dec_main_loop: //main loop start add w12, w12, #1 //CTR block 4k+9 eor x6, x6, x13 //AES block 4k+4 - round 14 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif eor x7, x7, x14 //AES block 4k+4 - round 14 high - +#ifdef __AARCH64EB__ + rev x7, x7 +#endif mov x20, v1.d[1] //AES block 4k+5 - mov high eor v2.16b, v6.16b, v2.16b //AES block 4k+6 - result eor v11.16b, v11.16b, v8.16b //MODULO - fold into low @@ -5523,9 +5852,15 @@ L256_dec_main_loop: //main loop start rev64 v5.16b, v5.16b //GHASH block 4k+5 eor x20, x20, x14 //AES block 4k+5 - round 14 high +#ifdef __AARCH64EB__ + rev x20, x20 +#endif stp x6, x7, [x2], #16 //AES block 4k+4 - store result eor x19, x19, x13 //AES block 4k+5 - round 14 low +#ifdef __AARCH64EB__ + rev x19, x19 +#endif stp x19, x20, [x2], #16 //AES block 4k+5 - store result rev64 v4.16b, v4.16b //GHASH block 4k+4 @@ -5732,11 +6067,15 @@ L256_dec_prepretail: //PREPRETAIL aese v0.16b, v28.16b aesmc v0.16b, v0.16b //AES block 4k+4 - round 10 eor x22, x22, x14 //AES block 4k+2 - round 14 high - +#ifdef __AARCH64EB__ + rev x22, x22 +#endif aese v1.16b, v28.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 10 eor x23, x23, x13 //AES block 4k+3 - round 14 low - +#ifdef __AARCH64EB__ + rev x23, x23 +#endif aese v2.16b, v29.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 11 eor v10.16b, v10.16b, v9.16b //MODULO - fold into mid @@ -5748,12 +6087,18 @@ L256_dec_prepretail: //PREPRETAIL aese v1.16b, v29.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 11 eor x21, x21, x13 //AES block 4k+2 - round 14 low +#ifdef __AARCH64EB__ + rev x21, x21 +#endif aese v2.16b, v30.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 12 pmull v8.1q, v10.1d, v8.1d //MODULO - mid 64b align with low eor x24, x24, x14 //AES block 4k+3 - round 14 high +#ifdef __AARCH64EB__ + rev x24, x24 +#endif aese v3.16b, v29.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 11 @@ -5794,8 +6139,14 @@ L256_dec_tail: //TAIL cmp x5, #48 eor x6, x6, x13 //AES block 4k+4 - round 14 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif eor x7, x7, x14 //AES block 4k+4 - round 14 high +#ifdef __AARCH64EB__ + rev x7, x7 +#endif b.gt L256_dec_blocks_more_than_3 sub w12, w12, #1 @@ -5843,9 +6194,15 @@ L256_dec_blocks_more_than_3: //blocks left > 3 pmull v10.1q, v22.1d, v10.1d //GHASH final-3 block - mid eor x6, x6, x13 //AES final-2 block - round 14 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif pmull v11.1q, v4.1d, v15.1d //GHASH final-3 block - low eor x7, x7, x14 //AES final-2 block - round 14 high +#ifdef __AARCH64EB__ + rev x7, x7 +#endif L256_dec_blocks_more_than_2: //blocks left > 2 rev64 v4.16b, v5.16b //GHASH final-2 block @@ -5873,9 +6230,15 @@ L256_dec_blocks_more_than_2: //blocks left > 2 eor v9.16b, v9.16b, v20.16b //GHASH final-2 block - high eor x6, x6, x13 //AES final-1 block - round 14 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif eor v10.16b, v10.16b, v22.16b //GHASH final-2 block - mid eor x7, x7, x14 //AES final-1 block - round 14 high +#ifdef __AARCH64EB__ + rev x7, x7 +#endif L256_dec_blocks_more_than_1: //blocks left > 1 stp x6, x7, [x2], #16 //AES final-1 block - store result @@ -5903,13 +6266,18 @@ L256_dec_blocks_more_than_1: //blocks left > 1 pmull2 v22.1q, v22.2d, v16.2d //GHASH final-1 block - mid eor x6, x6, x13 //AES final block - round 14 low - +#ifdef __AARCH64EB__ + rev x6, x6 +#endif eor v11.16b, v11.16b, v21.16b //GHASH final-1 block - low eor v9.16b, v9.16b, v20.16b //GHASH final-1 block - high eor v10.16b, v10.16b, v22.16b //GHASH final-1 block - mid eor x7, x7, x14 //AES final block - round 14 high +#ifdef __AARCH64EB__ + rev x7, x7 +#endif L256_dec_blocks_less_than_1: //blocks left <= 1 and x1, x1, #127 //bit_length %= 128 @@ -5935,7 +6303,11 @@ L256_dec_blocks_less_than_1: //blocks left <= 1 mov v0.d[1], x10 bic x4, x4, x9 //mask out low existing bytes +#ifndef __AARCH64EB__ rev w9, w12 +#else + mov w9, w12 +#endif bic x5, x5, x10 //mask out high existing bytes diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/cmp.h b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/cmp.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/openssl-fips.gypi index 361cd27a43f687..fa9314b81f3a47 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/openssl-fips.gypi @@ -33,7 +33,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/des_enc.c', diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/openssl.gypi b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/openssl.gypi index 2f0e6a4f84794a..61a8836a9dde3f 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/openssl.gypi @@ -192,7 +192,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/camellia.c', diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/configdata.pm b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/configdata.pm index a0c4ac46bf87dd..2b2d5f67b14150 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/configdata.pm +++ b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/configdata.pm @@ -18,7 +18,7 @@ our %config = ( "ARFLAGS" => [ "qc" ], - "CC" => "gcc", + "CC" => "cc", "CFLAGS" => [ "-O3 -Wall" ], @@ -154,7 +154,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -205,7 +205,7 @@ our %config = ( ], "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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -224,7 +224,7 @@ our %config = ( "AS" => undef, "ASFLAGS" => undef, "BUILDFILE" => undef, - "CC" => "gcc", + "CC" => undef, "CFLAGS" => undef, "CPP" => undef, "CPPDEFINES" => undef, @@ -258,11 +258,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "darwin64-arm64-cc", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1323,6 +1323,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3910,6 +3913,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4018,6 +4024,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6283,6 +6292,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6391,6 +6403,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7732,6 +7747,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8396,7 +8415,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-bn_add.o", "crypto/bn/libfips-lib-bn_asm.o", "crypto/bn/libfips-lib-bn_blind.o", @@ -8424,8 +8442,7 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_shift.o", "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", - "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o" + "crypto/bn/libfips-lib-bn_word.o" ], "products" => { "lib" => [ @@ -12869,6 +12886,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -12977,6 +12997,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15242,6 +15265,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15350,6 +15376,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16845,6 +16874,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -16881,6 +16911,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18784,6 +18815,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19808,6 +19843,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19844,6 +19880,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20109,6 +20146,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -20946,9 +20984,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_x931p.o" => [ "crypto/bn/bn_x931p.c" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-bn_add.o" => [ "crypto/bn/bn_add.c" ], @@ -21033,9 +21068,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_word.o" => [ "crypto/bn/bn_word.c" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/buffer/libcrypto-lib-buf_err.o" => [ "crypto/buffer/buf_err.c" ], @@ -23532,7 +23564,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/buffer/libcrypto-lib-buf_err.o", "crypto/buffer/libcrypto-lib-buffer.o", "crypto/camellia/libcrypto-lib-camellia.o", @@ -25099,7 +25130,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/buffer/libfips-lib-buffer.o", "crypto/cmac/libfips-lib-cmac.o", "crypto/des/libfips-lib-des_enc.o", @@ -26609,6 +26639,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27309,8 +27345,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27337,7 +27373,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27354,8 +27390,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/crypto/buildinf.h index cedcf6c7da798e..4d475f83e339a0 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin64-arm64-cc" -#define DATE "built on: Mon Feb 13 14:06:54 2023 UTC" +#define DATE "built on: Fri Jun 9 12:03:36 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -19,12 +19,12 @@ * literal */ static const char compiler_flags[] = { - 'c','o','m','p','i','l','e','r',':',' ','g','c','c',' ','-','f', - 'P','I','C',' ','-','a','r','c','h',' ','a','r','m','6','4',' ', - '-','O','3',' ','-','W','a','l','l',' ','-','D','L','_','E','N', - 'D','I','A','N',' ','-','D','O','P','E','N','S','S','L','_','P', - 'I','C',' ','-','D','_','R','E','E','N','T','R','A','N','T',' ', - '-','D','O','P','E','N','S','S','L','_','B','U','I','L','D','I', - 'N','G','_','O','P','E','N','S','S','L',' ','-','D','N','D','E', - 'B','U','G','\0' + 'c','o','m','p','i','l','e','r',':',' ','c','c',' ','-','f','P', + 'I','C',' ','-','a','r','c','h',' ','a','r','m','6','4',' ','-', + 'O','3',' ','-','W','a','l','l',' ','-','D','L','_','E','N','D', + 'I','A','N',' ','-','D','O','P','E','N','S','S','L','_','P','I', + 'C',' ','-','D','_','R','E','E','N','T','R','A','N','T',' ','-', + 'D','O','P','E','N','S','S','L','_','B','U','I','L','D','I','N', + 'G','_','O','P','E','N','S','S','L',' ','-','D','N','D','E','B', + 'U','G','\0' }; diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/cmp.h b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/cmp.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/openssl-fips.gypi index 98583b7e8a9e88..60721e3efbc891 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/openssl-fips.gypi @@ -33,7 +33,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/des_enc.c', diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/openssl.gypi b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/openssl.gypi index e7a519c409ff22..835387a25b28e2 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/openssl.gypi @@ -192,7 +192,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/camellia.c', diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/configdata.pm b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/configdata.pm index a81d1c26d81779..5a0805d8dea9b8 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/configdata.pm +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/configdata.pm @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,7 +206,7 @@ our %config = ( ], "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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -258,11 +258,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "darwin64-x86_64-cc", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1322,6 +1322,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3971,6 +3974,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4079,6 +4085,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6344,6 +6353,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6452,6 +6464,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7793,6 +7808,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8466,7 +8485,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-rsaz-avx2.o", "crypto/bn/libcrypto-lib-rsaz-avx512.o", "crypto/bn/libcrypto-lib-rsaz-x86_64.o", @@ -8502,7 +8520,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-rsaz-avx2.o", "crypto/bn/libfips-lib-rsaz-avx512.o", "crypto/bn/libfips-lib-rsaz-x86_64.o", @@ -12988,6 +13005,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -13096,6 +13116,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15361,6 +15384,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15469,6 +15495,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16964,6 +16993,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -17000,6 +17030,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18903,6 +18934,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19927,6 +19962,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19963,6 +19999,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20228,6 +20265,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -21098,9 +21136,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_x931p.o" => [ "crypto/bn/bn_x931p.c" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libcrypto-lib-rsaz-avx2.o" => [ "crypto/bn/rsaz-avx2.s" ], @@ -21206,9 +21241,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_word.o" => [ "crypto/bn/bn_word.c" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-rsaz-avx2.o" => [ "crypto/bn/rsaz-avx2.s" ], @@ -23800,7 +23832,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-rsaz-avx2.o", "crypto/bn/libcrypto-lib-rsaz-avx512.o", "crypto/bn/libcrypto-lib-rsaz-x86_64.o", @@ -25392,7 +25423,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-rsaz-avx2.o", "crypto/bn/libfips-lib-rsaz-avx512.o", "crypto/bn/libfips-lib-rsaz-x86_64.o", @@ -26920,6 +26950,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27617,8 +27653,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27645,7 +27681,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27662,8 +27698,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/buildinf.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/buildinf.h index 4757c767792b33..6fd9893b8e143e 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin64-x86_64-cc" -#define DATE "built on: Mon Feb 13 14:05:20 2023 UTC" +#define DATE "built on: Fri Jun 9 12:00:52 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/cmp.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/cmp.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl-fips.gypi b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl-fips.gypi index 49478f0e42cd45..f7bd0eb9d5f353 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl-fips.gypi @@ -31,7 +31,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/bn/rsaz_exp.c', 'openssl/crypto/bn/rsaz_exp_x2.c', 'openssl/crypto/buffer/buffer.c', diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl.gypi b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl.gypi index 669be153c692c0..14a4210edba15c 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl.gypi +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl.gypi @@ -190,7 +190,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/bn/rsaz_exp.c', 'openssl/crypto/bn/rsaz_exp_x2.c', 'openssl/crypto/buffer/buf_err.c', diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/configdata.pm b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/configdata.pm index 5c82806c2ccd04..be4cf2a3bf2879 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/configdata.pm @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,7 +206,7 @@ our %config = ( ], "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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -258,11 +258,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "darwin64-x86_64-cc", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1322,6 +1322,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3971,6 +3974,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4079,6 +4085,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6344,6 +6353,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6452,6 +6464,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7793,6 +7808,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8466,7 +8485,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-rsaz-avx2.o", "crypto/bn/libcrypto-lib-rsaz-avx512.o", "crypto/bn/libcrypto-lib-rsaz-x86_64.o", @@ -8502,7 +8520,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-rsaz-avx2.o", "crypto/bn/libfips-lib-rsaz-avx512.o", "crypto/bn/libfips-lib-rsaz-x86_64.o", @@ -12988,6 +13005,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -13096,6 +13116,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15361,6 +15384,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15469,6 +15495,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16964,6 +16993,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -17000,6 +17030,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18903,6 +18934,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19927,6 +19962,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19963,6 +19999,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20228,6 +20265,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -21098,9 +21136,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_x931p.o" => [ "crypto/bn/bn_x931p.c" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libcrypto-lib-rsaz-avx2.o" => [ "crypto/bn/rsaz-avx2.s" ], @@ -21206,9 +21241,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_word.o" => [ "crypto/bn/bn_word.c" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-rsaz-avx2.o" => [ "crypto/bn/rsaz-avx2.s" ], @@ -23800,7 +23832,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-rsaz-avx2.o", "crypto/bn/libcrypto-lib-rsaz-avx512.o", "crypto/bn/libcrypto-lib-rsaz-x86_64.o", @@ -25392,7 +25423,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-rsaz-avx2.o", "crypto/bn/libfips-lib-rsaz-avx512.o", "crypto/bn/libfips-lib-rsaz-x86_64.o", @@ -26920,6 +26950,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27617,8 +27653,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27645,7 +27681,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27662,8 +27698,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/buildinf.h index 7d8fc5c08d9771..84dffeb542dd42 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin64-x86_64-cc" -#define DATE "built on: Mon Feb 13 14:05:34 2023 UTC" +#define DATE "built on: Fri Jun 9 12:01:16 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/cmp.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/cmp.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl-fips.gypi index 685b23e06dbac0..b3649b2dbfc9ae 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl-fips.gypi @@ -31,7 +31,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/bn/rsaz_exp.c', 'openssl/crypto/bn/rsaz_exp_x2.c', 'openssl/crypto/buffer/buffer.c', diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl.gypi b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl.gypi index cc7cca6af8b0a5..cb4fc2bf7ab75f 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl.gypi @@ -190,7 +190,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/bn/rsaz_exp.c', 'openssl/crypto/bn/rsaz_exp_x2.c', 'openssl/crypto/buffer/buf_err.c', diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/configdata.pm b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/configdata.pm index 19e81986b4b84f..6f7fd736109dc9 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/configdata.pm +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/configdata.pm @@ -18,7 +18,7 @@ our %config = ( "ARFLAGS" => [ "qc" ], - "CC" => "gcc", + "CC" => "cc", "CFLAGS" => [ "-O3 -Wall" ], @@ -154,7 +154,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -205,7 +205,7 @@ our %config = ( ], "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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -224,7 +224,7 @@ our %config = ( "AS" => undef, "ASFLAGS" => undef, "BUILDFILE" => undef, - "CC" => "gcc", + "CC" => undef, "CFLAGS" => undef, "CPP" => undef, "CPPDEFINES" => undef, @@ -258,11 +258,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "darwin64-x86_64-cc", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1323,6 +1323,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3910,6 +3913,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4018,6 +4024,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6283,6 +6292,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6391,6 +6403,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7732,6 +7747,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8396,7 +8415,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-bn_add.o", "crypto/bn/libfips-lib-bn_asm.o", "crypto/bn/libfips-lib-bn_blind.o", @@ -8424,8 +8442,7 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_shift.o", "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", - "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o" + "crypto/bn/libfips-lib-bn_word.o" ], "products" => { "lib" => [ @@ -12869,6 +12886,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -12977,6 +12997,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15242,6 +15265,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15350,6 +15376,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16845,6 +16874,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -16881,6 +16911,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18784,6 +18815,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19808,6 +19843,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19844,6 +19880,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20109,6 +20146,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -20946,9 +20984,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_x931p.o" => [ "crypto/bn/bn_x931p.c" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-bn_add.o" => [ "crypto/bn/bn_add.c" ], @@ -21033,9 +21068,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_word.o" => [ "crypto/bn/bn_word.c" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/buffer/libcrypto-lib-buf_err.o" => [ "crypto/buffer/buf_err.c" ], @@ -23532,7 +23564,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/buffer/libcrypto-lib-buf_err.o", "crypto/buffer/libcrypto-lib-buffer.o", "crypto/camellia/libcrypto-lib-camellia.o", @@ -25099,7 +25130,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/buffer/libfips-lib-buffer.o", "crypto/cmac/libfips-lib-cmac.o", "crypto/des/libfips-lib-des_enc.o", @@ -26609,6 +26639,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27309,8 +27345,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27337,7 +27373,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27354,8 +27390,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/buildinf.h index 6ce42c501082ef..368c58965bb070 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin64-x86_64-cc" -#define DATE "built on: Mon Feb 13 14:05:48 2023 UTC" +#define DATE "built on: Fri Jun 9 12:01:39 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -19,12 +19,12 @@ * literal */ static const char compiler_flags[] = { - 'c','o','m','p','i','l','e','r',':',' ','g','c','c',' ','-','f', - 'P','I','C',' ','-','a','r','c','h',' ','x','8','6','_','6','4', - ' ','-','O','3',' ','-','W','a','l','l',' ','-','D','L','_','E', - 'N','D','I','A','N',' ','-','D','O','P','E','N','S','S','L','_', - 'P','I','C',' ','-','D','_','R','E','E','N','T','R','A','N','T', - ' ','-','D','O','P','E','N','S','S','L','_','B','U','I','L','D', - 'I','N','G','_','O','P','E','N','S','S','L',' ','-','D','N','D', - 'E','B','U','G','\0' + 'c','o','m','p','i','l','e','r',':',' ','c','c',' ','-','f','P', + 'I','C',' ','-','a','r','c','h',' ','x','8','6','_','6','4',' ', + '-','O','3',' ','-','W','a','l','l',' ','-','D','L','_','E','N', + 'D','I','A','N',' ','-','D','O','P','E','N','S','S','L','_','P', + 'I','C',' ','-','D','_','R','E','E','N','T','R','A','N','T',' ', + '-','D','O','P','E','N','S','S','L','_','B','U','I','L','D','I', + 'N','G','_','O','P','E','N','S','S','L',' ','-','D','N','D','E', + 'B','U','G','\0' }; diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/cmp.h b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/cmp.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/openssl-fips.gypi index a46274a63b2648..58076c5e610ec2 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/openssl-fips.gypi @@ -33,7 +33,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/des_enc.c', diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/openssl.gypi b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/openssl.gypi index d3099c1bdaef06..d2f0708edf95c2 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/openssl.gypi @@ -192,7 +192,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/camellia.c', diff --git a/deps/openssl/config/archs/linux-aarch64/asm/configdata.pm b/deps/openssl/config/archs/linux-aarch64/asm/configdata.pm index eac50634c43613..029caf8c119fcf 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/configdata.pm +++ b/deps/openssl/config/archs/linux-aarch64/asm/configdata.pm @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux-aarch64", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1329,6 +1329,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3948,6 +3951,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4056,6 +4062,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6321,6 +6330,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6429,6 +6441,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7778,6 +7793,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8449,7 +8468,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-armv8-mont.o", "crypto/bn/libfips-lib-bn_add.o", "crypto/bn/libfips-lib-bn_asm.o", @@ -8478,8 +8496,7 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_shift.o", "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", - "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o" + "crypto/bn/libfips-lib-bn_word.o" ], "products" => { "lib" => [ @@ -12939,6 +12956,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -13047,6 +13067,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15312,6 +15335,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15420,6 +15446,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16932,6 +16961,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -16968,6 +16998,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18939,6 +18970,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19963,6 +19998,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19999,6 +20035,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20264,6 +20301,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -21116,9 +21154,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_x931p.o" => [ "crypto/bn/bn_x931p.c" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-armv8-mont.o" => [ "crypto/bn/armv8-mont.S" ], @@ -21206,9 +21241,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_word.o" => [ "crypto/bn/bn_word.c" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/buffer/libcrypto-lib-buf_err.o" => [ "crypto/buffer/buf_err.c" ], @@ -23759,7 +23791,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/buffer/libcrypto-lib-buf_err.o", "crypto/buffer/libcrypto-lib-buffer.o", "crypto/camellia/libcrypto-lib-camellia.o", @@ -25340,7 +25371,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/buffer/libfips-lib-buffer.o", "crypto/cmac/libfips-lib-cmac.o", "crypto/des/libfips-lib-des_enc.o", @@ -26858,6 +26888,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27556,8 +27592,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27584,7 +27620,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27601,8 +27637,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-aarch64/asm/crypto/aes/aesv8-armx.S b/deps/openssl/config/archs/linux-aarch64/asm/crypto/aes/aesv8-armx.S index cd9cac97ca6308..51c4d7208da2ba 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/crypto/aes/aesv8-armx.S +++ b/deps/openssl/config/archs/linux-aarch64/asm/crypto/aes/aesv8-armx.S @@ -1859,10 +1859,10 @@ aes_v8_xts_encrypt: b.ne .Lxts_enc_big_size // Encrypt the iv with key2, as the first XEX iv. ldr w6,[x4,#240] - ld1 {v0.16b},[x4],#16 + ld1 {v0.4s},[x4],#16 ld1 {v6.16b},[x5] sub w6,w6,#2 - ld1 {v1.16b},[x4],#16 + ld1 {v1.4s},[x4],#16 .Loop_enc_iv_enc: aese v6.16b,v0.16b @@ -2462,9 +2462,9 @@ aes_v8_xts_encrypt: // Encrypt the composite block to get the last second encrypted text block ldr w6,[x3,#240] // load key schedule... - ld1 {v0.16b},[x3],#16 + ld1 {v0.4s},[x3],#16 sub w6,w6,#2 - ld1 {v1.16b},[x3],#16 // load key schedule... + ld1 {v1.4s},[x3],#16 // load key schedule... .Loop_final_enc: aese v26.16b,v0.16b aesmc v26.16b,v26.16b @@ -2500,10 +2500,10 @@ aes_v8_xts_decrypt: b.ne .Lxts_dec_big_size // Encrypt the iv with key2, as the first XEX iv. ldr w6,[x4,#240] - ld1 {v0.16b},[x4],#16 + ld1 {v0.4s},[x4],#16 ld1 {v6.16b},[x5] sub w6,w6,#2 - ld1 {v1.16b},[x4],#16 + ld1 {v1.4s},[x4],#16 .Loop_dec_small_iv_enc: aese v6.16b,v0.16b @@ -2581,10 +2581,10 @@ aes_v8_xts_decrypt: // Encrypt the iv with key2, as the first XEX iv ldr w6,[x4,#240] - ld1 {v0.16b},[x4],#16 + ld1 {v0.4s},[x4],#16 ld1 {v6.16b},[x5] sub w6,w6,#2 - ld1 {v1.16b},[x4],#16 + ld1 {v1.4s},[x4],#16 .Loop_dec_iv_enc: aese v6.16b,v0.16b @@ -2914,7 +2914,7 @@ aes_v8_xts_decrypt: .align 4 .Lxts_dec_tail4x: add x0,x0,#16 - ld1 {v0.4s},[x0],#16 + tst x21,#0xf eor v5.16b,v1.16b,v4.16b st1 {v5.16b},[x1],#16 eor v17.16b,v24.16b,v17.16b @@ -2923,6 +2923,8 @@ aes_v8_xts_decrypt: eor v31.16b,v26.16b,v31.16b st1 {v30.16b,v31.16b},[x1],#32 + b.eq .Lxts_dec_abort + ld1 {v0.16b},[x0],#16 b .Lxts_done .align 4 .Lxts_outer_dec_tail: @@ -3100,7 +3102,7 @@ aes_v8_xts_decrypt: // Processing the last two blocks with cipher stealing. mov x7,x3 cbnz x2,.Lxts_dec_1st_done - ld1 {v0.4s},[x0],#16 + ld1 {v0.16b},[x0],#16 // Decrypt the last secod block to get the last plain text block .Lxts_dec_1st_done: @@ -3145,9 +3147,9 @@ aes_v8_xts_decrypt: // Decrypt the composite block to get the last second plain text block ldr w6,[x7,#240] - ld1 {v0.16b},[x7],#16 + ld1 {v0.4s},[x7],#16 sub w6,w6,#2 - ld1 {v1.16b},[x7],#16 + ld1 {v1.4s},[x7],#16 .Loop_final_dec: aesd v26.16b,v0.16b aesimc v26.16b,v26.16b diff --git a/deps/openssl/config/archs/linux-aarch64/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-aarch64/asm/crypto/buildinf.h index 3c55d89ac05717..8b8d370ee5f7f1 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-aarch64/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-aarch64" -#define DATE "built on: Mon Feb 13 14:07:04 2023 UTC" +#define DATE "built on: Fri Jun 9 12:03:54 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-aarch64/asm/crypto/modes/aes-gcm-armv8_64.S b/deps/openssl/config/archs/linux-aarch64/asm/crypto/modes/aes-gcm-armv8_64.S index 3caabfa593583c..d052cbb85cdbbf 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/crypto/modes/aes-gcm-armv8_64.S +++ b/deps/openssl/config/archs/linux-aarch64/asm/crypto/modes/aes-gcm-armv8_64.S @@ -19,28 +19,36 @@ aes_gcm_enc_128_kernel: stp d14, d15, [sp, #96] ldp x10, x11, [x16] //ctr96_b64, ctr96_t32 +#ifdef __AARCH64EB__ + rev x10, x10 + rev x11, x11 +#endif ldp x13, x14, [x8, #160] //load rk10 - +#ifdef __AARCH64EB__ + ror x13, x13, #32 + ror x14, x14, #32 +#endif ld1 {v11.16b}, [x3] ext v11.16b, v11.16b, v11.16b, #8 rev64 v11.16b, v11.16b lsr x5, x1, #3 //byte_len mov x15, x5 - ldr q27, [x8, #144] //load rk9 + ld1 {v18.4s}, [x8], #16 //load rk0 add x4, x0, x1, lsr #3 //end_input_ptr sub x5, x5, #1 //byte_len - 1 lsr x12, x11, #32 ldr q15, [x3, #112] //load h4l | h4h +#ifndef __AARCH64EB__ ext v15.16b, v15.16b, v15.16b, #8 - +#endif fmov d1, x10 //CTR block 1 rev w12, w12 //rev_ctr32 add w12, w12, #1 //increment rev_ctr32 orr w11, w11, w11 - ldr q18, [x8, #0] //load rk0 + ld1 {v19.4s}, [x8], #16 //load rk1 rev w9, w12 //CTR block 1 add w12, w12, #1 //CTR block 1 @@ -60,30 +68,33 @@ aes_gcm_enc_128_kernel: rev w9, w12 //CTR block 3 orr x9, x11, x9, lsl #32 //CTR block 3 - ldr q19, [x8, #16] //load rk1 + ld1 {v20.4s}, [x8], #16 //load rk2 add w12, w12, #1 //CTR block 3 fmov v3.d[1], x9 //CTR block 3 ldr q14, [x3, #80] //load h3l | h3h +#ifndef __AARCH64EB__ ext v14.16b, v14.16b, v14.16b, #8 - +#endif aese v1.16b, v18.16b aesmc v1.16b, v1.16b //AES block 1 - round 0 - ldr q20, [x8, #32] //load rk2 + ld1 {v21.4s}, [x8], #16 //load rk3 aese v2.16b, v18.16b aesmc v2.16b, v2.16b //AES block 2 - round 0 ldr q12, [x3, #32] //load h1l | h1h +#ifndef __AARCH64EB__ ext v12.16b, v12.16b, v12.16b, #8 +#endif aese v0.16b, v18.16b aesmc v0.16b, v0.16b //AES block 0 - round 0 - ldr q26, [x8, #128] //load rk8 + ld1 {v22.4s}, [x8], #16 //load rk4 aese v3.16b, v18.16b aesmc v3.16b, v3.16b //AES block 3 - round 0 - ldr q21, [x8, #48] //load rk3 + ld1 {v23.4s}, [x8], #16 //load rk5 aese v2.16b, v19.16b aesmc v2.16b, v2.16b //AES block 2 - round 1 @@ -91,11 +102,11 @@ aes_gcm_enc_128_kernel: aese v0.16b, v19.16b aesmc v0.16b, v0.16b //AES block 0 - round 1 - ldr q24, [x8, #96] //load rk6 + ld1 {v24.4s}, [x8], #16 //load rk6 aese v1.16b, v19.16b aesmc v1.16b, v1.16b //AES block 1 - round 1 - ldr q25, [x8, #112] //load rk7 + ld1 {v25.4s}, [x8], #16 //load rk7 aese v3.16b, v19.16b aesmc v3.16b, v3.16b //AES block 3 - round 1 @@ -103,12 +114,14 @@ aes_gcm_enc_128_kernel: aese v0.16b, v20.16b aesmc v0.16b, v0.16b //AES block 0 - round 2 - ldr q23, [x8, #80] //load rk5 + ld1 {v26.4s}, [x8], #16 //load rk8 aese v1.16b, v20.16b aesmc v1.16b, v1.16b //AES block 1 - round 2 ldr q13, [x3, #64] //load h2l | h2h +#ifndef __AARCH64EB__ ext v13.16b, v13.16b, v13.16b, #8 +#endif aese v3.16b, v20.16b aesmc v3.16b, v3.16b //AES block 3 - round 2 @@ -125,7 +138,7 @@ aes_gcm_enc_128_kernel: aese v2.16b, v21.16b aesmc v2.16b, v2.16b //AES block 2 - round 3 - ldr q22, [x8, #64] //load rk4 + ld1 {v27.4s}, [x8], #16 //load rk9 aese v3.16b, v21.16b aesmc v3.16b, v3.16b //AES block 3 - round 3 @@ -208,13 +221,25 @@ aes_gcm_enc_128_kernel: b.ge .L128_enc_tail //handle tail ldp x6, x7, [x0, #0] //AES block 0 - load plaintext - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif ldp x21, x22, [x0, #32] //AES block 2 - load plaintext - +#ifdef __AARCH64EB__ + rev x21, x21 + rev x22, x22 +#endif ldp x19, x20, [x0, #16] //AES block 1 - load plaintext - +#ifdef __AARCH64EB__ + rev x19, x19 + rev x20, x20 +#endif ldp x23, x24, [x0, #48] //AES block 3 - load plaintext - +#ifdef __AARCH64EB__ + rev x23, x23 + rev x24, x24 +#endif eor x6, x6, x13 //AES block 0 - round 10 low eor x7, x7, x14 //AES block 0 - round 10 high @@ -279,6 +304,10 @@ aes_gcm_enc_128_kernel: .L128_enc_main_loop: //main loop start ldp x23, x24, [x0, #48] //AES block 4k+3 - load plaintext +#ifdef __AARCH64EB__ + rev x23, x23 + rev x24, x24 +#endif rev64 v4.16b, v4.16b //GHASH block 4k (only t0 is free) rev64 v6.16b, v6.16b //GHASH block 4k+2 (t0, t1, and t2 free) @@ -313,7 +342,10 @@ aes_gcm_enc_128_kernel: pmull2 v28.1q, v5.2d, v14.2d //GHASH block 4k+1 - high eor v31.8b, v31.8b, v6.8b //GHASH block 4k+2 - mid ldp x6, x7, [x0, #0] //AES block 4k+4 - load plaintext - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif aese v0.16b, v19.16b aesmc v0.16b, v0.16b //AES block 4k+4 - round 1 rev w9, w12 //CTR block 4k+8 @@ -395,7 +427,10 @@ aes_gcm_enc_128_kernel: aese v1.16b, v23.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 5 ldp x19, x20, [x0, #16] //AES block 4k+5 - load plaintext - +#ifdef __AARCH64EB__ + rev x19, x19 + rev x20, x20 +#endif aese v3.16b, v21.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 3 eor v10.16b, v10.16b, v31.16b //GHASH block 4k+2 - mid @@ -403,7 +438,10 @@ aes_gcm_enc_128_kernel: aese v0.16b, v23.16b aesmc v0.16b, v0.16b //AES block 4k+4 - round 5 ldp x21, x22, [x0, #32] //AES block 4k+6 - load plaintext - +#ifdef __AARCH64EB__ + rev x21, x21 + rev x22, x22 +#endif pmull v31.1q, v9.1d, v8.1d //MODULO - top 64b align with mid eor v11.16b, v11.16b, v29.16b //GHASH block 4k+3 - low @@ -712,7 +750,10 @@ aes_gcm_enc_128_kernel: sub x5, x4, x0 //main_end_input_ptr is number of bytes left to process ldp x6, x7, [x0], #16 //AES block 4k+4 - load plaintext - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif cmp x5, #48 ext v8.16b, v11.16b, v11.16b, #8 //prepare final partial tag @@ -750,7 +791,10 @@ aes_gcm_enc_128_kernel: st1 { v5.16b}, [x2], #16 //AES final-3 block - store result ldp x6, x7, [x0], #16 //AES final-2 block - load input low & high - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif rev64 v4.16b, v5.16b //GHASH final-3 block eor v4.16b, v4.16b, v8.16b //feed in partial tag @@ -779,7 +823,10 @@ aes_gcm_enc_128_kernel: rev64 v4.16b, v5.16b //GHASH final-2 block ldp x6, x7, [x0], #16 //AES final-1 block - load input low & high - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif eor v4.16b, v4.16b, v8.16b //feed in partial tag eor x6, x6, x13 //AES final-1 block - round 10 low @@ -813,7 +860,10 @@ aes_gcm_enc_128_kernel: rev64 v4.16b, v5.16b //GHASH final-1 block ldp x6, x7, [x0], #16 //AES final block - load input low & high - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif eor v4.16b, v4.16b, v8.16b //feed in partial tag eor x7, x7, x14 //AES final block - round 10 high @@ -876,9 +926,11 @@ aes_gcm_enc_128_kernel: ld1 { v18.16b}, [x2] //load existing bytes where the possibly partial last block is to be stored eor v8.8b, v8.8b, v4.8b //GHASH final block - mid - +#ifndef __AARCH64EB__ rev w9, w12 - +#else + mov w9, w12 +#endif pmull2 v20.1q, v4.2d, v12.2d //GHASH final block - high pmull v8.1q, v8.1d, v16.1d //GHASH final block - mid @@ -951,20 +1003,29 @@ aes_gcm_dec_128_kernel: lsr x5, x1, #3 //byte_len mov x15, x5 ldp x10, x11, [x16] //ctr96_b64, ctr96_t32 - +#ifdef __AARCH64EB__ + rev x10, x10 + rev x11, x11 +#endif + ldp x13, x14, [x8, #160] //load rk10 +#ifdef __AARCH64EB__ + ror x14, x14, 32 + ror x13, x13, 32 +#endif sub x5, x5, #1 //byte_len - 1 - ldr q18, [x8, #0] //load rk0 + ld1 {v18.4s}, [x8], #16 //load rk0 and x5, x5, #0xffffffffffffffc0 //number of bytes to be processed in main loop (at least 1 byte must be handled by tail) ld1 { v0.16b}, [x16] //special case vector load initial counter so we can start first AES block as quickly as possible ldr q13, [x3, #64] //load h2l | h2h +#ifndef __AARCH64EB__ ext v13.16b, v13.16b, v13.16b, #8 - +#endif lsr x12, x11, #32 fmov d2, x10 //CTR block 2 - ldr q19, [x8, #16] //load rk1 + ld1 {v19.4s}, [x8], #16 //load rk1 orr w11, w11, w11 rev w12, w12 //rev_ctr32 @@ -976,7 +1037,7 @@ aes_gcm_dec_128_kernel: rev w9, w12 //CTR block 1 orr x9, x11, x9, lsl #32 //CTR block 1 - ldr q20, [x8, #32] //load rk2 + ld1 {v20.4s}, [x8], #16 //load rk2 add w12, w12, #1 //CTR block 1 fmov v1.d[1], x9 //CTR block 1 @@ -999,19 +1060,19 @@ aes_gcm_dec_128_kernel: aese v1.16b, v18.16b aesmc v1.16b, v1.16b //AES block 1 - round 0 - ldr q21, [x8, #48] //load rk3 + ld1 {v21.4s}, [x8], #16 //load rk3 aese v0.16b, v20.16b aesmc v0.16b, v0.16b //AES block 0 - round 2 - ldr q24, [x8, #96] //load rk6 + ld1 {v22.4s}, [x8], #16 //load rk4 aese v2.16b, v18.16b aesmc v2.16b, v2.16b //AES block 2 - round 0 - ldr q25, [x8, #112] //load rk7 + ld1 {v23.4s}, [x8], #16 //load rk5 aese v1.16b, v19.16b aesmc v1.16b, v1.16b //AES block 1 - round 1 - ldr q22, [x8, #64] //load rk4 + ld1 {v24.4s}, [x8], #16 //load rk6 aese v3.16b, v18.16b aesmc v3.16b, v3.16b //AES block 3 - round 0 @@ -1021,7 +1082,6 @@ aes_gcm_dec_128_kernel: aese v1.16b, v20.16b aesmc v1.16b, v1.16b //AES block 1 - round 2 - ldp x13, x14, [x8, #160] //load rk10 aese v3.16b, v19.16b aesmc v3.16b, v3.16b //AES block 3 - round 1 @@ -1031,7 +1091,7 @@ aes_gcm_dec_128_kernel: aese v0.16b, v21.16b aesmc v0.16b, v0.16b //AES block 0 - round 3 - ldr q23, [x8, #80] //load rk5 + ld1 {v25.4s}, [x8], #16 //load rk7 aese v1.16b, v21.16b aesmc v1.16b, v1.16b //AES block 1 - round 3 @@ -1041,7 +1101,7 @@ aes_gcm_dec_128_kernel: aese v2.16b, v20.16b aesmc v2.16b, v2.16b //AES block 2 - round 2 - ldr q27, [x8, #144] //load rk9 + ld1 {v26.4s}, [x8], #16 //load rk8 aese v1.16b, v22.16b aesmc v1.16b, v1.16b //AES block 1 - round 4 @@ -1052,11 +1112,12 @@ aes_gcm_dec_128_kernel: aese v2.16b, v21.16b aesmc v2.16b, v2.16b //AES block 2 - round 3 ldr q14, [x3, #80] //load h3l | h3h +#ifndef __AARCH64EB__ ext v14.16b, v14.16b, v14.16b, #8 - +#endif aese v0.16b, v22.16b aesmc v0.16b, v0.16b //AES block 0 - round 4 - ldr q26, [x8, #128] //load rk8 + ld1 {v27.4s}, [x8], #16 //load rk9 aese v1.16b, v23.16b aesmc v1.16b, v1.16b //AES block 1 - round 5 @@ -1073,8 +1134,9 @@ aes_gcm_dec_128_kernel: aese v2.16b, v23.16b aesmc v2.16b, v2.16b //AES block 2 - round 5 ldr q12, [x3, #32] //load h1l | h1h +#ifndef __AARCH64EB__ ext v12.16b, v12.16b, v12.16b, #8 - +#endif aese v3.16b, v23.16b aesmc v3.16b, v3.16b //AES block 3 - round 5 @@ -1092,7 +1154,9 @@ aes_gcm_dec_128_kernel: trn1 v8.2d, v12.2d, v13.2d //h2h | h1h ldr q15, [x3, #112] //load h4l | h4h +#ifndef __AARCH64EB__ ext v15.16b, v15.16b, v15.16b, #8 +#endif trn2 v16.2d, v12.2d, v13.2d //h2l | h1l add x5, x5, x0 @@ -1134,12 +1198,10 @@ aes_gcm_dec_128_kernel: eor v17.16b, v17.16b, v9.16b //h4k | h3k b.ge .L128_dec_tail //handle tail - ldr q5, [x0, #16] //AES block 1 - load ciphertext - - ldr q4, [x0, #0] //AES block 0 - load ciphertext + ld1 {v4.16b, v5.16b}, [x0], #32 //AES block 0 - load ciphertext; AES block 1 - load ciphertext eor v1.16b, v5.16b, v1.16b //AES block 1 - result - ldr q6, [x0, #32] //AES block 2 - load ciphertext + ld1 {v6.16b}, [x0], #16 //AES block 2 - load ciphertext eor v0.16b, v4.16b, v0.16b //AES block 0 - result rev64 v4.16b, v4.16b //GHASH block 0 @@ -1147,10 +1209,9 @@ aes_gcm_dec_128_kernel: orr x9, x11, x9, lsl #32 //CTR block 4 add w12, w12, #1 //CTR block 4 - ldr q7, [x0, #48] //AES block 3 - load ciphertext + ld1 {v7.16b}, [x0], #16 //AES block 3 - load ciphertext rev64 v5.16b, v5.16b //GHASH block 1 - add x0, x0, #64 //AES input_ptr update mov x19, v1.d[0] //AES block 1 - mov low mov x20, v1.d[1] //AES block 1 - mov high @@ -1165,7 +1226,9 @@ aes_gcm_dec_128_kernel: fmov v0.d[1], x9 //CTR block 4 rev w9, w12 //CTR block 5 eor x19, x19, x13 //AES block 1 - round 10 low - +#ifdef __AARCH64EB__ + rev x19, x19 +#endif fmov d1, x10 //CTR block 5 add w12, w12, #1 //CTR block 5 orr x9, x11, x9, lsl #32 //CTR block 5 @@ -1177,10 +1240,19 @@ aes_gcm_dec_128_kernel: orr x9, x11, x9, lsl #32 //CTR block 6 eor x20, x20, x14 //AES block 1 - round 10 high +#ifdef __AARCH64EB__ + rev x20, x20 +#endif eor x6, x6, x13 //AES block 0 - round 10 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif eor v2.16b, v6.16b, v2.16b //AES block 2 - result eor x7, x7, x14 //AES block 0 - round 10 high +#ifdef __AARCH64EB__ + rev x7, x7 +#endif stp x6, x7, [x2], #16 //AES block 0 - store result stp x19, x20, [x2], #16 //AES block 1 - store result @@ -1248,9 +1320,14 @@ aes_gcm_dec_128_kernel: aese v3.16b, v19.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 1 eor x23, x23, x13 //AES block 4k+3 - round 10 low - +#ifdef __AARCH64EB__ + rev x23, x23 +#endif pmull v30.1q, v30.1d, v17.1d //GHASH block 4k+1 - mid eor x22, x22, x14 //AES block 4k+2 - round 10 high +#ifdef __AARCH64EB__ + rev x22, x22 +#endif mov d31, v6.d[1] //GHASH block 4k+2 - mid aese v0.16b, v19.16b @@ -1288,7 +1365,9 @@ aes_gcm_dec_128_kernel: pmull2 v31.1q, v31.2d, v16.2d //GHASH block 4k+2 - mid eor x24, x24, x14 //AES block 4k+3 - round 10 high - +#ifdef __AARCH64EB__ + rev x24, x24 +#endif aese v2.16b, v20.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 2 eor v30.8b, v30.8b, v7.8b //GHASH block 4k+3 - mid @@ -1296,7 +1375,9 @@ aes_gcm_dec_128_kernel: aese v1.16b, v23.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 5 eor x21, x21, x13 //AES block 4k+2 - round 10 low - +#ifdef __AARCH64EB__ + rev x21, x21 +#endif aese v0.16b, v23.16b aesmc v0.16b, v0.16b //AES block 4k+4 - round 5 movi v8.8b, #0xc2 @@ -1318,7 +1399,7 @@ aes_gcm_dec_128_kernel: pmull v30.1q, v30.1d, v16.1d //GHASH block 4k+3 - mid eor v9.16b, v9.16b, v4.16b //GHASH block 4k+3 - high - ldr q4, [x0, #0] //AES block 4k+4 - load ciphertext + ld1 {v4.16b}, [x0], #16 //AES block 4k+3 - load ciphertext aese v1.16b, v25.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 7 @@ -1345,7 +1426,7 @@ aes_gcm_dec_128_kernel: rev w9, w12 //CTR block 4k+8 pmull v31.1q, v9.1d, v8.1d //MODULO - top 64b align with mid - ldr q5, [x0, #16] //AES block 4k+5 - load ciphertext + ld1 {v5.16b}, [x0], #16 //AES block 4k+4 - load ciphertext ext v9.16b, v9.16b, v9.16b, #8 //MODULO - other top alignment aese v0.16b, v27.16b //AES block 4k+4 - round 9 @@ -1363,7 +1444,7 @@ aes_gcm_dec_128_kernel: aese v3.16b, v23.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 5 - ldr q6, [x0, #32] //AES block 4k+6 - load ciphertext + ld1 {v6.16b}, [x0], #16 //AES block 4k+5 - load ciphertext add w12, w12, #1 //CTR block 4k+8 eor v10.16b, v10.16b, v31.16b //MODULO - fold into mid @@ -1371,11 +1452,10 @@ aes_gcm_dec_128_kernel: aese v2.16b, v25.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 7 - ldr q7, [x0, #48] //AES block 4k+3 - load ciphertext + ld1 {v7.16b}, [x0], #16 //AES block 4k+6 - load ciphertext aese v3.16b, v24.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 6 - add x0, x0, #64 //AES input_ptr update rev64 v5.16b, v5.16b //GHASH block 4k+5 eor v10.16b, v10.16b, v9.16b //MODULO - fold into mid @@ -1400,11 +1480,15 @@ aes_gcm_dec_128_kernel: aese v3.16b, v26.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 8 eor x7, x7, x14 //AES block 4k+4 - round 10 high - +#ifdef __AARCH64EB__ + rev x7, x7 +#endif eor v11.16b, v11.16b, v8.16b //MODULO - fold into low mov x20, v1.d[1] //AES block 4k+5 - mov high eor x6, x6, x13 //AES block 4k+4 - round 10 low - +#ifdef __AARCH64EB__ + rev x6, x6 +#endif eor v2.16b, v6.16b, v2.16b //AES block 4k+6 - result mov x19, v1.d[0] //AES block 4k+5 - mov low add w12, w12, #1 //CTR block 4k+9 @@ -1421,9 +1505,15 @@ aes_gcm_dec_128_kernel: add w12, w12, #1 //CTR block 4k+10 eor x20, x20, x14 //AES block 4k+5 - round 10 high +#ifdef __AARCH64EB__ + rev x20, x20 +#endif stp x6, x7, [x2], #16 //AES block 4k+4 - store result eor x19, x19, x13 //AES block 4k+5 - round 10 low +#ifdef __AARCH64EB__ + rev x19, x19 +#endif stp x19, x20, [x2], #16 //AES block 4k+5 - store result orr x9, x11, x9, lsl #32 //CTR block 4k+10 @@ -1528,9 +1618,14 @@ aes_gcm_dec_128_kernel: aese v3.16b, v20.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 2 eor x23, x23, x13 //AES block 4k+3 - round 10 low - +#ifdef __AARCH64EB__ + rev x23, x23 +#endif pmull v30.1q, v30.1d, v16.1d //GHASH block 4k+3 - mid eor x21, x21, x13 //AES block 4k+2 - round 10 low +#ifdef __AARCH64EB__ + rev x21, x21 +#endif eor v11.16b, v11.16b, v29.16b //GHASH block 4k+3 - low aese v2.16b, v21.16b @@ -1603,7 +1698,9 @@ aes_gcm_dec_128_kernel: pmull v8.1q, v10.1d, v8.1d //MODULO - mid 64b align with low eor x24, x24, x14 //AES block 4k+3 - round 10 high - +#ifdef __AARCH64EB__ + rev x24, x24 +#endif aese v2.16b, v25.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 7 ext v10.16b, v10.16b, v10.16b, #8 //MODULO - other mid alignment @@ -1621,7 +1718,9 @@ aes_gcm_dec_128_kernel: aese v3.16b, v26.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 8 eor x22, x22, x14 //AES block 4k+2 - round 10 high - +#ifdef __AARCH64EB__ + rev x22, x22 +#endif aese v0.16b, v27.16b //AES block 4k+4 - round 9 stp x21, x22, [x2], #16 //AES block 4k+2 - store result @@ -1645,9 +1744,14 @@ aes_gcm_dec_128_kernel: cmp x5, #48 eor x7, x7, x14 //AES block 4k+4 - round 10 high - +#ifdef __AARCH64EB__ + rev x7, x7 +#endif ext v8.16b, v11.16b, v11.16b, #8 //prepare final partial tag eor x6, x6, x13 //AES block 4k+4 - round 10 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif b.gt .L128_dec_blocks_more_than_3 mov v3.16b, v2.16b @@ -1691,9 +1795,14 @@ aes_gcm_dec_128_kernel: movi v8.8b, #0 //suppress further partial tag feed in eor x7, x7, x14 //AES final-2 block - round 10 high - +#ifdef __AARCH64EB__ + rev x7, x7 +#endif pmull v10.1q, v22.1d, v10.1d //GHASH final-3 block - mid eor x6, x6, x13 //AES final-2 block - round 10 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif .L128_dec_blocks_more_than_2: //blocks left > 2 rev64 v4.16b, v5.16b //GHASH final-2 block @@ -1719,12 +1828,18 @@ aes_gcm_dec_128_kernel: pmull v22.1q, v22.1d, v17.1d //GHASH final-2 block - mid eor x6, x6, x13 //AES final-1 block - round 10 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif eor v11.16b, v11.16b, v21.16b //GHASH final-2 block - low eor v9.16b, v9.16b, v20.16b //GHASH final-2 block - high eor v10.16b, v10.16b, v22.16b //GHASH final-2 block - mid eor x7, x7, x14 //AES final-1 block - round 10 high +#ifdef __AARCH64EB__ + rev x7, x7 +#endif .L128_dec_blocks_more_than_1: //blocks left > 1 rev64 v4.16b, v5.16b //GHASH final-1 block @@ -1755,8 +1870,13 @@ aes_gcm_dec_128_kernel: eor v9.16b, v9.16b, v20.16b //GHASH final-1 block - high eor x7, x7, x14 //AES final block - round 10 high - +#ifdef __AARCH64EB__ + rev x7, x7 +#endif eor x6, x6, x13 //AES final block - round 10 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif eor v10.16b, v10.16b, v22.16b //GHASH final-1 block - mid .L128_dec_blocks_less_than_1: //blocks left <= 1 @@ -1802,7 +1922,11 @@ aes_gcm_dec_128_kernel: bic x4, x4, x9 //mask out low existing bytes and x6, x6, x9 +#ifndef __AARCH64EB__ rev w9, w12 +#else + mov w9, w12 +#endif eor v10.16b, v10.16b, v8.16b //GHASH final block - mid movi v8.8b, #0xc2 @@ -1869,18 +1993,26 @@ aes_gcm_enc_192_kernel: stp d14, d15, [sp, #96] ldp x10, x11, [x16] //ctr96_b64, ctr96_t32 +#ifdef __AARCH64EB__ + rev x10, x10 + rev x11, x11 +#endif + ldp x13, x14, [x8, #192] //load rk12 +#ifdef __AARCH64EB__ + ror x13, x13, #32 + ror x14, x14, #32 +#endif + ld1 {v18.4s}, [x8], #16 //load rk0 - ldr q23, [x8, #80] //load rk5 - - ldr q22, [x8, #64] //load rk4 + ld1 {v19.4s}, [x8], #16 //load rk1 - ldr q26, [x8, #128] //load rk8 + ld1 {v20.4s}, [x8], #16 //load rk2 lsr x12, x11, #32 - ldr q24, [x8, #96] //load rk6 + ld1 {v21.4s}, [x8], #16 //load rk3 orr w11, w11, w11 - ldr q25, [x8, #112] //load rk7 + ld1 {v22.4s}, [x8], #16 //load rk4 rev w12, w12 //rev_ctr32 add w12, w12, #1 //increment rev_ctr32 @@ -1904,15 +2036,13 @@ aes_gcm_enc_192_kernel: rev w9, w12 //CTR block 3 orr x9, x11, x9, lsl #32 //CTR block 3 - ldr q18, [x8, #0] //load rk0 + ld1 {v23.4s}, [x8], #16 //load rk5 fmov v3.d[1], x9 //CTR block 3 - ldr q21, [x8, #48] //load rk3 + ld1 {v24.4s}, [x8], #16 //load rk6 - ldp x13, x14, [x8, #192] //load rk12 - - ldr q19, [x8, #16] //load rk1 + ld1 {v25.4s}, [x8], #16 //load rk7 aese v0.16b, v18.16b aesmc v0.16b, v0.16b //AES block 0 - round 0 @@ -1922,35 +2052,38 @@ aes_gcm_enc_192_kernel: aese v3.16b, v18.16b aesmc v3.16b, v3.16b //AES block 3 - round 0 - ldr q29, [x8, #176] //load rk11 + ld1 {v26.4s}, [x8], #16 //load rk8 aese v1.16b, v18.16b aesmc v1.16b, v1.16b //AES block 1 - round 0 ldr q15, [x3, #112] //load h4l | h4h +#ifndef __AARCH64EB__ ext v15.16b, v15.16b, v15.16b, #8 - +#endif aese v2.16b, v18.16b aesmc v2.16b, v2.16b //AES block 2 - round 0 - ldr q20, [x8, #32] //load rk2 + ld1 {v27.4s}, [x8], #16 //load rk9 aese v0.16b, v19.16b aesmc v0.16b, v0.16b //AES block 0 - round 1 - ldr q28, [x8, #160] //load rk10 + ld1 {v28.4s}, [x8], #16 //load rk10 aese v1.16b, v19.16b aesmc v1.16b, v1.16b //AES block 1 - round 1 ldr q12, [x3, #32] //load h1l | h1h +#ifndef __AARCH64EB__ ext v12.16b, v12.16b, v12.16b, #8 - +#endif aese v2.16b, v19.16b aesmc v2.16b, v2.16b //AES block 2 - round 1 - ldr q27, [x8, #144] //load rk9 + ld1 {v29.4s}, [x8], #16 //load rk11 aese v3.16b, v19.16b aesmc v3.16b, v3.16b //AES block 3 - round 1 ldr q14, [x3, #80] //load h3l | h3h +#ifndef __AARCH64EB__ ext v14.16b, v14.16b, v14.16b, #8 - +#endif aese v0.16b, v20.16b aesmc v0.16b, v0.16b //AES block 0 - round 2 @@ -2007,8 +2140,9 @@ aes_gcm_enc_192_kernel: aese v2.16b, v24.16b aesmc v2.16b, v2.16b //AES block 2 - round 6 ldr q13, [x3, #64] //load h2l | h2h +#ifndef __AARCH64EB__ ext v13.16b, v13.16b, v13.16b, #8 - +#endif aese v1.16b, v24.16b aesmc v1.16b, v1.16b //AES block 1 - round 6 @@ -2088,13 +2222,26 @@ aes_gcm_enc_192_kernel: rev w9, w12 //CTR block 4 ldp x6, x7, [x0, #0] //AES block 0 - load plaintext - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif orr x9, x11, x9, lsl #32 //CTR block 4 ldp x21, x22, [x0, #32] //AES block 2 - load plaintext - +#ifdef __AARCH64EB__ + rev x21, x21 + rev x22, x22 +#endif ldp x23, x24, [x0, #48] //AES block 3 - load plaintext - +#ifdef __AARCH64EB__ + rev x23, x23 + rev x24, x24 +#endif ldp x19, x20, [x0, #16] //AES block 1 - load plaintext +#ifdef __AARCH64EB__ + rev x19, x19 + rev x20, x20 +#endif add x0, x0, #64 //AES input_ptr update cmp x0, x5 //check if we have <= 8 blocks @@ -2166,7 +2313,10 @@ aes_gcm_enc_192_kernel: aese v1.16b, v18.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 0 ldp x19, x20, [x0, #16] //AES block 4k+5 - load plaintext - +#ifdef __AARCH64EB__ + rev x19, x19 + rev x20, x20 +#endif ext v11.16b, v11.16b, v11.16b, #8 //PRE 0 fmov d3, x10 //CTR block 4k+3 rev64 v4.16b, v4.16b //GHASH block 4k (only t0 is free) @@ -2178,11 +2328,17 @@ aes_gcm_enc_192_kernel: pmull2 v30.1q, v5.2d, v14.2d //GHASH block 4k+1 - high rev64 v7.16b, v7.16b //GHASH block 4k+3 (t0, t1, t2 and t3 free) ldp x21, x22, [x0, #32] //AES block 4k+6 - load plaintext - +#ifdef __AARCH64EB__ + rev x21, x21 + rev x22, x22 +#endif aese v0.16b, v18.16b aesmc v0.16b, v0.16b //AES block 4k+4 - round 0 ldp x23, x24, [x0, #48] //AES block 4k+3 - load plaintext - +#ifdef __AARCH64EB__ + rev x23, x23 + rev x24, x24 +#endif pmull v31.1q, v5.1d, v14.1d //GHASH block 4k+1 - low eor v4.16b, v4.16b, v11.16b //PRE 1 @@ -2275,7 +2431,10 @@ aes_gcm_enc_192_kernel: aese v1.16b, v22.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 4 ldp x6, x7, [x0, #0] //AES block 4k+4 - load plaintext - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif aese v0.16b, v24.16b aesmc v0.16b, v0.16b //AES block 4k+4 - round 6 eor v11.16b, v11.16b, v8.16b //GHASH block 4k+2 - low @@ -2640,7 +2799,10 @@ aes_gcm_enc_192_kernel: sub x5, x4, x0 //main_end_input_ptr is number of bytes left to process ldp x6, x7, [x0], #16 //AES block 4k+4 - load plaintext - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif eor x6, x6, x13 //AES block 4k+4 - round 12 low eor x7, x7, x14 //AES block 4k+4 - round 12 high @@ -2677,7 +2839,10 @@ aes_gcm_enc_192_kernel: st1 { v5.16b}, [x2], #16 //AES final-3 block - store result ldp x6, x7, [x0], #16 //AES final-2 block - load input low & high - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif rev64 v4.16b, v5.16b //GHASH final-3 block eor x6, x6, x13 //AES final-2 block - round 12 low @@ -2708,7 +2873,10 @@ aes_gcm_enc_192_kernel: rev64 v4.16b, v5.16b //GHASH final-2 block ldp x6, x7, [x0], #16 //AES final-1 block - load input low & high - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif eor v4.16b, v4.16b, v8.16b //feed in partial tag eor x7, x7, x14 //AES final-1 block - round 12 high @@ -2739,7 +2907,10 @@ aes_gcm_enc_192_kernel: st1 { v5.16b}, [x2], #16 //AES final-1 block - store result ldp x6, x7, [x0], #16 //AES final block - load input low & high - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif rev64 v4.16b, v5.16b //GHASH final-1 block eor x6, x6, x13 //AES final block - round 12 low @@ -2771,7 +2942,11 @@ aes_gcm_enc_192_kernel: .L192_enc_blocks_less_than_1: //blocks left <= 1 ld1 { v18.16b}, [x2] //load existing bytes where the possibly partial last block is to be stored +#ifndef __AARCH64EB__ rev w9, w12 +#else + mov w9, w12 +#endif and x1, x1, #127 //bit_length %= 128 sub x1, x1, #128 //bit_length -= 128 @@ -2876,14 +3051,22 @@ aes_gcm_dec_192_kernel: add x4, x0, x1, lsr #3 //end_input_ptr ldp x10, x11, [x16] //ctr96_b64, ctr96_t32 - +#ifdef __AARCH64EB__ + rev x10, x10 + rev x11, x11 +#endif + ldp x13, x14, [x8, #192] //load rk12 +#ifdef __AARCH64EB__ + ror x13, x13, #32 + ror x14, x14, #32 +#endif ld1 { v0.16b}, [x16] //special case vector load initial counter so we can start first AES block as quickly as possible - ldr q18, [x8, #0] //load rk0 + ld1 {v18.4s}, [x8], #16 //load rk0 lsr x5, x1, #3 //byte_len mov x15, x5 - ldr q20, [x8, #32] //load rk2 + ld1 {v19.4s}, [x8], #16 //load rk1 lsr x12, x11, #32 orr w11, w11, w11 @@ -2893,7 +3076,7 @@ aes_gcm_dec_192_kernel: fmov d1, x10 //CTR block 1 add w12, w12, #1 //increment rev_ctr32 - ldr q19, [x8, #16] //load rk1 + ld1 {v20.4s}, [x8], #16 //load rk2 aese v0.16b, v18.16b aesmc v0.16b, v0.16b //AES block 0 - round 0 @@ -2901,7 +3084,7 @@ aes_gcm_dec_192_kernel: add w12, w12, #1 //CTR block 1 orr x9, x11, x9, lsl #32 //CTR block 1 - ldr q21, [x8, #48] //load rk3 + ld1 {v21.4s}, [x8], #16 //load rk3 fmov v1.d[1], x9 //CTR block 1 rev w9, w12 //CTR block 2 @@ -2919,54 +3102,57 @@ aes_gcm_dec_192_kernel: fmov v3.d[1], x9 //CTR block 3 - ldr q26, [x8, #128] //load rk8 + ld1 {v22.4s}, [x8], #16 //load rk4 aese v0.16b, v20.16b aesmc v0.16b, v0.16b //AES block 0 - round 2 aese v2.16b, v18.16b aesmc v2.16b, v2.16b //AES block 2 - round 0 - ldr q29, [x8, #176] //load rk11 + ld1 {v23.4s}, [x8], #16 //load rk5 aese v1.16b, v18.16b aesmc v1.16b, v1.16b //AES block 1 - round 0 ldr q15, [x3, #112] //load h4l | h4h +#ifndef __AARCH64EB__ ext v15.16b, v15.16b, v15.16b, #8 - +#endif aese v3.16b, v18.16b aesmc v3.16b, v3.16b //AES block 3 - round 0 ldr q13, [x3, #64] //load h2l | h2h +#ifndef __AARCH64EB__ ext v13.16b, v13.16b, v13.16b, #8 - +#endif aese v2.16b, v19.16b aesmc v2.16b, v2.16b //AES block 2 - round 1 ldr q14, [x3, #80] //load h3l | h3h +#ifndef __AARCH64EB__ ext v14.16b, v14.16b, v14.16b, #8 - +#endif aese v1.16b, v19.16b aesmc v1.16b, v1.16b //AES block 1 - round 1 - ldp x13, x14, [x8, #192] //load rk12 aese v3.16b, v19.16b aesmc v3.16b, v3.16b //AES block 3 - round 1 ldr q12, [x3, #32] //load h1l | h1h +#ifndef __AARCH64EB__ ext v12.16b, v12.16b, v12.16b, #8 - +#endif aese v2.16b, v20.16b aesmc v2.16b, v2.16b //AES block 2 - round 2 - ldr q28, [x8, #160] //load rk10 + ld1 {v24.4s}, [x8], #16 //load rk6 aese v0.16b, v21.16b aesmc v0.16b, v0.16b //AES block 0 - round 3 - ldr q27, [x8, #144] //load rk9 + ld1 {v25.4s}, [x8], #16 //load rk7 aese v1.16b, v20.16b aesmc v1.16b, v1.16b //AES block 1 - round 2 - ldr q25, [x8, #112] //load rk7 + ld1 {v26.4s}, [x8], #16 //load rk8 aese v3.16b, v20.16b aesmc v3.16b, v3.16b //AES block 3 - round 2 - ldr q22, [x8, #64] //load rk4 + ld1 {v27.4s}, [x8], #16 //load rk9 aese v2.16b, v21.16b aesmc v2.16b, v2.16b //AES block 2 - round 3 @@ -2984,7 +3170,7 @@ aes_gcm_dec_192_kernel: aese v0.16b, v22.16b aesmc v0.16b, v0.16b //AES block 0 - round 4 - ldr q23, [x8, #80] //load rk5 + ld1 {v28.4s}, [x8], #16 //load rk10 aese v1.16b, v22.16b aesmc v1.16b, v1.16b //AES block 1 - round 4 @@ -2999,7 +3185,7 @@ aes_gcm_dec_192_kernel: aese v0.16b, v23.16b aesmc v0.16b, v0.16b //AES block 0 - round 5 - ldr q24, [x8, #96] //load rk6 + ld1 {v29.4s}, [x8], #16 //load rk11 aese v1.16b, v23.16b aesmc v1.16b, v1.16b //AES block 1 - round 5 @@ -3086,17 +3272,13 @@ aes_gcm_dec_192_kernel: aese v0.16b, v29.16b //AES block 0 - round 11 b.ge .L192_dec_tail //handle tail - ldr q5, [x0, #16] //AES block 1 - load ciphertext - - ldr q4, [x0, #0] //AES block 0 - load ciphertext + ld1 {v4.16b, v5.16b}, [x0], #32 //AES block 0,1 - load ciphertext eor v1.16b, v5.16b, v1.16b //AES block 1 - result eor v0.16b, v4.16b, v0.16b //AES block 0 - result rev w9, w12 //CTR block 4 - ldr q7, [x0, #48] //AES block 3 - load ciphertext - - ldr q6, [x0, #32] //AES block 2 - load ciphertext + ld1 {v6.16b, v7.16b}, [x0], #32 //AES block 2,3 - load ciphertext mov x19, v1.d[0] //AES block 1 - mov low @@ -3108,27 +3290,35 @@ aes_gcm_dec_192_kernel: mov x7, v0.d[1] //AES block 0 - mov high rev64 v4.16b, v4.16b //GHASH block 0 - add x0, x0, #64 //AES input_ptr update fmov d0, x10 //CTR block 4 rev64 v5.16b, v5.16b //GHASH block 1 cmp x0, x5 //check if we have <= 8 blocks eor x19, x19, x13 //AES block 1 - round 12 low +#ifdef __AARCH64EB__ + rev x19, x19 +#endif fmov v0.d[1], x9 //CTR block 4 rev w9, w12 //CTR block 5 orr x9, x11, x9, lsl #32 //CTR block 5 fmov d1, x10 //CTR block 5 eor x20, x20, x14 //AES block 1 - round 12 high - +#ifdef __AARCH64EB__ + rev x20, x20 +#endif add w12, w12, #1 //CTR block 5 fmov v1.d[1], x9 //CTR block 5 eor x6, x6, x13 //AES block 0 - round 12 low - +#ifdef __AARCH64EB__ + rev x6, x6 +#endif rev w9, w12 //CTR block 6 eor x7, x7, x14 //AES block 0 - round 12 high - +#ifdef __AARCH64EB__ + rev x7, x7 +#endif stp x6, x7, [x2], #16 //AES block 0 - store result orr x9, x11, x9, lsl #32 //CTR block 6 @@ -3191,7 +3381,9 @@ aes_gcm_dec_192_kernel: aese v0.16b, v20.16b aesmc v0.16b, v0.16b //AES block 4k+4 - round 2 eor x22, x22, x14 //AES block 4k+2 - round 12 high - +#ifdef __AARCH64EB__ + rev x22, x22 +#endif aese v2.16b, v19.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 1 eor v4.8b, v4.8b, v5.8b //GHASH block 4k+1 - mid @@ -3208,7 +3400,9 @@ aes_gcm_dec_192_kernel: pmull v4.1q, v4.1d, v17.1d //GHASH block 4k+1 - mid eor v11.16b, v11.16b, v31.16b //GHASH block 4k+1 - low eor x21, x21, x13 //AES block 4k+2 - round 12 low - +#ifdef __AARCH64EB__ + rev x21, x21 +#endif aese v1.16b, v22.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 4 @@ -3310,16 +3504,18 @@ aes_gcm_dec_192_kernel: aese v2.16b, v24.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 6 - ldr q6, [x0, #32] //AES block 4k+6 - load ciphertext + ld1 {v4.16b}, [x0], #16 //AES block 4k+4 - load ciphertext aese v3.16b, v24.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 6 eor v10.16b, v10.16b, v30.16b //MODULO - karatsuba tidy up pmull v31.1q, v9.1d, v8.1d //MODULO - top 64b align with mid - ldr q7, [x0, #48] //AES block 4k+7 - load ciphertext + ld1 {v5.16b}, [x0], #16 //AES block 4k+5 - load ciphertext eor x23, x23, x13 //AES block 4k+3 - round 12 low - +#ifdef __AARCH64EB__ + rev x23, x23 +#endif aese v2.16b, v25.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 7 ext v9.16b, v9.16b, v9.16b, #8 //MODULO - other top alignment @@ -3333,10 +3529,10 @@ aes_gcm_dec_192_kernel: aese v2.16b, v26.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 8 - ldr q4, [x0, #0] //AES block 4k+4 - load ciphertext + ld1 {v6.16b}, [x0], #16 //AES block 4k+6 - load ciphertext aese v1.16b, v29.16b //AES block 4k+5 - round 11 - ldr q5, [x0, #16] //AES block 4k+5 - load ciphertext + ld1 {v7.16b}, [x0], #16 //AES block 4k+7 - load ciphertext rev w9, w12 //CTR block 4k+8 aese v3.16b, v26.16b @@ -3347,11 +3543,13 @@ aes_gcm_dec_192_kernel: aesmc v2.16b, v2.16b //AES block 4k+6 - round 9 eor v10.16b, v10.16b, v9.16b //MODULO - fold into mid - add x0, x0, #64 //AES input_ptr update cmp x0, x5 //.LOOP CONTROL eor v0.16b, v4.16b, v0.16b //AES block 4k+4 - result eor x24, x24, x14 //AES block 4k+3 - round 12 high +#ifdef __AARCH64EB__ + rev x24, x24 +#endif eor v1.16b, v5.16b, v1.16b //AES block 4k+5 - result aese v2.16b, v28.16b @@ -3384,18 +3582,28 @@ aes_gcm_dec_192_kernel: rev w9, w12 //CTR block 4k+9 eor x6, x6, x13 //AES block 4k+4 - round 12 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif orr x9, x11, x9, lsl #32 //CTR block 4k+9 eor v11.16b, v11.16b, v8.16b //MODULO - fold into low fmov d1, x10 //CTR block 4k+9 add w12, w12, #1 //CTR block 4k+9 eor x19, x19, x13 //AES block 4k+5 - round 12 low - +#ifdef __AARCH64EB__ + rev x19, x19 +#endif fmov v1.d[1], x9 //CTR block 4k+9 rev w9, w12 //CTR block 4k+10 eor x20, x20, x14 //AES block 4k+5 - round 12 high - +#ifdef __AARCH64EB__ + rev x20, x20 +#endif eor x7, x7, x14 //AES block 4k+4 - round 12 high +#ifdef __AARCH64EB__ + rev x7, x7 +#endif stp x6, x7, [x2], #16 //AES block 4k+4 - store result eor v11.16b, v11.16b, v10.16b //MODULO - fold into low @@ -3449,18 +3657,29 @@ aes_gcm_dec_192_kernel: pmull v31.1q, v5.1d, v14.1d //GHASH block 4k+1 - low eor x24, x24, x14 //AES block 4k+3 - round 12 high +#ifdef __AARCH64EB__ + rev x24, x24 +#endif fmov v3.d[1], x9 //CTR block 4k+7 aese v0.16b, v20.16b aesmc v0.16b, v0.16b //AES block 4k+4 - round 2 eor x21, x21, x13 //AES block 4k+2 - round 12 low - +#ifdef __AARCH64EB__ + rev x21, x21 +#endif pmull2 v30.1q, v5.2d, v14.2d //GHASH block 4k+1 - high eor x22, x22, x14 //AES block 4k+2 - round 12 high +#ifdef __AARCH64EB__ + rev x22, x22 +#endif eor v4.8b, v4.8b, v5.8b //GHASH block 4k+1 - mid pmull v10.1q, v8.1d, v10.1d //GHASH block 4k - mid eor x23, x23, x13 //AES block 4k+3 - round 12 low +#ifdef __AARCH64EB__ + rev x23, x23 +#endif stp x21, x22, [x2], #16 //AES block 4k+2 - store result rev64 v7.16b, v7.16b //GHASH block 4k+3 @@ -3650,8 +3869,13 @@ aes_gcm_dec_192_kernel: cmp x5, #48 eor x7, x7, x14 //AES block 4k+4 - round 12 high - +#ifdef __AARCH64EB__ + rev x7, x7 +#endif eor x6, x6, x13 //AES block 4k+4 - round 12 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif b.gt .L192_dec_blocks_more_than_3 movi v11.8b, #0 @@ -3695,10 +3919,16 @@ aes_gcm_dec_192_kernel: pmull2 v9.1q, v4.2d, v15.2d //GHASH final-3 block - high eor x6, x6, x13 //AES final-2 block - round 12 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif movi v8.8b, #0 //suppress further partial tag feed in pmull v10.1q, v22.1d, v10.1d //GHASH final-3 block - mid eor x7, x7, x14 //AES final-2 block - round 12 high +#ifdef __AARCH64EB__ + rev x7, x7 +#endif .L192_dec_blocks_more_than_2: //blocks left > 2 rev64 v4.16b, v5.16b //GHASH final-2 block @@ -3728,8 +3958,13 @@ aes_gcm_dec_192_kernel: eor v9.16b, v9.16b, v20.16b //GHASH final-2 block - high eor x7, x7, x14 //AES final-1 block - round 12 high - +#ifdef __AARCH64EB__ + rev x7, x7 +#endif eor x6, x6, x13 //AES final-1 block - round 12 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif eor v10.16b, v10.16b, v22.16b //GHASH final-2 block - mid .L192_dec_blocks_more_than_1: //blocks left > 1 @@ -3760,9 +3995,13 @@ aes_gcm_dec_192_kernel: movi v8.8b, #0 //suppress further partial tag feed in eor v11.16b, v11.16b, v21.16b //GHASH final-1 block - low eor x7, x7, x14 //AES final block - round 12 high - +#ifdef __AARCH64EB__ + rev x7, x7 +#endif eor x6, x6, x13 //AES final block - round 12 low - +#ifdef __AARCH64EB__ + rev x6, x6 +#endif eor v10.16b, v10.16b, v22.16b //GHASH final-1 block - mid .L192_dec_blocks_less_than_1: //blocks left <= 1 @@ -3789,8 +4028,11 @@ aes_gcm_dec_192_kernel: orr x6, x6, x4 mov v0.d[1], x10 - +#ifndef __AARCH64EB__ rev w9, w12 +#else + mov w9, w12 +#endif and v5.16b, v5.16b, v0.16b //possibly partial last block has zeroes in highest bits str w9, [x16, #12] //store the updated counter @@ -3878,14 +4120,22 @@ aes_gcm_enc_256_kernel: lsr x5, x1, #3 //byte_len mov x15, x5 ldp x10, x11, [x16] //ctr96_b64, ctr96_t32 - +#ifdef __AARCH64EB__ + rev x10, x10 + rev x11, x11 +#endif + ldp x13, x14, [x8, #224] //load rk14 +#ifdef __AARCH64EB__ + ror x13, x13, #32 + ror x14, x14, #32 +#endif ld1 { v0.16b}, [x16] //special case vector load initial counter so we can start first AES block as quickly as possible sub x5, x5, #1 //byte_len - 1 - ldr q18, [x8, #0] //load rk0 + ld1 {v18.4s}, [x8], #16 //load rk0 and x5, x5, #0xffffffffffffffc0 //number of bytes to be processed in main loop (at least 1 byte must be handled by tail) - ldr q25, [x8, #112] //load rk7 + ld1 {v19.4s}, [x8], #16 //load rk1 add x5, x5, x0 lsr x12, x11, #32 @@ -3905,14 +4155,14 @@ aes_gcm_enc_256_kernel: orr x9, x11, x9, lsl #32 //CTR block 1 add w12, w12, #1 //CTR block 1 - ldr q19, [x8, #16] //load rk1 + ld1 {v20.4s}, [x8], #16 //load rk2 fmov v1.d[1], x9 //CTR block 1 rev w9, w12 //CTR block 2 add w12, w12, #1 //CTR block 2 orr x9, x11, x9, lsl #32 //CTR block 2 - ldr q20, [x8, #32] //load rk2 + ld1 {v21.4s}, [x8], #16 //load rk3 fmov v2.d[1], x9 //CTR block 2 rev w9, w12 //CTR block 3 @@ -3925,50 +4175,53 @@ aes_gcm_enc_256_kernel: aese v1.16b, v18.16b aesmc v1.16b, v1.16b //AES block 1 - round 0 - ldr q21, [x8, #48] //load rk3 + ld1 {v22.4s}, [x8], #16 //load rk4 aese v0.16b, v20.16b aesmc v0.16b, v0.16b //AES block 0 - round 2 - ldr q24, [x8, #96] //load rk6 + ld1 {v23.4s}, [x8], #16 //load rk5 aese v2.16b, v18.16b aesmc v2.16b, v2.16b //AES block 2 - round 0 - ldr q23, [x8, #80] //load rk5 + ld1 {v24.4s}, [x8], #16 //load rk6 aese v1.16b, v19.16b aesmc v1.16b, v1.16b //AES block 1 - round 1 ldr q14, [x3, #80] //load h3l | h3h +#ifndef __AARCH64EB__ ext v14.16b, v14.16b, v14.16b, #8 - +#endif aese v3.16b, v18.16b aesmc v3.16b, v3.16b //AES block 3 - round 0 - ldr q31, [x8, #208] //load rk13 + ld1 {v25.4s}, [x8], #16 //load rk7 aese v2.16b, v19.16b aesmc v2.16b, v2.16b //AES block 2 - round 1 - ldr q22, [x8, #64] //load rk4 + ld1 {v26.4s}, [x8], #16 //load rk8 aese v1.16b, v20.16b aesmc v1.16b, v1.16b //AES block 1 - round 2 ldr q13, [x3, #64] //load h2l | h2h +#ifndef __AARCH64EB__ ext v13.16b, v13.16b, v13.16b, #8 - +#endif aese v3.16b, v19.16b aesmc v3.16b, v3.16b //AES block 3 - round 1 - ldr q30, [x8, #192] //load rk12 + ld1 {v27.4s}, [x8], #16 //load rk9 aese v2.16b, v20.16b aesmc v2.16b, v2.16b //AES block 2 - round 2 ldr q15, [x3, #112] //load h4l | h4h +#ifndef __AARCH64EB__ ext v15.16b, v15.16b, v15.16b, #8 - +#endif aese v1.16b, v21.16b aesmc v1.16b, v1.16b //AES block 1 - round 3 - ldr q29, [x8, #176] //load rk11 + ld1 {v28.4s}, [x8], #16 //load rk10 aese v3.16b, v20.16b aesmc v3.16b, v3.16b //AES block 3 - round 2 - ldr q26, [x8, #128] //load rk8 + ld1 {v29.4s}, [x8], #16 //load rk11 aese v2.16b, v21.16b aesmc v2.16b, v2.16b //AES block 2 - round 3 @@ -3976,7 +4229,6 @@ aes_gcm_enc_256_kernel: aese v0.16b, v21.16b aesmc v0.16b, v0.16b //AES block 0 - round 3 - ldp x13, x14, [x8, #224] //load rk14 aese v3.16b, v21.16b aesmc v3.16b, v3.16b //AES block 3 - round 3 @@ -4014,16 +4266,17 @@ aes_gcm_enc_256_kernel: aese v3.16b, v24.16b aesmc v3.16b, v3.16b //AES block 3 - round 6 - ldr q27, [x8, #144] //load rk9 + ld1 {v30.4s}, [x8], #16 //load rk12 aese v0.16b, v24.16b aesmc v0.16b, v0.16b //AES block 0 - round 6 ldr q12, [x3, #32] //load h1l | h1h +#ifndef __AARCH64EB__ ext v12.16b, v12.16b, v12.16b, #8 - +#endif aese v2.16b, v24.16b aesmc v2.16b, v2.16b //AES block 2 - round 6 - ldr q28, [x8, #160] //load rk10 + ld1 {v31.4s}, [x8], #16 //load rk13 aese v1.16b, v25.16b aesmc v1.16b, v1.16b //AES block 1 - round 7 @@ -4112,13 +4365,26 @@ aes_gcm_enc_256_kernel: b.ge .L256_enc_tail //handle tail ldp x19, x20, [x0, #16] //AES block 1 - load plaintext - +#ifdef __AARCH64EB__ + rev x19, x19 + rev x20, x20 +#endif rev w9, w12 //CTR block 4 ldp x6, x7, [x0, #0] //AES block 0 - load plaintext - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif ldp x23, x24, [x0, #48] //AES block 3 - load plaintext - +#ifdef __AARCH64EB__ + rev x23, x23 + rev x24, x24 +#endif ldp x21, x22, [x0, #32] //AES block 2 - load plaintext +#ifdef __AARCH64EB__ + rev x21, x21 + rev x22, x22 +#endif add x0, x0, #64 //AES input_ptr update eor x19, x19, x13 //AES block 1 - round 14 low @@ -4201,11 +4467,17 @@ aes_gcm_enc_256_kernel: aese v1.16b, v19.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 1 ldp x23, x24, [x0, #48] //AES block 4k+7 - load plaintext - +#ifdef __AARCH64EB__ + rev x23, x23 + rev x24, x24 +#endif aese v2.16b, v19.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 1 ldp x21, x22, [x0, #32] //AES block 4k+6 - load plaintext - +#ifdef __AARCH64EB__ + rev x21, x21 + rev x22, x22 +#endif aese v0.16b, v20.16b aesmc v0.16b, v0.16b //AES block 4k+4 - round 2 eor v4.16b, v4.16b, v11.16b //PRE 1 @@ -4315,7 +4587,10 @@ aes_gcm_enc_256_kernel: aese v3.16b, v24.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 6 ldp x19, x20, [x0, #16] //AES block 4k+5 - load plaintext - +#ifdef __AARCH64EB__ + rev x19, x19 + rev x20, x20 +#endif aese v1.16b, v26.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 8 mov d4, v7.d[1] //GHASH block 4k+3 - mid @@ -4352,7 +4627,10 @@ aes_gcm_enc_256_kernel: aese v2.16b, v26.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 8 ldp x6, x7, [x0, #0] //AES block 4k+4 - load plaintext - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif aese v0.16b, v28.16b aesmc v0.16b, v0.16b //AES block 4k+4 - round 10 shl d8, d8, #56 //mod_constant @@ -4714,7 +4992,10 @@ aes_gcm_enc_256_kernel: ext v8.16b, v11.16b, v11.16b, #8 //prepare final partial tag sub x5, x4, x0 //main_end_input_ptr is number of bytes left to process ldp x6, x7, [x0], #16 //AES block 4k+4 - load plaintext - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif eor x6, x6, x13 //AES block 4k+4 - round 14 low eor x7, x7, x14 //AES block 4k+4 - round 14 high @@ -4749,7 +5030,10 @@ aes_gcm_enc_256_kernel: st1 { v5.16b}, [x2], #16 //AES final-3 block - store result ldp x6, x7, [x0], #16 //AES final-2 block - load input low & high - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif rev64 v4.16b, v5.16b //GHASH final-3 block eor x6, x6, x13 //AES final-2 block - round 14 low @@ -4778,7 +5062,10 @@ aes_gcm_enc_256_kernel: st1 { v5.16b}, [x2], #16 //AES final-2 block - store result ldp x6, x7, [x0], #16 //AES final-1 block - load input low & high - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif rev64 v4.16b, v5.16b //GHASH final-2 block eor x6, x6, x13 //AES final-1 block - round 14 low @@ -4814,7 +5101,10 @@ aes_gcm_enc_256_kernel: rev64 v4.16b, v5.16b //GHASH final-1 block ldp x6, x7, [x0], #16 //AES final block - load input low & high - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif eor v4.16b, v4.16b, v8.16b //feed in partial tag movi v8.8b, #0 //suppress further partial tag feed in @@ -4875,7 +5165,11 @@ aes_gcm_enc_256_kernel: pmull2 v20.1q, v4.2d, v12.2d //GHASH final block - high mov d8, v4.d[1] //GHASH final block - mid +#ifndef __AARCH64EB__ rev w9, w12 +#else + mov w9, w12 +#endif pmull v21.1q, v4.1d, v12.1d //GHASH final block - low @@ -4949,21 +5243,29 @@ aes_gcm_dec_256_kernel: lsr x5, x1, #3 //byte_len mov x15, x5 ldp x10, x11, [x16] //ctr96_b64, ctr96_t32 - - ldr q26, [x8, #128] //load rk8 +#ifdef __AARCH64EB__ + rev x10, x10 + rev x11, x11 +#endif + ldp x13, x14, [x8, #224] //load rk14 +#ifdef __AARCH64EB__ + ror x14, x14, #32 + ror x13, x13, #32 +#endif + ld1 {v18.4s}, [x8], #16 //load rk0 sub x5, x5, #1 //byte_len - 1 - ldr q25, [x8, #112] //load rk7 + ld1 {v19.4s}, [x8], #16 //load rk1 and x5, x5, #0xffffffffffffffc0 //number of bytes to be processed in main loop (at least 1 byte must be handled by tail) add x4, x0, x1, lsr #3 //end_input_ptr - ldr q24, [x8, #96] //load rk6 + ld1 {v20.4s}, [x8], #16 //load rk2 lsr x12, x11, #32 - ldr q23, [x8, #80] //load rk5 + ld1 {v21.4s}, [x8], #16 //load rk3 orr w11, w11, w11 - ldr q21, [x8, #48] //load rk3 + ld1 {v22.4s}, [x8], #16 //load rk4 add x5, x5, x0 rev w12, w12 //rev_ctr32 @@ -4988,39 +5290,44 @@ aes_gcm_dec_256_kernel: rev w9, w12 //CTR block 3 orr x9, x11, x9, lsl #32 //CTR block 3 - ldr q18, [x8, #0] //load rk0 + ld1 {v23.4s}, [x8], #16 //load rk5 fmov v3.d[1], x9 //CTR block 3 add w12, w12, #1 //CTR block 3 - ldr q22, [x8, #64] //load rk4 + ld1 {v24.4s}, [x8], #16 //load rk6 - ldr q31, [x8, #208] //load rk13 + ld1 {v25.4s}, [x8], #16 //load rk7 - ldr q19, [x8, #16] //load rk1 + ld1 {v26.4s}, [x8], #16 //load rk8 aese v0.16b, v18.16b aesmc v0.16b, v0.16b //AES block 0 - round 0 ldr q14, [x3, #80] //load h3l | h3h +#ifndef __AARCH64EB__ ext v14.16b, v14.16b, v14.16b, #8 +#endif aese v3.16b, v18.16b aesmc v3.16b, v3.16b //AES block 3 - round 0 ldr q15, [x3, #112] //load h4l | h4h +#ifndef __AARCH64EB__ ext v15.16b, v15.16b, v15.16b, #8 +#endif aese v1.16b, v18.16b aesmc v1.16b, v1.16b //AES block 1 - round 0 ldr q13, [x3, #64] //load h2l | h2h +#ifndef __AARCH64EB__ ext v13.16b, v13.16b, v13.16b, #8 +#endif aese v2.16b, v18.16b aesmc v2.16b, v2.16b //AES block 2 - round 0 - ldr q20, [x8, #32] //load rk2 + ld1 {v27.4s}, [x8], #16 //load rk9 aese v0.16b, v19.16b aesmc v0.16b, v0.16b //AES block 0 - round 1 - ldp x13, x14, [x8, #224] //load rk14 aese v1.16b, v19.16b aesmc v1.16b, v1.16b //AES block 1 - round 1 @@ -5030,20 +5337,21 @@ aes_gcm_dec_256_kernel: aese v2.16b, v19.16b aesmc v2.16b, v2.16b //AES block 2 - round 1 - ldr q27, [x8, #144] //load rk9 + ld1 {v28.4s}, [x8], #16 //load rk10 aese v3.16b, v19.16b aesmc v3.16b, v3.16b //AES block 3 - round 1 - ldr q30, [x8, #192] //load rk12 + ld1 {v29.4s}, [x8], #16 //load rk11 aese v0.16b, v20.16b aesmc v0.16b, v0.16b //AES block 0 - round 2 ldr q12, [x3, #32] //load h1l | h1h +#ifndef __AARCH64EB__ ext v12.16b, v12.16b, v12.16b, #8 - +#endif aese v2.16b, v20.16b aesmc v2.16b, v2.16b //AES block 2 - round 2 - ldr q28, [x8, #160] //load rk10 + ld1 {v30.4s}, [x8], #16 //load rk12 aese v3.16b, v20.16b aesmc v3.16b, v3.16b //AES block 3 - round 2 @@ -5126,7 +5434,7 @@ aes_gcm_dec_256_kernel: aese v2.16b, v26.16b aesmc v2.16b, v2.16b //AES block 2 - round 8 - ldr q29, [x8, #176] //load rk11 + ld1 {v31.4s}, [x8], #16 //load rk13 aese v1.16b, v27.16b aesmc v1.16b, v1.16b //AES block 1 - round 9 @@ -5191,9 +5499,7 @@ aes_gcm_dec_256_kernel: aese v0.16b, v31.16b //AES block 0 - round 13 b.ge .L256_dec_tail //handle tail - ldr q4, [x0, #0] //AES block 0 - load ciphertext - - ldr q5, [x0, #16] //AES block 1 - load ciphertext + ld1 {v4.16b, v5.16b}, [x0], #32 //AES block 0,1 - load ciphertext rev w9, w12 //CTR block 4 @@ -5201,7 +5507,7 @@ aes_gcm_dec_256_kernel: eor v1.16b, v5.16b, v1.16b //AES block 1 - result rev64 v5.16b, v5.16b //GHASH block 1 - ldr q7, [x0, #48] //AES block 3 - load ciphertext + ld1 {v6.16b}, [x0], #16 //AES block 2 - load ciphertext mov x7, v0.d[1] //AES block 0 - mov high @@ -5221,22 +5527,32 @@ aes_gcm_dec_256_kernel: orr x9, x11, x9, lsl #32 //CTR block 5 mov x20, v1.d[1] //AES block 1 - mov high eor x7, x7, x14 //AES block 0 - round 14 high - +#ifdef __AARCH64EB__ + rev x7, x7 +#endif eor x6, x6, x13 //AES block 0 - round 14 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif stp x6, x7, [x2], #16 //AES block 0 - store result fmov d1, x10 //CTR block 5 - ldr q6, [x0, #32] //AES block 2 - load ciphertext - add x0, x0, #64 //AES input_ptr update + ld1 {v7.16b}, [x0], #16 //AES block 3 - load ciphertext fmov v1.d[1], x9 //CTR block 5 rev w9, w12 //CTR block 6 add w12, w12, #1 //CTR block 6 eor x19, x19, x13 //AES block 1 - round 14 low +#ifdef __AARCH64EB__ + rev x19, x19 +#endif orr x9, x11, x9, lsl #32 //CTR block 6 eor x20, x20, x14 //AES block 1 - round 14 high +#ifdef __AARCH64EB__ + rev x20, x20 +#endif stp x19, x20, [x2], #16 //AES block 1 - store result eor v2.16b, v6.16b, v2.16b //AES block 2 - result @@ -5287,7 +5603,9 @@ aes_gcm_dec_256_kernel: aese v0.16b, v21.16b aesmc v0.16b, v0.16b //AES block 4k+4 - round 3 eor x22, x22, x14 //AES block 4k+2 - round 14 high - +#ifdef __AARCH64EB__ + rev x22, x22 +#endif aese v2.16b, v19.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 1 mov d10, v17.d[1] //GHASH block 4k - mid @@ -5299,7 +5617,9 @@ aes_gcm_dec_256_kernel: aese v3.16b, v18.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 0 eor x21, x21, x13 //AES block 4k+2 - round 14 low - +#ifdef __AARCH64EB__ + rev x21, x21 +#endif aese v2.16b, v20.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 2 stp x21, x22, [x2], #16 //AES block 4k+2 - store result @@ -5314,9 +5634,14 @@ aes_gcm_dec_256_kernel: pmull v10.1q, v8.1d, v10.1d //GHASH block 4k - mid eor x23, x23, x13 //AES block 4k+3 - round 14 low - +#ifdef __AARCH64EB__ + rev x23, x23 +#endif pmull v8.1q, v5.1d, v14.1d //GHASH block 4k+1 - low eor x24, x24, x14 //AES block 4k+3 - round 14 high +#ifdef __AARCH64EB__ + rev x24, x24 +#endif eor v9.16b, v9.16b, v4.16b //GHASH block 4k+1 - high aese v2.16b, v22.16b @@ -5437,7 +5762,7 @@ aes_gcm_dec_256_kernel: aese v1.16b, v27.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 9 - ldr q4, [x0, #0] //AES block 4k+4 - load ciphertext + ld1 {v4.16b}, [x0], #16 //AES block 4k+4 - load ciphertext aese v0.16b, v31.16b //AES block 4k+4 - round 13 ext v9.16b, v9.16b, v9.16b, #8 //MODULO - other top alignment @@ -5448,7 +5773,7 @@ aes_gcm_dec_256_kernel: aese v2.16b, v27.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 9 - ldr q5, [x0, #16] //AES block 4k+5 - load ciphertext + ld1 {v5.16b}, [x0], #16 //AES block 4k+5 - load ciphertext aese v3.16b, v26.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 8 @@ -5464,11 +5789,11 @@ aes_gcm_dec_256_kernel: aese v3.16b, v27.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 9 - ldr q7, [x0, #48] //AES block 4k+7 - load ciphertext + ld1 {v6.16b}, [x0], #16 //AES block 4k+6 - load ciphertext aese v1.16b, v30.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 12 - ldr q6, [x0, #32] //AES block 4k+6 - load ciphertext + ld1 {v7.16b}, [x0], #16 //AES block 4k+7 - load ciphertext aese v2.16b, v29.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 11 @@ -5479,7 +5804,6 @@ aes_gcm_dec_256_kernel: eor v10.16b, v10.16b, v9.16b //MODULO - fold into mid aese v1.16b, v31.16b //AES block 4k+5 - round 13 - add x0, x0, #64 //AES input_ptr update mov x6, v0.d[0] //AES block 4k+4 - mov low aese v2.16b, v30.16b @@ -5501,8 +5825,13 @@ aes_gcm_dec_256_kernel: add w12, w12, #1 //CTR block 4k+9 eor x6, x6, x13 //AES block 4k+4 - round 14 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif eor x7, x7, x14 //AES block 4k+4 - round 14 high - +#ifdef __AARCH64EB__ + rev x7, x7 +#endif mov x20, v1.d[1] //AES block 4k+5 - mov high eor v2.16b, v6.16b, v2.16b //AES block 4k+6 - result eor v11.16b, v11.16b, v8.16b //MODULO - fold into low @@ -5523,9 +5852,15 @@ aes_gcm_dec_256_kernel: rev64 v5.16b, v5.16b //GHASH block 4k+5 eor x20, x20, x14 //AES block 4k+5 - round 14 high +#ifdef __AARCH64EB__ + rev x20, x20 +#endif stp x6, x7, [x2], #16 //AES block 4k+4 - store result eor x19, x19, x13 //AES block 4k+5 - round 14 low +#ifdef __AARCH64EB__ + rev x19, x19 +#endif stp x19, x20, [x2], #16 //AES block 4k+5 - store result rev64 v4.16b, v4.16b //GHASH block 4k+4 @@ -5732,11 +6067,15 @@ aes_gcm_dec_256_kernel: aese v0.16b, v28.16b aesmc v0.16b, v0.16b //AES block 4k+4 - round 10 eor x22, x22, x14 //AES block 4k+2 - round 14 high - +#ifdef __AARCH64EB__ + rev x22, x22 +#endif aese v1.16b, v28.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 10 eor x23, x23, x13 //AES block 4k+3 - round 14 low - +#ifdef __AARCH64EB__ + rev x23, x23 +#endif aese v2.16b, v29.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 11 eor v10.16b, v10.16b, v9.16b //MODULO - fold into mid @@ -5748,12 +6087,18 @@ aes_gcm_dec_256_kernel: aese v1.16b, v29.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 11 eor x21, x21, x13 //AES block 4k+2 - round 14 low +#ifdef __AARCH64EB__ + rev x21, x21 +#endif aese v2.16b, v30.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 12 pmull v8.1q, v10.1d, v8.1d //MODULO - mid 64b align with low eor x24, x24, x14 //AES block 4k+3 - round 14 high +#ifdef __AARCH64EB__ + rev x24, x24 +#endif aese v3.16b, v29.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 11 @@ -5794,8 +6139,14 @@ aes_gcm_dec_256_kernel: cmp x5, #48 eor x6, x6, x13 //AES block 4k+4 - round 14 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif eor x7, x7, x14 //AES block 4k+4 - round 14 high +#ifdef __AARCH64EB__ + rev x7, x7 +#endif b.gt .L256_dec_blocks_more_than_3 sub w12, w12, #1 @@ -5843,9 +6194,15 @@ aes_gcm_dec_256_kernel: pmull v10.1q, v22.1d, v10.1d //GHASH final-3 block - mid eor x6, x6, x13 //AES final-2 block - round 14 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif pmull v11.1q, v4.1d, v15.1d //GHASH final-3 block - low eor x7, x7, x14 //AES final-2 block - round 14 high +#ifdef __AARCH64EB__ + rev x7, x7 +#endif .L256_dec_blocks_more_than_2: //blocks left > 2 rev64 v4.16b, v5.16b //GHASH final-2 block @@ -5873,9 +6230,15 @@ aes_gcm_dec_256_kernel: eor v9.16b, v9.16b, v20.16b //GHASH final-2 block - high eor x6, x6, x13 //AES final-1 block - round 14 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif eor v10.16b, v10.16b, v22.16b //GHASH final-2 block - mid eor x7, x7, x14 //AES final-1 block - round 14 high +#ifdef __AARCH64EB__ + rev x7, x7 +#endif .L256_dec_blocks_more_than_1: //blocks left > 1 stp x6, x7, [x2], #16 //AES final-1 block - store result @@ -5903,13 +6266,18 @@ aes_gcm_dec_256_kernel: pmull2 v22.1q, v22.2d, v16.2d //GHASH final-1 block - mid eor x6, x6, x13 //AES final block - round 14 low - +#ifdef __AARCH64EB__ + rev x6, x6 +#endif eor v11.16b, v11.16b, v21.16b //GHASH final-1 block - low eor v9.16b, v9.16b, v20.16b //GHASH final-1 block - high eor v10.16b, v10.16b, v22.16b //GHASH final-1 block - mid eor x7, x7, x14 //AES final block - round 14 high +#ifdef __AARCH64EB__ + rev x7, x7 +#endif .L256_dec_blocks_less_than_1: //blocks left <= 1 and x1, x1, #127 //bit_length %= 128 @@ -5935,7 +6303,11 @@ aes_gcm_dec_256_kernel: mov v0.d[1], x10 bic x4, x4, x9 //mask out low existing bytes +#ifndef __AARCH64EB__ rev w9, w12 +#else + mov w9, w12 +#endif bic x5, x5, x10 //mask out high existing bytes diff --git a/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/cmp.h b/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/cmp.h +++ b/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-aarch64/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux-aarch64/asm/openssl-fips.gypi b/deps/openssl/config/archs/linux-aarch64/asm/openssl-fips.gypi index 0771311cf9976e..6cbbcf0e5a90e6 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-aarch64/asm/openssl-fips.gypi @@ -33,7 +33,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/des_enc.c', diff --git a/deps/openssl/config/archs/linux-aarch64/asm/openssl.gypi b/deps/openssl/config/archs/linux-aarch64/asm/openssl.gypi index 05a322fa0b5a86..5990887c029387 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-aarch64/asm/openssl.gypi @@ -192,7 +192,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/camellia.c', 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 6ccd36d9e47a3b..7c4e9d65f86317 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.8+quic", + "full_version" => "3.0.9+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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux-aarch64", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1329,6 +1329,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3948,6 +3951,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4056,6 +4062,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6321,6 +6330,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6429,6 +6441,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7778,6 +7793,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8449,7 +8468,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-armv8-mont.o", "crypto/bn/libfips-lib-bn_add.o", "crypto/bn/libfips-lib-bn_asm.o", @@ -8478,8 +8496,7 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_shift.o", "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", - "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o" + "crypto/bn/libfips-lib-bn_word.o" ], "products" => { "lib" => [ @@ -12939,6 +12956,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -13047,6 +13067,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15312,6 +15335,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15420,6 +15446,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16932,6 +16961,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -16968,6 +16998,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18939,6 +18970,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19963,6 +19998,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19999,6 +20035,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20264,6 +20301,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -21116,9 +21154,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_x931p.o" => [ "crypto/bn/bn_x931p.c" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-armv8-mont.o" => [ "crypto/bn/armv8-mont.S" ], @@ -21206,9 +21241,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_word.o" => [ "crypto/bn/bn_word.c" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/buffer/libcrypto-lib-buf_err.o" => [ "crypto/buffer/buf_err.c" ], @@ -23759,7 +23791,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/buffer/libcrypto-lib-buf_err.o", "crypto/buffer/libcrypto-lib-buffer.o", "crypto/camellia/libcrypto-lib-camellia.o", @@ -25340,7 +25371,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/buffer/libfips-lib-buffer.o", "crypto/cmac/libfips-lib-cmac.o", "crypto/des/libfips-lib-des_enc.o", @@ -26858,6 +26888,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27556,8 +27592,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27584,7 +27620,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27601,8 +27637,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ 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 cd9cac97ca6308..51c4d7208da2ba 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 @@ -1859,10 +1859,10 @@ aes_v8_xts_encrypt: b.ne .Lxts_enc_big_size // Encrypt the iv with key2, as the first XEX iv. ldr w6,[x4,#240] - ld1 {v0.16b},[x4],#16 + ld1 {v0.4s},[x4],#16 ld1 {v6.16b},[x5] sub w6,w6,#2 - ld1 {v1.16b},[x4],#16 + ld1 {v1.4s},[x4],#16 .Loop_enc_iv_enc: aese v6.16b,v0.16b @@ -2462,9 +2462,9 @@ aes_v8_xts_encrypt: // Encrypt the composite block to get the last second encrypted text block ldr w6,[x3,#240] // load key schedule... - ld1 {v0.16b},[x3],#16 + ld1 {v0.4s},[x3],#16 sub w6,w6,#2 - ld1 {v1.16b},[x3],#16 // load key schedule... + ld1 {v1.4s},[x3],#16 // load key schedule... .Loop_final_enc: aese v26.16b,v0.16b aesmc v26.16b,v26.16b @@ -2500,10 +2500,10 @@ aes_v8_xts_decrypt: b.ne .Lxts_dec_big_size // Encrypt the iv with key2, as the first XEX iv. ldr w6,[x4,#240] - ld1 {v0.16b},[x4],#16 + ld1 {v0.4s},[x4],#16 ld1 {v6.16b},[x5] sub w6,w6,#2 - ld1 {v1.16b},[x4],#16 + ld1 {v1.4s},[x4],#16 .Loop_dec_small_iv_enc: aese v6.16b,v0.16b @@ -2581,10 +2581,10 @@ aes_v8_xts_decrypt: // Encrypt the iv with key2, as the first XEX iv ldr w6,[x4,#240] - ld1 {v0.16b},[x4],#16 + ld1 {v0.4s},[x4],#16 ld1 {v6.16b},[x5] sub w6,w6,#2 - ld1 {v1.16b},[x4],#16 + ld1 {v1.4s},[x4],#16 .Loop_dec_iv_enc: aese v6.16b,v0.16b @@ -2914,7 +2914,7 @@ aes_v8_xts_decrypt: .align 4 .Lxts_dec_tail4x: add x0,x0,#16 - ld1 {v0.4s},[x0],#16 + tst x21,#0xf eor v5.16b,v1.16b,v4.16b st1 {v5.16b},[x1],#16 eor v17.16b,v24.16b,v17.16b @@ -2923,6 +2923,8 @@ aes_v8_xts_decrypt: eor v31.16b,v26.16b,v31.16b st1 {v30.16b,v31.16b},[x1],#32 + b.eq .Lxts_dec_abort + ld1 {v0.16b},[x0],#16 b .Lxts_done .align 4 .Lxts_outer_dec_tail: @@ -3100,7 +3102,7 @@ aes_v8_xts_decrypt: // Processing the last two blocks with cipher stealing. mov x7,x3 cbnz x2,.Lxts_dec_1st_done - ld1 {v0.4s},[x0],#16 + ld1 {v0.16b},[x0],#16 // Decrypt the last secod block to get the last plain text block .Lxts_dec_1st_done: @@ -3145,9 +3147,9 @@ aes_v8_xts_decrypt: // Decrypt the composite block to get the last second plain text block ldr w6,[x7,#240] - ld1 {v0.16b},[x7],#16 + ld1 {v0.4s},[x7],#16 sub w6,w6,#2 - ld1 {v1.16b},[x7],#16 + ld1 {v1.4s},[x7],#16 .Loop_final_dec: aesd v26.16b,v0.16b aesimc v26.16b,v26.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 6b8b3a30ef0220..0e97659b1b9b54 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: Mon Feb 13 14:07:15 2023 UTC" +#define DATE "built on: Fri Jun 9 12:04:14 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/modes/aes-gcm-armv8_64.S b/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/modes/aes-gcm-armv8_64.S index 3caabfa593583c..d052cbb85cdbbf 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/modes/aes-gcm-armv8_64.S +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/modes/aes-gcm-armv8_64.S @@ -19,28 +19,36 @@ aes_gcm_enc_128_kernel: stp d14, d15, [sp, #96] ldp x10, x11, [x16] //ctr96_b64, ctr96_t32 +#ifdef __AARCH64EB__ + rev x10, x10 + rev x11, x11 +#endif ldp x13, x14, [x8, #160] //load rk10 - +#ifdef __AARCH64EB__ + ror x13, x13, #32 + ror x14, x14, #32 +#endif ld1 {v11.16b}, [x3] ext v11.16b, v11.16b, v11.16b, #8 rev64 v11.16b, v11.16b lsr x5, x1, #3 //byte_len mov x15, x5 - ldr q27, [x8, #144] //load rk9 + ld1 {v18.4s}, [x8], #16 //load rk0 add x4, x0, x1, lsr #3 //end_input_ptr sub x5, x5, #1 //byte_len - 1 lsr x12, x11, #32 ldr q15, [x3, #112] //load h4l | h4h +#ifndef __AARCH64EB__ ext v15.16b, v15.16b, v15.16b, #8 - +#endif fmov d1, x10 //CTR block 1 rev w12, w12 //rev_ctr32 add w12, w12, #1 //increment rev_ctr32 orr w11, w11, w11 - ldr q18, [x8, #0] //load rk0 + ld1 {v19.4s}, [x8], #16 //load rk1 rev w9, w12 //CTR block 1 add w12, w12, #1 //CTR block 1 @@ -60,30 +68,33 @@ aes_gcm_enc_128_kernel: rev w9, w12 //CTR block 3 orr x9, x11, x9, lsl #32 //CTR block 3 - ldr q19, [x8, #16] //load rk1 + ld1 {v20.4s}, [x8], #16 //load rk2 add w12, w12, #1 //CTR block 3 fmov v3.d[1], x9 //CTR block 3 ldr q14, [x3, #80] //load h3l | h3h +#ifndef __AARCH64EB__ ext v14.16b, v14.16b, v14.16b, #8 - +#endif aese v1.16b, v18.16b aesmc v1.16b, v1.16b //AES block 1 - round 0 - ldr q20, [x8, #32] //load rk2 + ld1 {v21.4s}, [x8], #16 //load rk3 aese v2.16b, v18.16b aesmc v2.16b, v2.16b //AES block 2 - round 0 ldr q12, [x3, #32] //load h1l | h1h +#ifndef __AARCH64EB__ ext v12.16b, v12.16b, v12.16b, #8 +#endif aese v0.16b, v18.16b aesmc v0.16b, v0.16b //AES block 0 - round 0 - ldr q26, [x8, #128] //load rk8 + ld1 {v22.4s}, [x8], #16 //load rk4 aese v3.16b, v18.16b aesmc v3.16b, v3.16b //AES block 3 - round 0 - ldr q21, [x8, #48] //load rk3 + ld1 {v23.4s}, [x8], #16 //load rk5 aese v2.16b, v19.16b aesmc v2.16b, v2.16b //AES block 2 - round 1 @@ -91,11 +102,11 @@ aes_gcm_enc_128_kernel: aese v0.16b, v19.16b aesmc v0.16b, v0.16b //AES block 0 - round 1 - ldr q24, [x8, #96] //load rk6 + ld1 {v24.4s}, [x8], #16 //load rk6 aese v1.16b, v19.16b aesmc v1.16b, v1.16b //AES block 1 - round 1 - ldr q25, [x8, #112] //load rk7 + ld1 {v25.4s}, [x8], #16 //load rk7 aese v3.16b, v19.16b aesmc v3.16b, v3.16b //AES block 3 - round 1 @@ -103,12 +114,14 @@ aes_gcm_enc_128_kernel: aese v0.16b, v20.16b aesmc v0.16b, v0.16b //AES block 0 - round 2 - ldr q23, [x8, #80] //load rk5 + ld1 {v26.4s}, [x8], #16 //load rk8 aese v1.16b, v20.16b aesmc v1.16b, v1.16b //AES block 1 - round 2 ldr q13, [x3, #64] //load h2l | h2h +#ifndef __AARCH64EB__ ext v13.16b, v13.16b, v13.16b, #8 +#endif aese v3.16b, v20.16b aesmc v3.16b, v3.16b //AES block 3 - round 2 @@ -125,7 +138,7 @@ aes_gcm_enc_128_kernel: aese v2.16b, v21.16b aesmc v2.16b, v2.16b //AES block 2 - round 3 - ldr q22, [x8, #64] //load rk4 + ld1 {v27.4s}, [x8], #16 //load rk9 aese v3.16b, v21.16b aesmc v3.16b, v3.16b //AES block 3 - round 3 @@ -208,13 +221,25 @@ aes_gcm_enc_128_kernel: b.ge .L128_enc_tail //handle tail ldp x6, x7, [x0, #0] //AES block 0 - load plaintext - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif ldp x21, x22, [x0, #32] //AES block 2 - load plaintext - +#ifdef __AARCH64EB__ + rev x21, x21 + rev x22, x22 +#endif ldp x19, x20, [x0, #16] //AES block 1 - load plaintext - +#ifdef __AARCH64EB__ + rev x19, x19 + rev x20, x20 +#endif ldp x23, x24, [x0, #48] //AES block 3 - load plaintext - +#ifdef __AARCH64EB__ + rev x23, x23 + rev x24, x24 +#endif eor x6, x6, x13 //AES block 0 - round 10 low eor x7, x7, x14 //AES block 0 - round 10 high @@ -279,6 +304,10 @@ aes_gcm_enc_128_kernel: .L128_enc_main_loop: //main loop start ldp x23, x24, [x0, #48] //AES block 4k+3 - load plaintext +#ifdef __AARCH64EB__ + rev x23, x23 + rev x24, x24 +#endif rev64 v4.16b, v4.16b //GHASH block 4k (only t0 is free) rev64 v6.16b, v6.16b //GHASH block 4k+2 (t0, t1, and t2 free) @@ -313,7 +342,10 @@ aes_gcm_enc_128_kernel: pmull2 v28.1q, v5.2d, v14.2d //GHASH block 4k+1 - high eor v31.8b, v31.8b, v6.8b //GHASH block 4k+2 - mid ldp x6, x7, [x0, #0] //AES block 4k+4 - load plaintext - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif aese v0.16b, v19.16b aesmc v0.16b, v0.16b //AES block 4k+4 - round 1 rev w9, w12 //CTR block 4k+8 @@ -395,7 +427,10 @@ aes_gcm_enc_128_kernel: aese v1.16b, v23.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 5 ldp x19, x20, [x0, #16] //AES block 4k+5 - load plaintext - +#ifdef __AARCH64EB__ + rev x19, x19 + rev x20, x20 +#endif aese v3.16b, v21.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 3 eor v10.16b, v10.16b, v31.16b //GHASH block 4k+2 - mid @@ -403,7 +438,10 @@ aes_gcm_enc_128_kernel: aese v0.16b, v23.16b aesmc v0.16b, v0.16b //AES block 4k+4 - round 5 ldp x21, x22, [x0, #32] //AES block 4k+6 - load plaintext - +#ifdef __AARCH64EB__ + rev x21, x21 + rev x22, x22 +#endif pmull v31.1q, v9.1d, v8.1d //MODULO - top 64b align with mid eor v11.16b, v11.16b, v29.16b //GHASH block 4k+3 - low @@ -712,7 +750,10 @@ aes_gcm_enc_128_kernel: sub x5, x4, x0 //main_end_input_ptr is number of bytes left to process ldp x6, x7, [x0], #16 //AES block 4k+4 - load plaintext - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif cmp x5, #48 ext v8.16b, v11.16b, v11.16b, #8 //prepare final partial tag @@ -750,7 +791,10 @@ aes_gcm_enc_128_kernel: st1 { v5.16b}, [x2], #16 //AES final-3 block - store result ldp x6, x7, [x0], #16 //AES final-2 block - load input low & high - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif rev64 v4.16b, v5.16b //GHASH final-3 block eor v4.16b, v4.16b, v8.16b //feed in partial tag @@ -779,7 +823,10 @@ aes_gcm_enc_128_kernel: rev64 v4.16b, v5.16b //GHASH final-2 block ldp x6, x7, [x0], #16 //AES final-1 block - load input low & high - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif eor v4.16b, v4.16b, v8.16b //feed in partial tag eor x6, x6, x13 //AES final-1 block - round 10 low @@ -813,7 +860,10 @@ aes_gcm_enc_128_kernel: rev64 v4.16b, v5.16b //GHASH final-1 block ldp x6, x7, [x0], #16 //AES final block - load input low & high - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif eor v4.16b, v4.16b, v8.16b //feed in partial tag eor x7, x7, x14 //AES final block - round 10 high @@ -876,9 +926,11 @@ aes_gcm_enc_128_kernel: ld1 { v18.16b}, [x2] //load existing bytes where the possibly partial last block is to be stored eor v8.8b, v8.8b, v4.8b //GHASH final block - mid - +#ifndef __AARCH64EB__ rev w9, w12 - +#else + mov w9, w12 +#endif pmull2 v20.1q, v4.2d, v12.2d //GHASH final block - high pmull v8.1q, v8.1d, v16.1d //GHASH final block - mid @@ -951,20 +1003,29 @@ aes_gcm_dec_128_kernel: lsr x5, x1, #3 //byte_len mov x15, x5 ldp x10, x11, [x16] //ctr96_b64, ctr96_t32 - +#ifdef __AARCH64EB__ + rev x10, x10 + rev x11, x11 +#endif + ldp x13, x14, [x8, #160] //load rk10 +#ifdef __AARCH64EB__ + ror x14, x14, 32 + ror x13, x13, 32 +#endif sub x5, x5, #1 //byte_len - 1 - ldr q18, [x8, #0] //load rk0 + ld1 {v18.4s}, [x8], #16 //load rk0 and x5, x5, #0xffffffffffffffc0 //number of bytes to be processed in main loop (at least 1 byte must be handled by tail) ld1 { v0.16b}, [x16] //special case vector load initial counter so we can start first AES block as quickly as possible ldr q13, [x3, #64] //load h2l | h2h +#ifndef __AARCH64EB__ ext v13.16b, v13.16b, v13.16b, #8 - +#endif lsr x12, x11, #32 fmov d2, x10 //CTR block 2 - ldr q19, [x8, #16] //load rk1 + ld1 {v19.4s}, [x8], #16 //load rk1 orr w11, w11, w11 rev w12, w12 //rev_ctr32 @@ -976,7 +1037,7 @@ aes_gcm_dec_128_kernel: rev w9, w12 //CTR block 1 orr x9, x11, x9, lsl #32 //CTR block 1 - ldr q20, [x8, #32] //load rk2 + ld1 {v20.4s}, [x8], #16 //load rk2 add w12, w12, #1 //CTR block 1 fmov v1.d[1], x9 //CTR block 1 @@ -999,19 +1060,19 @@ aes_gcm_dec_128_kernel: aese v1.16b, v18.16b aesmc v1.16b, v1.16b //AES block 1 - round 0 - ldr q21, [x8, #48] //load rk3 + ld1 {v21.4s}, [x8], #16 //load rk3 aese v0.16b, v20.16b aesmc v0.16b, v0.16b //AES block 0 - round 2 - ldr q24, [x8, #96] //load rk6 + ld1 {v22.4s}, [x8], #16 //load rk4 aese v2.16b, v18.16b aesmc v2.16b, v2.16b //AES block 2 - round 0 - ldr q25, [x8, #112] //load rk7 + ld1 {v23.4s}, [x8], #16 //load rk5 aese v1.16b, v19.16b aesmc v1.16b, v1.16b //AES block 1 - round 1 - ldr q22, [x8, #64] //load rk4 + ld1 {v24.4s}, [x8], #16 //load rk6 aese v3.16b, v18.16b aesmc v3.16b, v3.16b //AES block 3 - round 0 @@ -1021,7 +1082,6 @@ aes_gcm_dec_128_kernel: aese v1.16b, v20.16b aesmc v1.16b, v1.16b //AES block 1 - round 2 - ldp x13, x14, [x8, #160] //load rk10 aese v3.16b, v19.16b aesmc v3.16b, v3.16b //AES block 3 - round 1 @@ -1031,7 +1091,7 @@ aes_gcm_dec_128_kernel: aese v0.16b, v21.16b aesmc v0.16b, v0.16b //AES block 0 - round 3 - ldr q23, [x8, #80] //load rk5 + ld1 {v25.4s}, [x8], #16 //load rk7 aese v1.16b, v21.16b aesmc v1.16b, v1.16b //AES block 1 - round 3 @@ -1041,7 +1101,7 @@ aes_gcm_dec_128_kernel: aese v2.16b, v20.16b aesmc v2.16b, v2.16b //AES block 2 - round 2 - ldr q27, [x8, #144] //load rk9 + ld1 {v26.4s}, [x8], #16 //load rk8 aese v1.16b, v22.16b aesmc v1.16b, v1.16b //AES block 1 - round 4 @@ -1052,11 +1112,12 @@ aes_gcm_dec_128_kernel: aese v2.16b, v21.16b aesmc v2.16b, v2.16b //AES block 2 - round 3 ldr q14, [x3, #80] //load h3l | h3h +#ifndef __AARCH64EB__ ext v14.16b, v14.16b, v14.16b, #8 - +#endif aese v0.16b, v22.16b aesmc v0.16b, v0.16b //AES block 0 - round 4 - ldr q26, [x8, #128] //load rk8 + ld1 {v27.4s}, [x8], #16 //load rk9 aese v1.16b, v23.16b aesmc v1.16b, v1.16b //AES block 1 - round 5 @@ -1073,8 +1134,9 @@ aes_gcm_dec_128_kernel: aese v2.16b, v23.16b aesmc v2.16b, v2.16b //AES block 2 - round 5 ldr q12, [x3, #32] //load h1l | h1h +#ifndef __AARCH64EB__ ext v12.16b, v12.16b, v12.16b, #8 - +#endif aese v3.16b, v23.16b aesmc v3.16b, v3.16b //AES block 3 - round 5 @@ -1092,7 +1154,9 @@ aes_gcm_dec_128_kernel: trn1 v8.2d, v12.2d, v13.2d //h2h | h1h ldr q15, [x3, #112] //load h4l | h4h +#ifndef __AARCH64EB__ ext v15.16b, v15.16b, v15.16b, #8 +#endif trn2 v16.2d, v12.2d, v13.2d //h2l | h1l add x5, x5, x0 @@ -1134,12 +1198,10 @@ aes_gcm_dec_128_kernel: eor v17.16b, v17.16b, v9.16b //h4k | h3k b.ge .L128_dec_tail //handle tail - ldr q5, [x0, #16] //AES block 1 - load ciphertext - - ldr q4, [x0, #0] //AES block 0 - load ciphertext + ld1 {v4.16b, v5.16b}, [x0], #32 //AES block 0 - load ciphertext; AES block 1 - load ciphertext eor v1.16b, v5.16b, v1.16b //AES block 1 - result - ldr q6, [x0, #32] //AES block 2 - load ciphertext + ld1 {v6.16b}, [x0], #16 //AES block 2 - load ciphertext eor v0.16b, v4.16b, v0.16b //AES block 0 - result rev64 v4.16b, v4.16b //GHASH block 0 @@ -1147,10 +1209,9 @@ aes_gcm_dec_128_kernel: orr x9, x11, x9, lsl #32 //CTR block 4 add w12, w12, #1 //CTR block 4 - ldr q7, [x0, #48] //AES block 3 - load ciphertext + ld1 {v7.16b}, [x0], #16 //AES block 3 - load ciphertext rev64 v5.16b, v5.16b //GHASH block 1 - add x0, x0, #64 //AES input_ptr update mov x19, v1.d[0] //AES block 1 - mov low mov x20, v1.d[1] //AES block 1 - mov high @@ -1165,7 +1226,9 @@ aes_gcm_dec_128_kernel: fmov v0.d[1], x9 //CTR block 4 rev w9, w12 //CTR block 5 eor x19, x19, x13 //AES block 1 - round 10 low - +#ifdef __AARCH64EB__ + rev x19, x19 +#endif fmov d1, x10 //CTR block 5 add w12, w12, #1 //CTR block 5 orr x9, x11, x9, lsl #32 //CTR block 5 @@ -1177,10 +1240,19 @@ aes_gcm_dec_128_kernel: orr x9, x11, x9, lsl #32 //CTR block 6 eor x20, x20, x14 //AES block 1 - round 10 high +#ifdef __AARCH64EB__ + rev x20, x20 +#endif eor x6, x6, x13 //AES block 0 - round 10 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif eor v2.16b, v6.16b, v2.16b //AES block 2 - result eor x7, x7, x14 //AES block 0 - round 10 high +#ifdef __AARCH64EB__ + rev x7, x7 +#endif stp x6, x7, [x2], #16 //AES block 0 - store result stp x19, x20, [x2], #16 //AES block 1 - store result @@ -1248,9 +1320,14 @@ aes_gcm_dec_128_kernel: aese v3.16b, v19.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 1 eor x23, x23, x13 //AES block 4k+3 - round 10 low - +#ifdef __AARCH64EB__ + rev x23, x23 +#endif pmull v30.1q, v30.1d, v17.1d //GHASH block 4k+1 - mid eor x22, x22, x14 //AES block 4k+2 - round 10 high +#ifdef __AARCH64EB__ + rev x22, x22 +#endif mov d31, v6.d[1] //GHASH block 4k+2 - mid aese v0.16b, v19.16b @@ -1288,7 +1365,9 @@ aes_gcm_dec_128_kernel: pmull2 v31.1q, v31.2d, v16.2d //GHASH block 4k+2 - mid eor x24, x24, x14 //AES block 4k+3 - round 10 high - +#ifdef __AARCH64EB__ + rev x24, x24 +#endif aese v2.16b, v20.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 2 eor v30.8b, v30.8b, v7.8b //GHASH block 4k+3 - mid @@ -1296,7 +1375,9 @@ aes_gcm_dec_128_kernel: aese v1.16b, v23.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 5 eor x21, x21, x13 //AES block 4k+2 - round 10 low - +#ifdef __AARCH64EB__ + rev x21, x21 +#endif aese v0.16b, v23.16b aesmc v0.16b, v0.16b //AES block 4k+4 - round 5 movi v8.8b, #0xc2 @@ -1318,7 +1399,7 @@ aes_gcm_dec_128_kernel: pmull v30.1q, v30.1d, v16.1d //GHASH block 4k+3 - mid eor v9.16b, v9.16b, v4.16b //GHASH block 4k+3 - high - ldr q4, [x0, #0] //AES block 4k+4 - load ciphertext + ld1 {v4.16b}, [x0], #16 //AES block 4k+3 - load ciphertext aese v1.16b, v25.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 7 @@ -1345,7 +1426,7 @@ aes_gcm_dec_128_kernel: rev w9, w12 //CTR block 4k+8 pmull v31.1q, v9.1d, v8.1d //MODULO - top 64b align with mid - ldr q5, [x0, #16] //AES block 4k+5 - load ciphertext + ld1 {v5.16b}, [x0], #16 //AES block 4k+4 - load ciphertext ext v9.16b, v9.16b, v9.16b, #8 //MODULO - other top alignment aese v0.16b, v27.16b //AES block 4k+4 - round 9 @@ -1363,7 +1444,7 @@ aes_gcm_dec_128_kernel: aese v3.16b, v23.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 5 - ldr q6, [x0, #32] //AES block 4k+6 - load ciphertext + ld1 {v6.16b}, [x0], #16 //AES block 4k+5 - load ciphertext add w12, w12, #1 //CTR block 4k+8 eor v10.16b, v10.16b, v31.16b //MODULO - fold into mid @@ -1371,11 +1452,10 @@ aes_gcm_dec_128_kernel: aese v2.16b, v25.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 7 - ldr q7, [x0, #48] //AES block 4k+3 - load ciphertext + ld1 {v7.16b}, [x0], #16 //AES block 4k+6 - load ciphertext aese v3.16b, v24.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 6 - add x0, x0, #64 //AES input_ptr update rev64 v5.16b, v5.16b //GHASH block 4k+5 eor v10.16b, v10.16b, v9.16b //MODULO - fold into mid @@ -1400,11 +1480,15 @@ aes_gcm_dec_128_kernel: aese v3.16b, v26.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 8 eor x7, x7, x14 //AES block 4k+4 - round 10 high - +#ifdef __AARCH64EB__ + rev x7, x7 +#endif eor v11.16b, v11.16b, v8.16b //MODULO - fold into low mov x20, v1.d[1] //AES block 4k+5 - mov high eor x6, x6, x13 //AES block 4k+4 - round 10 low - +#ifdef __AARCH64EB__ + rev x6, x6 +#endif eor v2.16b, v6.16b, v2.16b //AES block 4k+6 - result mov x19, v1.d[0] //AES block 4k+5 - mov low add w12, w12, #1 //CTR block 4k+9 @@ -1421,9 +1505,15 @@ aes_gcm_dec_128_kernel: add w12, w12, #1 //CTR block 4k+10 eor x20, x20, x14 //AES block 4k+5 - round 10 high +#ifdef __AARCH64EB__ + rev x20, x20 +#endif stp x6, x7, [x2], #16 //AES block 4k+4 - store result eor x19, x19, x13 //AES block 4k+5 - round 10 low +#ifdef __AARCH64EB__ + rev x19, x19 +#endif stp x19, x20, [x2], #16 //AES block 4k+5 - store result orr x9, x11, x9, lsl #32 //CTR block 4k+10 @@ -1528,9 +1618,14 @@ aes_gcm_dec_128_kernel: aese v3.16b, v20.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 2 eor x23, x23, x13 //AES block 4k+3 - round 10 low - +#ifdef __AARCH64EB__ + rev x23, x23 +#endif pmull v30.1q, v30.1d, v16.1d //GHASH block 4k+3 - mid eor x21, x21, x13 //AES block 4k+2 - round 10 low +#ifdef __AARCH64EB__ + rev x21, x21 +#endif eor v11.16b, v11.16b, v29.16b //GHASH block 4k+3 - low aese v2.16b, v21.16b @@ -1603,7 +1698,9 @@ aes_gcm_dec_128_kernel: pmull v8.1q, v10.1d, v8.1d //MODULO - mid 64b align with low eor x24, x24, x14 //AES block 4k+3 - round 10 high - +#ifdef __AARCH64EB__ + rev x24, x24 +#endif aese v2.16b, v25.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 7 ext v10.16b, v10.16b, v10.16b, #8 //MODULO - other mid alignment @@ -1621,7 +1718,9 @@ aes_gcm_dec_128_kernel: aese v3.16b, v26.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 8 eor x22, x22, x14 //AES block 4k+2 - round 10 high - +#ifdef __AARCH64EB__ + rev x22, x22 +#endif aese v0.16b, v27.16b //AES block 4k+4 - round 9 stp x21, x22, [x2], #16 //AES block 4k+2 - store result @@ -1645,9 +1744,14 @@ aes_gcm_dec_128_kernel: cmp x5, #48 eor x7, x7, x14 //AES block 4k+4 - round 10 high - +#ifdef __AARCH64EB__ + rev x7, x7 +#endif ext v8.16b, v11.16b, v11.16b, #8 //prepare final partial tag eor x6, x6, x13 //AES block 4k+4 - round 10 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif b.gt .L128_dec_blocks_more_than_3 mov v3.16b, v2.16b @@ -1691,9 +1795,14 @@ aes_gcm_dec_128_kernel: movi v8.8b, #0 //suppress further partial tag feed in eor x7, x7, x14 //AES final-2 block - round 10 high - +#ifdef __AARCH64EB__ + rev x7, x7 +#endif pmull v10.1q, v22.1d, v10.1d //GHASH final-3 block - mid eor x6, x6, x13 //AES final-2 block - round 10 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif .L128_dec_blocks_more_than_2: //blocks left > 2 rev64 v4.16b, v5.16b //GHASH final-2 block @@ -1719,12 +1828,18 @@ aes_gcm_dec_128_kernel: pmull v22.1q, v22.1d, v17.1d //GHASH final-2 block - mid eor x6, x6, x13 //AES final-1 block - round 10 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif eor v11.16b, v11.16b, v21.16b //GHASH final-2 block - low eor v9.16b, v9.16b, v20.16b //GHASH final-2 block - high eor v10.16b, v10.16b, v22.16b //GHASH final-2 block - mid eor x7, x7, x14 //AES final-1 block - round 10 high +#ifdef __AARCH64EB__ + rev x7, x7 +#endif .L128_dec_blocks_more_than_1: //blocks left > 1 rev64 v4.16b, v5.16b //GHASH final-1 block @@ -1755,8 +1870,13 @@ aes_gcm_dec_128_kernel: eor v9.16b, v9.16b, v20.16b //GHASH final-1 block - high eor x7, x7, x14 //AES final block - round 10 high - +#ifdef __AARCH64EB__ + rev x7, x7 +#endif eor x6, x6, x13 //AES final block - round 10 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif eor v10.16b, v10.16b, v22.16b //GHASH final-1 block - mid .L128_dec_blocks_less_than_1: //blocks left <= 1 @@ -1802,7 +1922,11 @@ aes_gcm_dec_128_kernel: bic x4, x4, x9 //mask out low existing bytes and x6, x6, x9 +#ifndef __AARCH64EB__ rev w9, w12 +#else + mov w9, w12 +#endif eor v10.16b, v10.16b, v8.16b //GHASH final block - mid movi v8.8b, #0xc2 @@ -1869,18 +1993,26 @@ aes_gcm_enc_192_kernel: stp d14, d15, [sp, #96] ldp x10, x11, [x16] //ctr96_b64, ctr96_t32 +#ifdef __AARCH64EB__ + rev x10, x10 + rev x11, x11 +#endif + ldp x13, x14, [x8, #192] //load rk12 +#ifdef __AARCH64EB__ + ror x13, x13, #32 + ror x14, x14, #32 +#endif + ld1 {v18.4s}, [x8], #16 //load rk0 - ldr q23, [x8, #80] //load rk5 - - ldr q22, [x8, #64] //load rk4 + ld1 {v19.4s}, [x8], #16 //load rk1 - ldr q26, [x8, #128] //load rk8 + ld1 {v20.4s}, [x8], #16 //load rk2 lsr x12, x11, #32 - ldr q24, [x8, #96] //load rk6 + ld1 {v21.4s}, [x8], #16 //load rk3 orr w11, w11, w11 - ldr q25, [x8, #112] //load rk7 + ld1 {v22.4s}, [x8], #16 //load rk4 rev w12, w12 //rev_ctr32 add w12, w12, #1 //increment rev_ctr32 @@ -1904,15 +2036,13 @@ aes_gcm_enc_192_kernel: rev w9, w12 //CTR block 3 orr x9, x11, x9, lsl #32 //CTR block 3 - ldr q18, [x8, #0] //load rk0 + ld1 {v23.4s}, [x8], #16 //load rk5 fmov v3.d[1], x9 //CTR block 3 - ldr q21, [x8, #48] //load rk3 + ld1 {v24.4s}, [x8], #16 //load rk6 - ldp x13, x14, [x8, #192] //load rk12 - - ldr q19, [x8, #16] //load rk1 + ld1 {v25.4s}, [x8], #16 //load rk7 aese v0.16b, v18.16b aesmc v0.16b, v0.16b //AES block 0 - round 0 @@ -1922,35 +2052,38 @@ aes_gcm_enc_192_kernel: aese v3.16b, v18.16b aesmc v3.16b, v3.16b //AES block 3 - round 0 - ldr q29, [x8, #176] //load rk11 + ld1 {v26.4s}, [x8], #16 //load rk8 aese v1.16b, v18.16b aesmc v1.16b, v1.16b //AES block 1 - round 0 ldr q15, [x3, #112] //load h4l | h4h +#ifndef __AARCH64EB__ ext v15.16b, v15.16b, v15.16b, #8 - +#endif aese v2.16b, v18.16b aesmc v2.16b, v2.16b //AES block 2 - round 0 - ldr q20, [x8, #32] //load rk2 + ld1 {v27.4s}, [x8], #16 //load rk9 aese v0.16b, v19.16b aesmc v0.16b, v0.16b //AES block 0 - round 1 - ldr q28, [x8, #160] //load rk10 + ld1 {v28.4s}, [x8], #16 //load rk10 aese v1.16b, v19.16b aesmc v1.16b, v1.16b //AES block 1 - round 1 ldr q12, [x3, #32] //load h1l | h1h +#ifndef __AARCH64EB__ ext v12.16b, v12.16b, v12.16b, #8 - +#endif aese v2.16b, v19.16b aesmc v2.16b, v2.16b //AES block 2 - round 1 - ldr q27, [x8, #144] //load rk9 + ld1 {v29.4s}, [x8], #16 //load rk11 aese v3.16b, v19.16b aesmc v3.16b, v3.16b //AES block 3 - round 1 ldr q14, [x3, #80] //load h3l | h3h +#ifndef __AARCH64EB__ ext v14.16b, v14.16b, v14.16b, #8 - +#endif aese v0.16b, v20.16b aesmc v0.16b, v0.16b //AES block 0 - round 2 @@ -2007,8 +2140,9 @@ aes_gcm_enc_192_kernel: aese v2.16b, v24.16b aesmc v2.16b, v2.16b //AES block 2 - round 6 ldr q13, [x3, #64] //load h2l | h2h +#ifndef __AARCH64EB__ ext v13.16b, v13.16b, v13.16b, #8 - +#endif aese v1.16b, v24.16b aesmc v1.16b, v1.16b //AES block 1 - round 6 @@ -2088,13 +2222,26 @@ aes_gcm_enc_192_kernel: rev w9, w12 //CTR block 4 ldp x6, x7, [x0, #0] //AES block 0 - load plaintext - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif orr x9, x11, x9, lsl #32 //CTR block 4 ldp x21, x22, [x0, #32] //AES block 2 - load plaintext - +#ifdef __AARCH64EB__ + rev x21, x21 + rev x22, x22 +#endif ldp x23, x24, [x0, #48] //AES block 3 - load plaintext - +#ifdef __AARCH64EB__ + rev x23, x23 + rev x24, x24 +#endif ldp x19, x20, [x0, #16] //AES block 1 - load plaintext +#ifdef __AARCH64EB__ + rev x19, x19 + rev x20, x20 +#endif add x0, x0, #64 //AES input_ptr update cmp x0, x5 //check if we have <= 8 blocks @@ -2166,7 +2313,10 @@ aes_gcm_enc_192_kernel: aese v1.16b, v18.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 0 ldp x19, x20, [x0, #16] //AES block 4k+5 - load plaintext - +#ifdef __AARCH64EB__ + rev x19, x19 + rev x20, x20 +#endif ext v11.16b, v11.16b, v11.16b, #8 //PRE 0 fmov d3, x10 //CTR block 4k+3 rev64 v4.16b, v4.16b //GHASH block 4k (only t0 is free) @@ -2178,11 +2328,17 @@ aes_gcm_enc_192_kernel: pmull2 v30.1q, v5.2d, v14.2d //GHASH block 4k+1 - high rev64 v7.16b, v7.16b //GHASH block 4k+3 (t0, t1, t2 and t3 free) ldp x21, x22, [x0, #32] //AES block 4k+6 - load plaintext - +#ifdef __AARCH64EB__ + rev x21, x21 + rev x22, x22 +#endif aese v0.16b, v18.16b aesmc v0.16b, v0.16b //AES block 4k+4 - round 0 ldp x23, x24, [x0, #48] //AES block 4k+3 - load plaintext - +#ifdef __AARCH64EB__ + rev x23, x23 + rev x24, x24 +#endif pmull v31.1q, v5.1d, v14.1d //GHASH block 4k+1 - low eor v4.16b, v4.16b, v11.16b //PRE 1 @@ -2275,7 +2431,10 @@ aes_gcm_enc_192_kernel: aese v1.16b, v22.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 4 ldp x6, x7, [x0, #0] //AES block 4k+4 - load plaintext - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif aese v0.16b, v24.16b aesmc v0.16b, v0.16b //AES block 4k+4 - round 6 eor v11.16b, v11.16b, v8.16b //GHASH block 4k+2 - low @@ -2640,7 +2799,10 @@ aes_gcm_enc_192_kernel: sub x5, x4, x0 //main_end_input_ptr is number of bytes left to process ldp x6, x7, [x0], #16 //AES block 4k+4 - load plaintext - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif eor x6, x6, x13 //AES block 4k+4 - round 12 low eor x7, x7, x14 //AES block 4k+4 - round 12 high @@ -2677,7 +2839,10 @@ aes_gcm_enc_192_kernel: st1 { v5.16b}, [x2], #16 //AES final-3 block - store result ldp x6, x7, [x0], #16 //AES final-2 block - load input low & high - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif rev64 v4.16b, v5.16b //GHASH final-3 block eor x6, x6, x13 //AES final-2 block - round 12 low @@ -2708,7 +2873,10 @@ aes_gcm_enc_192_kernel: rev64 v4.16b, v5.16b //GHASH final-2 block ldp x6, x7, [x0], #16 //AES final-1 block - load input low & high - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif eor v4.16b, v4.16b, v8.16b //feed in partial tag eor x7, x7, x14 //AES final-1 block - round 12 high @@ -2739,7 +2907,10 @@ aes_gcm_enc_192_kernel: st1 { v5.16b}, [x2], #16 //AES final-1 block - store result ldp x6, x7, [x0], #16 //AES final block - load input low & high - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif rev64 v4.16b, v5.16b //GHASH final-1 block eor x6, x6, x13 //AES final block - round 12 low @@ -2771,7 +2942,11 @@ aes_gcm_enc_192_kernel: .L192_enc_blocks_less_than_1: //blocks left <= 1 ld1 { v18.16b}, [x2] //load existing bytes where the possibly partial last block is to be stored +#ifndef __AARCH64EB__ rev w9, w12 +#else + mov w9, w12 +#endif and x1, x1, #127 //bit_length %= 128 sub x1, x1, #128 //bit_length -= 128 @@ -2876,14 +3051,22 @@ aes_gcm_dec_192_kernel: add x4, x0, x1, lsr #3 //end_input_ptr ldp x10, x11, [x16] //ctr96_b64, ctr96_t32 - +#ifdef __AARCH64EB__ + rev x10, x10 + rev x11, x11 +#endif + ldp x13, x14, [x8, #192] //load rk12 +#ifdef __AARCH64EB__ + ror x13, x13, #32 + ror x14, x14, #32 +#endif ld1 { v0.16b}, [x16] //special case vector load initial counter so we can start first AES block as quickly as possible - ldr q18, [x8, #0] //load rk0 + ld1 {v18.4s}, [x8], #16 //load rk0 lsr x5, x1, #3 //byte_len mov x15, x5 - ldr q20, [x8, #32] //load rk2 + ld1 {v19.4s}, [x8], #16 //load rk1 lsr x12, x11, #32 orr w11, w11, w11 @@ -2893,7 +3076,7 @@ aes_gcm_dec_192_kernel: fmov d1, x10 //CTR block 1 add w12, w12, #1 //increment rev_ctr32 - ldr q19, [x8, #16] //load rk1 + ld1 {v20.4s}, [x8], #16 //load rk2 aese v0.16b, v18.16b aesmc v0.16b, v0.16b //AES block 0 - round 0 @@ -2901,7 +3084,7 @@ aes_gcm_dec_192_kernel: add w12, w12, #1 //CTR block 1 orr x9, x11, x9, lsl #32 //CTR block 1 - ldr q21, [x8, #48] //load rk3 + ld1 {v21.4s}, [x8], #16 //load rk3 fmov v1.d[1], x9 //CTR block 1 rev w9, w12 //CTR block 2 @@ -2919,54 +3102,57 @@ aes_gcm_dec_192_kernel: fmov v3.d[1], x9 //CTR block 3 - ldr q26, [x8, #128] //load rk8 + ld1 {v22.4s}, [x8], #16 //load rk4 aese v0.16b, v20.16b aesmc v0.16b, v0.16b //AES block 0 - round 2 aese v2.16b, v18.16b aesmc v2.16b, v2.16b //AES block 2 - round 0 - ldr q29, [x8, #176] //load rk11 + ld1 {v23.4s}, [x8], #16 //load rk5 aese v1.16b, v18.16b aesmc v1.16b, v1.16b //AES block 1 - round 0 ldr q15, [x3, #112] //load h4l | h4h +#ifndef __AARCH64EB__ ext v15.16b, v15.16b, v15.16b, #8 - +#endif aese v3.16b, v18.16b aesmc v3.16b, v3.16b //AES block 3 - round 0 ldr q13, [x3, #64] //load h2l | h2h +#ifndef __AARCH64EB__ ext v13.16b, v13.16b, v13.16b, #8 - +#endif aese v2.16b, v19.16b aesmc v2.16b, v2.16b //AES block 2 - round 1 ldr q14, [x3, #80] //load h3l | h3h +#ifndef __AARCH64EB__ ext v14.16b, v14.16b, v14.16b, #8 - +#endif aese v1.16b, v19.16b aesmc v1.16b, v1.16b //AES block 1 - round 1 - ldp x13, x14, [x8, #192] //load rk12 aese v3.16b, v19.16b aesmc v3.16b, v3.16b //AES block 3 - round 1 ldr q12, [x3, #32] //load h1l | h1h +#ifndef __AARCH64EB__ ext v12.16b, v12.16b, v12.16b, #8 - +#endif aese v2.16b, v20.16b aesmc v2.16b, v2.16b //AES block 2 - round 2 - ldr q28, [x8, #160] //load rk10 + ld1 {v24.4s}, [x8], #16 //load rk6 aese v0.16b, v21.16b aesmc v0.16b, v0.16b //AES block 0 - round 3 - ldr q27, [x8, #144] //load rk9 + ld1 {v25.4s}, [x8], #16 //load rk7 aese v1.16b, v20.16b aesmc v1.16b, v1.16b //AES block 1 - round 2 - ldr q25, [x8, #112] //load rk7 + ld1 {v26.4s}, [x8], #16 //load rk8 aese v3.16b, v20.16b aesmc v3.16b, v3.16b //AES block 3 - round 2 - ldr q22, [x8, #64] //load rk4 + ld1 {v27.4s}, [x8], #16 //load rk9 aese v2.16b, v21.16b aesmc v2.16b, v2.16b //AES block 2 - round 3 @@ -2984,7 +3170,7 @@ aes_gcm_dec_192_kernel: aese v0.16b, v22.16b aesmc v0.16b, v0.16b //AES block 0 - round 4 - ldr q23, [x8, #80] //load rk5 + ld1 {v28.4s}, [x8], #16 //load rk10 aese v1.16b, v22.16b aesmc v1.16b, v1.16b //AES block 1 - round 4 @@ -2999,7 +3185,7 @@ aes_gcm_dec_192_kernel: aese v0.16b, v23.16b aesmc v0.16b, v0.16b //AES block 0 - round 5 - ldr q24, [x8, #96] //load rk6 + ld1 {v29.4s}, [x8], #16 //load rk11 aese v1.16b, v23.16b aesmc v1.16b, v1.16b //AES block 1 - round 5 @@ -3086,17 +3272,13 @@ aes_gcm_dec_192_kernel: aese v0.16b, v29.16b //AES block 0 - round 11 b.ge .L192_dec_tail //handle tail - ldr q5, [x0, #16] //AES block 1 - load ciphertext - - ldr q4, [x0, #0] //AES block 0 - load ciphertext + ld1 {v4.16b, v5.16b}, [x0], #32 //AES block 0,1 - load ciphertext eor v1.16b, v5.16b, v1.16b //AES block 1 - result eor v0.16b, v4.16b, v0.16b //AES block 0 - result rev w9, w12 //CTR block 4 - ldr q7, [x0, #48] //AES block 3 - load ciphertext - - ldr q6, [x0, #32] //AES block 2 - load ciphertext + ld1 {v6.16b, v7.16b}, [x0], #32 //AES block 2,3 - load ciphertext mov x19, v1.d[0] //AES block 1 - mov low @@ -3108,27 +3290,35 @@ aes_gcm_dec_192_kernel: mov x7, v0.d[1] //AES block 0 - mov high rev64 v4.16b, v4.16b //GHASH block 0 - add x0, x0, #64 //AES input_ptr update fmov d0, x10 //CTR block 4 rev64 v5.16b, v5.16b //GHASH block 1 cmp x0, x5 //check if we have <= 8 blocks eor x19, x19, x13 //AES block 1 - round 12 low +#ifdef __AARCH64EB__ + rev x19, x19 +#endif fmov v0.d[1], x9 //CTR block 4 rev w9, w12 //CTR block 5 orr x9, x11, x9, lsl #32 //CTR block 5 fmov d1, x10 //CTR block 5 eor x20, x20, x14 //AES block 1 - round 12 high - +#ifdef __AARCH64EB__ + rev x20, x20 +#endif add w12, w12, #1 //CTR block 5 fmov v1.d[1], x9 //CTR block 5 eor x6, x6, x13 //AES block 0 - round 12 low - +#ifdef __AARCH64EB__ + rev x6, x6 +#endif rev w9, w12 //CTR block 6 eor x7, x7, x14 //AES block 0 - round 12 high - +#ifdef __AARCH64EB__ + rev x7, x7 +#endif stp x6, x7, [x2], #16 //AES block 0 - store result orr x9, x11, x9, lsl #32 //CTR block 6 @@ -3191,7 +3381,9 @@ aes_gcm_dec_192_kernel: aese v0.16b, v20.16b aesmc v0.16b, v0.16b //AES block 4k+4 - round 2 eor x22, x22, x14 //AES block 4k+2 - round 12 high - +#ifdef __AARCH64EB__ + rev x22, x22 +#endif aese v2.16b, v19.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 1 eor v4.8b, v4.8b, v5.8b //GHASH block 4k+1 - mid @@ -3208,7 +3400,9 @@ aes_gcm_dec_192_kernel: pmull v4.1q, v4.1d, v17.1d //GHASH block 4k+1 - mid eor v11.16b, v11.16b, v31.16b //GHASH block 4k+1 - low eor x21, x21, x13 //AES block 4k+2 - round 12 low - +#ifdef __AARCH64EB__ + rev x21, x21 +#endif aese v1.16b, v22.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 4 @@ -3310,16 +3504,18 @@ aes_gcm_dec_192_kernel: aese v2.16b, v24.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 6 - ldr q6, [x0, #32] //AES block 4k+6 - load ciphertext + ld1 {v4.16b}, [x0], #16 //AES block 4k+4 - load ciphertext aese v3.16b, v24.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 6 eor v10.16b, v10.16b, v30.16b //MODULO - karatsuba tidy up pmull v31.1q, v9.1d, v8.1d //MODULO - top 64b align with mid - ldr q7, [x0, #48] //AES block 4k+7 - load ciphertext + ld1 {v5.16b}, [x0], #16 //AES block 4k+5 - load ciphertext eor x23, x23, x13 //AES block 4k+3 - round 12 low - +#ifdef __AARCH64EB__ + rev x23, x23 +#endif aese v2.16b, v25.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 7 ext v9.16b, v9.16b, v9.16b, #8 //MODULO - other top alignment @@ -3333,10 +3529,10 @@ aes_gcm_dec_192_kernel: aese v2.16b, v26.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 8 - ldr q4, [x0, #0] //AES block 4k+4 - load ciphertext + ld1 {v6.16b}, [x0], #16 //AES block 4k+6 - load ciphertext aese v1.16b, v29.16b //AES block 4k+5 - round 11 - ldr q5, [x0, #16] //AES block 4k+5 - load ciphertext + ld1 {v7.16b}, [x0], #16 //AES block 4k+7 - load ciphertext rev w9, w12 //CTR block 4k+8 aese v3.16b, v26.16b @@ -3347,11 +3543,13 @@ aes_gcm_dec_192_kernel: aesmc v2.16b, v2.16b //AES block 4k+6 - round 9 eor v10.16b, v10.16b, v9.16b //MODULO - fold into mid - add x0, x0, #64 //AES input_ptr update cmp x0, x5 //.LOOP CONTROL eor v0.16b, v4.16b, v0.16b //AES block 4k+4 - result eor x24, x24, x14 //AES block 4k+3 - round 12 high +#ifdef __AARCH64EB__ + rev x24, x24 +#endif eor v1.16b, v5.16b, v1.16b //AES block 4k+5 - result aese v2.16b, v28.16b @@ -3384,18 +3582,28 @@ aes_gcm_dec_192_kernel: rev w9, w12 //CTR block 4k+9 eor x6, x6, x13 //AES block 4k+4 - round 12 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif orr x9, x11, x9, lsl #32 //CTR block 4k+9 eor v11.16b, v11.16b, v8.16b //MODULO - fold into low fmov d1, x10 //CTR block 4k+9 add w12, w12, #1 //CTR block 4k+9 eor x19, x19, x13 //AES block 4k+5 - round 12 low - +#ifdef __AARCH64EB__ + rev x19, x19 +#endif fmov v1.d[1], x9 //CTR block 4k+9 rev w9, w12 //CTR block 4k+10 eor x20, x20, x14 //AES block 4k+5 - round 12 high - +#ifdef __AARCH64EB__ + rev x20, x20 +#endif eor x7, x7, x14 //AES block 4k+4 - round 12 high +#ifdef __AARCH64EB__ + rev x7, x7 +#endif stp x6, x7, [x2], #16 //AES block 4k+4 - store result eor v11.16b, v11.16b, v10.16b //MODULO - fold into low @@ -3449,18 +3657,29 @@ aes_gcm_dec_192_kernel: pmull v31.1q, v5.1d, v14.1d //GHASH block 4k+1 - low eor x24, x24, x14 //AES block 4k+3 - round 12 high +#ifdef __AARCH64EB__ + rev x24, x24 +#endif fmov v3.d[1], x9 //CTR block 4k+7 aese v0.16b, v20.16b aesmc v0.16b, v0.16b //AES block 4k+4 - round 2 eor x21, x21, x13 //AES block 4k+2 - round 12 low - +#ifdef __AARCH64EB__ + rev x21, x21 +#endif pmull2 v30.1q, v5.2d, v14.2d //GHASH block 4k+1 - high eor x22, x22, x14 //AES block 4k+2 - round 12 high +#ifdef __AARCH64EB__ + rev x22, x22 +#endif eor v4.8b, v4.8b, v5.8b //GHASH block 4k+1 - mid pmull v10.1q, v8.1d, v10.1d //GHASH block 4k - mid eor x23, x23, x13 //AES block 4k+3 - round 12 low +#ifdef __AARCH64EB__ + rev x23, x23 +#endif stp x21, x22, [x2], #16 //AES block 4k+2 - store result rev64 v7.16b, v7.16b //GHASH block 4k+3 @@ -3650,8 +3869,13 @@ aes_gcm_dec_192_kernel: cmp x5, #48 eor x7, x7, x14 //AES block 4k+4 - round 12 high - +#ifdef __AARCH64EB__ + rev x7, x7 +#endif eor x6, x6, x13 //AES block 4k+4 - round 12 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif b.gt .L192_dec_blocks_more_than_3 movi v11.8b, #0 @@ -3695,10 +3919,16 @@ aes_gcm_dec_192_kernel: pmull2 v9.1q, v4.2d, v15.2d //GHASH final-3 block - high eor x6, x6, x13 //AES final-2 block - round 12 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif movi v8.8b, #0 //suppress further partial tag feed in pmull v10.1q, v22.1d, v10.1d //GHASH final-3 block - mid eor x7, x7, x14 //AES final-2 block - round 12 high +#ifdef __AARCH64EB__ + rev x7, x7 +#endif .L192_dec_blocks_more_than_2: //blocks left > 2 rev64 v4.16b, v5.16b //GHASH final-2 block @@ -3728,8 +3958,13 @@ aes_gcm_dec_192_kernel: eor v9.16b, v9.16b, v20.16b //GHASH final-2 block - high eor x7, x7, x14 //AES final-1 block - round 12 high - +#ifdef __AARCH64EB__ + rev x7, x7 +#endif eor x6, x6, x13 //AES final-1 block - round 12 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif eor v10.16b, v10.16b, v22.16b //GHASH final-2 block - mid .L192_dec_blocks_more_than_1: //blocks left > 1 @@ -3760,9 +3995,13 @@ aes_gcm_dec_192_kernel: movi v8.8b, #0 //suppress further partial tag feed in eor v11.16b, v11.16b, v21.16b //GHASH final-1 block - low eor x7, x7, x14 //AES final block - round 12 high - +#ifdef __AARCH64EB__ + rev x7, x7 +#endif eor x6, x6, x13 //AES final block - round 12 low - +#ifdef __AARCH64EB__ + rev x6, x6 +#endif eor v10.16b, v10.16b, v22.16b //GHASH final-1 block - mid .L192_dec_blocks_less_than_1: //blocks left <= 1 @@ -3789,8 +4028,11 @@ aes_gcm_dec_192_kernel: orr x6, x6, x4 mov v0.d[1], x10 - +#ifndef __AARCH64EB__ rev w9, w12 +#else + mov w9, w12 +#endif and v5.16b, v5.16b, v0.16b //possibly partial last block has zeroes in highest bits str w9, [x16, #12] //store the updated counter @@ -3878,14 +4120,22 @@ aes_gcm_enc_256_kernel: lsr x5, x1, #3 //byte_len mov x15, x5 ldp x10, x11, [x16] //ctr96_b64, ctr96_t32 - +#ifdef __AARCH64EB__ + rev x10, x10 + rev x11, x11 +#endif + ldp x13, x14, [x8, #224] //load rk14 +#ifdef __AARCH64EB__ + ror x13, x13, #32 + ror x14, x14, #32 +#endif ld1 { v0.16b}, [x16] //special case vector load initial counter so we can start first AES block as quickly as possible sub x5, x5, #1 //byte_len - 1 - ldr q18, [x8, #0] //load rk0 + ld1 {v18.4s}, [x8], #16 //load rk0 and x5, x5, #0xffffffffffffffc0 //number of bytes to be processed in main loop (at least 1 byte must be handled by tail) - ldr q25, [x8, #112] //load rk7 + ld1 {v19.4s}, [x8], #16 //load rk1 add x5, x5, x0 lsr x12, x11, #32 @@ -3905,14 +4155,14 @@ aes_gcm_enc_256_kernel: orr x9, x11, x9, lsl #32 //CTR block 1 add w12, w12, #1 //CTR block 1 - ldr q19, [x8, #16] //load rk1 + ld1 {v20.4s}, [x8], #16 //load rk2 fmov v1.d[1], x9 //CTR block 1 rev w9, w12 //CTR block 2 add w12, w12, #1 //CTR block 2 orr x9, x11, x9, lsl #32 //CTR block 2 - ldr q20, [x8, #32] //load rk2 + ld1 {v21.4s}, [x8], #16 //load rk3 fmov v2.d[1], x9 //CTR block 2 rev w9, w12 //CTR block 3 @@ -3925,50 +4175,53 @@ aes_gcm_enc_256_kernel: aese v1.16b, v18.16b aesmc v1.16b, v1.16b //AES block 1 - round 0 - ldr q21, [x8, #48] //load rk3 + ld1 {v22.4s}, [x8], #16 //load rk4 aese v0.16b, v20.16b aesmc v0.16b, v0.16b //AES block 0 - round 2 - ldr q24, [x8, #96] //load rk6 + ld1 {v23.4s}, [x8], #16 //load rk5 aese v2.16b, v18.16b aesmc v2.16b, v2.16b //AES block 2 - round 0 - ldr q23, [x8, #80] //load rk5 + ld1 {v24.4s}, [x8], #16 //load rk6 aese v1.16b, v19.16b aesmc v1.16b, v1.16b //AES block 1 - round 1 ldr q14, [x3, #80] //load h3l | h3h +#ifndef __AARCH64EB__ ext v14.16b, v14.16b, v14.16b, #8 - +#endif aese v3.16b, v18.16b aesmc v3.16b, v3.16b //AES block 3 - round 0 - ldr q31, [x8, #208] //load rk13 + ld1 {v25.4s}, [x8], #16 //load rk7 aese v2.16b, v19.16b aesmc v2.16b, v2.16b //AES block 2 - round 1 - ldr q22, [x8, #64] //load rk4 + ld1 {v26.4s}, [x8], #16 //load rk8 aese v1.16b, v20.16b aesmc v1.16b, v1.16b //AES block 1 - round 2 ldr q13, [x3, #64] //load h2l | h2h +#ifndef __AARCH64EB__ ext v13.16b, v13.16b, v13.16b, #8 - +#endif aese v3.16b, v19.16b aesmc v3.16b, v3.16b //AES block 3 - round 1 - ldr q30, [x8, #192] //load rk12 + ld1 {v27.4s}, [x8], #16 //load rk9 aese v2.16b, v20.16b aesmc v2.16b, v2.16b //AES block 2 - round 2 ldr q15, [x3, #112] //load h4l | h4h +#ifndef __AARCH64EB__ ext v15.16b, v15.16b, v15.16b, #8 - +#endif aese v1.16b, v21.16b aesmc v1.16b, v1.16b //AES block 1 - round 3 - ldr q29, [x8, #176] //load rk11 + ld1 {v28.4s}, [x8], #16 //load rk10 aese v3.16b, v20.16b aesmc v3.16b, v3.16b //AES block 3 - round 2 - ldr q26, [x8, #128] //load rk8 + ld1 {v29.4s}, [x8], #16 //load rk11 aese v2.16b, v21.16b aesmc v2.16b, v2.16b //AES block 2 - round 3 @@ -3976,7 +4229,6 @@ aes_gcm_enc_256_kernel: aese v0.16b, v21.16b aesmc v0.16b, v0.16b //AES block 0 - round 3 - ldp x13, x14, [x8, #224] //load rk14 aese v3.16b, v21.16b aesmc v3.16b, v3.16b //AES block 3 - round 3 @@ -4014,16 +4266,17 @@ aes_gcm_enc_256_kernel: aese v3.16b, v24.16b aesmc v3.16b, v3.16b //AES block 3 - round 6 - ldr q27, [x8, #144] //load rk9 + ld1 {v30.4s}, [x8], #16 //load rk12 aese v0.16b, v24.16b aesmc v0.16b, v0.16b //AES block 0 - round 6 ldr q12, [x3, #32] //load h1l | h1h +#ifndef __AARCH64EB__ ext v12.16b, v12.16b, v12.16b, #8 - +#endif aese v2.16b, v24.16b aesmc v2.16b, v2.16b //AES block 2 - round 6 - ldr q28, [x8, #160] //load rk10 + ld1 {v31.4s}, [x8], #16 //load rk13 aese v1.16b, v25.16b aesmc v1.16b, v1.16b //AES block 1 - round 7 @@ -4112,13 +4365,26 @@ aes_gcm_enc_256_kernel: b.ge .L256_enc_tail //handle tail ldp x19, x20, [x0, #16] //AES block 1 - load plaintext - +#ifdef __AARCH64EB__ + rev x19, x19 + rev x20, x20 +#endif rev w9, w12 //CTR block 4 ldp x6, x7, [x0, #0] //AES block 0 - load plaintext - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif ldp x23, x24, [x0, #48] //AES block 3 - load plaintext - +#ifdef __AARCH64EB__ + rev x23, x23 + rev x24, x24 +#endif ldp x21, x22, [x0, #32] //AES block 2 - load plaintext +#ifdef __AARCH64EB__ + rev x21, x21 + rev x22, x22 +#endif add x0, x0, #64 //AES input_ptr update eor x19, x19, x13 //AES block 1 - round 14 low @@ -4201,11 +4467,17 @@ aes_gcm_enc_256_kernel: aese v1.16b, v19.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 1 ldp x23, x24, [x0, #48] //AES block 4k+7 - load plaintext - +#ifdef __AARCH64EB__ + rev x23, x23 + rev x24, x24 +#endif aese v2.16b, v19.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 1 ldp x21, x22, [x0, #32] //AES block 4k+6 - load plaintext - +#ifdef __AARCH64EB__ + rev x21, x21 + rev x22, x22 +#endif aese v0.16b, v20.16b aesmc v0.16b, v0.16b //AES block 4k+4 - round 2 eor v4.16b, v4.16b, v11.16b //PRE 1 @@ -4315,7 +4587,10 @@ aes_gcm_enc_256_kernel: aese v3.16b, v24.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 6 ldp x19, x20, [x0, #16] //AES block 4k+5 - load plaintext - +#ifdef __AARCH64EB__ + rev x19, x19 + rev x20, x20 +#endif aese v1.16b, v26.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 8 mov d4, v7.d[1] //GHASH block 4k+3 - mid @@ -4352,7 +4627,10 @@ aes_gcm_enc_256_kernel: aese v2.16b, v26.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 8 ldp x6, x7, [x0, #0] //AES block 4k+4 - load plaintext - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif aese v0.16b, v28.16b aesmc v0.16b, v0.16b //AES block 4k+4 - round 10 shl d8, d8, #56 //mod_constant @@ -4714,7 +4992,10 @@ aes_gcm_enc_256_kernel: ext v8.16b, v11.16b, v11.16b, #8 //prepare final partial tag sub x5, x4, x0 //main_end_input_ptr is number of bytes left to process ldp x6, x7, [x0], #16 //AES block 4k+4 - load plaintext - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif eor x6, x6, x13 //AES block 4k+4 - round 14 low eor x7, x7, x14 //AES block 4k+4 - round 14 high @@ -4749,7 +5030,10 @@ aes_gcm_enc_256_kernel: st1 { v5.16b}, [x2], #16 //AES final-3 block - store result ldp x6, x7, [x0], #16 //AES final-2 block - load input low & high - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif rev64 v4.16b, v5.16b //GHASH final-3 block eor x6, x6, x13 //AES final-2 block - round 14 low @@ -4778,7 +5062,10 @@ aes_gcm_enc_256_kernel: st1 { v5.16b}, [x2], #16 //AES final-2 block - store result ldp x6, x7, [x0], #16 //AES final-1 block - load input low & high - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif rev64 v4.16b, v5.16b //GHASH final-2 block eor x6, x6, x13 //AES final-1 block - round 14 low @@ -4814,7 +5101,10 @@ aes_gcm_enc_256_kernel: rev64 v4.16b, v5.16b //GHASH final-1 block ldp x6, x7, [x0], #16 //AES final block - load input low & high - +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif eor v4.16b, v4.16b, v8.16b //feed in partial tag movi v8.8b, #0 //suppress further partial tag feed in @@ -4875,7 +5165,11 @@ aes_gcm_enc_256_kernel: pmull2 v20.1q, v4.2d, v12.2d //GHASH final block - high mov d8, v4.d[1] //GHASH final block - mid +#ifndef __AARCH64EB__ rev w9, w12 +#else + mov w9, w12 +#endif pmull v21.1q, v4.1d, v12.1d //GHASH final block - low @@ -4949,21 +5243,29 @@ aes_gcm_dec_256_kernel: lsr x5, x1, #3 //byte_len mov x15, x5 ldp x10, x11, [x16] //ctr96_b64, ctr96_t32 - - ldr q26, [x8, #128] //load rk8 +#ifdef __AARCH64EB__ + rev x10, x10 + rev x11, x11 +#endif + ldp x13, x14, [x8, #224] //load rk14 +#ifdef __AARCH64EB__ + ror x14, x14, #32 + ror x13, x13, #32 +#endif + ld1 {v18.4s}, [x8], #16 //load rk0 sub x5, x5, #1 //byte_len - 1 - ldr q25, [x8, #112] //load rk7 + ld1 {v19.4s}, [x8], #16 //load rk1 and x5, x5, #0xffffffffffffffc0 //number of bytes to be processed in main loop (at least 1 byte must be handled by tail) add x4, x0, x1, lsr #3 //end_input_ptr - ldr q24, [x8, #96] //load rk6 + ld1 {v20.4s}, [x8], #16 //load rk2 lsr x12, x11, #32 - ldr q23, [x8, #80] //load rk5 + ld1 {v21.4s}, [x8], #16 //load rk3 orr w11, w11, w11 - ldr q21, [x8, #48] //load rk3 + ld1 {v22.4s}, [x8], #16 //load rk4 add x5, x5, x0 rev w12, w12 //rev_ctr32 @@ -4988,39 +5290,44 @@ aes_gcm_dec_256_kernel: rev w9, w12 //CTR block 3 orr x9, x11, x9, lsl #32 //CTR block 3 - ldr q18, [x8, #0] //load rk0 + ld1 {v23.4s}, [x8], #16 //load rk5 fmov v3.d[1], x9 //CTR block 3 add w12, w12, #1 //CTR block 3 - ldr q22, [x8, #64] //load rk4 + ld1 {v24.4s}, [x8], #16 //load rk6 - ldr q31, [x8, #208] //load rk13 + ld1 {v25.4s}, [x8], #16 //load rk7 - ldr q19, [x8, #16] //load rk1 + ld1 {v26.4s}, [x8], #16 //load rk8 aese v0.16b, v18.16b aesmc v0.16b, v0.16b //AES block 0 - round 0 ldr q14, [x3, #80] //load h3l | h3h +#ifndef __AARCH64EB__ ext v14.16b, v14.16b, v14.16b, #8 +#endif aese v3.16b, v18.16b aesmc v3.16b, v3.16b //AES block 3 - round 0 ldr q15, [x3, #112] //load h4l | h4h +#ifndef __AARCH64EB__ ext v15.16b, v15.16b, v15.16b, #8 +#endif aese v1.16b, v18.16b aesmc v1.16b, v1.16b //AES block 1 - round 0 ldr q13, [x3, #64] //load h2l | h2h +#ifndef __AARCH64EB__ ext v13.16b, v13.16b, v13.16b, #8 +#endif aese v2.16b, v18.16b aesmc v2.16b, v2.16b //AES block 2 - round 0 - ldr q20, [x8, #32] //load rk2 + ld1 {v27.4s}, [x8], #16 //load rk9 aese v0.16b, v19.16b aesmc v0.16b, v0.16b //AES block 0 - round 1 - ldp x13, x14, [x8, #224] //load rk14 aese v1.16b, v19.16b aesmc v1.16b, v1.16b //AES block 1 - round 1 @@ -5030,20 +5337,21 @@ aes_gcm_dec_256_kernel: aese v2.16b, v19.16b aesmc v2.16b, v2.16b //AES block 2 - round 1 - ldr q27, [x8, #144] //load rk9 + ld1 {v28.4s}, [x8], #16 //load rk10 aese v3.16b, v19.16b aesmc v3.16b, v3.16b //AES block 3 - round 1 - ldr q30, [x8, #192] //load rk12 + ld1 {v29.4s}, [x8], #16 //load rk11 aese v0.16b, v20.16b aesmc v0.16b, v0.16b //AES block 0 - round 2 ldr q12, [x3, #32] //load h1l | h1h +#ifndef __AARCH64EB__ ext v12.16b, v12.16b, v12.16b, #8 - +#endif aese v2.16b, v20.16b aesmc v2.16b, v2.16b //AES block 2 - round 2 - ldr q28, [x8, #160] //load rk10 + ld1 {v30.4s}, [x8], #16 //load rk12 aese v3.16b, v20.16b aesmc v3.16b, v3.16b //AES block 3 - round 2 @@ -5126,7 +5434,7 @@ aes_gcm_dec_256_kernel: aese v2.16b, v26.16b aesmc v2.16b, v2.16b //AES block 2 - round 8 - ldr q29, [x8, #176] //load rk11 + ld1 {v31.4s}, [x8], #16 //load rk13 aese v1.16b, v27.16b aesmc v1.16b, v1.16b //AES block 1 - round 9 @@ -5191,9 +5499,7 @@ aes_gcm_dec_256_kernel: aese v0.16b, v31.16b //AES block 0 - round 13 b.ge .L256_dec_tail //handle tail - ldr q4, [x0, #0] //AES block 0 - load ciphertext - - ldr q5, [x0, #16] //AES block 1 - load ciphertext + ld1 {v4.16b, v5.16b}, [x0], #32 //AES block 0,1 - load ciphertext rev w9, w12 //CTR block 4 @@ -5201,7 +5507,7 @@ aes_gcm_dec_256_kernel: eor v1.16b, v5.16b, v1.16b //AES block 1 - result rev64 v5.16b, v5.16b //GHASH block 1 - ldr q7, [x0, #48] //AES block 3 - load ciphertext + ld1 {v6.16b}, [x0], #16 //AES block 2 - load ciphertext mov x7, v0.d[1] //AES block 0 - mov high @@ -5221,22 +5527,32 @@ aes_gcm_dec_256_kernel: orr x9, x11, x9, lsl #32 //CTR block 5 mov x20, v1.d[1] //AES block 1 - mov high eor x7, x7, x14 //AES block 0 - round 14 high - +#ifdef __AARCH64EB__ + rev x7, x7 +#endif eor x6, x6, x13 //AES block 0 - round 14 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif stp x6, x7, [x2], #16 //AES block 0 - store result fmov d1, x10 //CTR block 5 - ldr q6, [x0, #32] //AES block 2 - load ciphertext - add x0, x0, #64 //AES input_ptr update + ld1 {v7.16b}, [x0], #16 //AES block 3 - load ciphertext fmov v1.d[1], x9 //CTR block 5 rev w9, w12 //CTR block 6 add w12, w12, #1 //CTR block 6 eor x19, x19, x13 //AES block 1 - round 14 low +#ifdef __AARCH64EB__ + rev x19, x19 +#endif orr x9, x11, x9, lsl #32 //CTR block 6 eor x20, x20, x14 //AES block 1 - round 14 high +#ifdef __AARCH64EB__ + rev x20, x20 +#endif stp x19, x20, [x2], #16 //AES block 1 - store result eor v2.16b, v6.16b, v2.16b //AES block 2 - result @@ -5287,7 +5603,9 @@ aes_gcm_dec_256_kernel: aese v0.16b, v21.16b aesmc v0.16b, v0.16b //AES block 4k+4 - round 3 eor x22, x22, x14 //AES block 4k+2 - round 14 high - +#ifdef __AARCH64EB__ + rev x22, x22 +#endif aese v2.16b, v19.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 1 mov d10, v17.d[1] //GHASH block 4k - mid @@ -5299,7 +5617,9 @@ aes_gcm_dec_256_kernel: aese v3.16b, v18.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 0 eor x21, x21, x13 //AES block 4k+2 - round 14 low - +#ifdef __AARCH64EB__ + rev x21, x21 +#endif aese v2.16b, v20.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 2 stp x21, x22, [x2], #16 //AES block 4k+2 - store result @@ -5314,9 +5634,14 @@ aes_gcm_dec_256_kernel: pmull v10.1q, v8.1d, v10.1d //GHASH block 4k - mid eor x23, x23, x13 //AES block 4k+3 - round 14 low - +#ifdef __AARCH64EB__ + rev x23, x23 +#endif pmull v8.1q, v5.1d, v14.1d //GHASH block 4k+1 - low eor x24, x24, x14 //AES block 4k+3 - round 14 high +#ifdef __AARCH64EB__ + rev x24, x24 +#endif eor v9.16b, v9.16b, v4.16b //GHASH block 4k+1 - high aese v2.16b, v22.16b @@ -5437,7 +5762,7 @@ aes_gcm_dec_256_kernel: aese v1.16b, v27.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 9 - ldr q4, [x0, #0] //AES block 4k+4 - load ciphertext + ld1 {v4.16b}, [x0], #16 //AES block 4k+4 - load ciphertext aese v0.16b, v31.16b //AES block 4k+4 - round 13 ext v9.16b, v9.16b, v9.16b, #8 //MODULO - other top alignment @@ -5448,7 +5773,7 @@ aes_gcm_dec_256_kernel: aese v2.16b, v27.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 9 - ldr q5, [x0, #16] //AES block 4k+5 - load ciphertext + ld1 {v5.16b}, [x0], #16 //AES block 4k+5 - load ciphertext aese v3.16b, v26.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 8 @@ -5464,11 +5789,11 @@ aes_gcm_dec_256_kernel: aese v3.16b, v27.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 9 - ldr q7, [x0, #48] //AES block 4k+7 - load ciphertext + ld1 {v6.16b}, [x0], #16 //AES block 4k+6 - load ciphertext aese v1.16b, v30.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 12 - ldr q6, [x0, #32] //AES block 4k+6 - load ciphertext + ld1 {v7.16b}, [x0], #16 //AES block 4k+7 - load ciphertext aese v2.16b, v29.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 11 @@ -5479,7 +5804,6 @@ aes_gcm_dec_256_kernel: eor v10.16b, v10.16b, v9.16b //MODULO - fold into mid aese v1.16b, v31.16b //AES block 4k+5 - round 13 - add x0, x0, #64 //AES input_ptr update mov x6, v0.d[0] //AES block 4k+4 - mov low aese v2.16b, v30.16b @@ -5501,8 +5825,13 @@ aes_gcm_dec_256_kernel: add w12, w12, #1 //CTR block 4k+9 eor x6, x6, x13 //AES block 4k+4 - round 14 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif eor x7, x7, x14 //AES block 4k+4 - round 14 high - +#ifdef __AARCH64EB__ + rev x7, x7 +#endif mov x20, v1.d[1] //AES block 4k+5 - mov high eor v2.16b, v6.16b, v2.16b //AES block 4k+6 - result eor v11.16b, v11.16b, v8.16b //MODULO - fold into low @@ -5523,9 +5852,15 @@ aes_gcm_dec_256_kernel: rev64 v5.16b, v5.16b //GHASH block 4k+5 eor x20, x20, x14 //AES block 4k+5 - round 14 high +#ifdef __AARCH64EB__ + rev x20, x20 +#endif stp x6, x7, [x2], #16 //AES block 4k+4 - store result eor x19, x19, x13 //AES block 4k+5 - round 14 low +#ifdef __AARCH64EB__ + rev x19, x19 +#endif stp x19, x20, [x2], #16 //AES block 4k+5 - store result rev64 v4.16b, v4.16b //GHASH block 4k+4 @@ -5732,11 +6067,15 @@ aes_gcm_dec_256_kernel: aese v0.16b, v28.16b aesmc v0.16b, v0.16b //AES block 4k+4 - round 10 eor x22, x22, x14 //AES block 4k+2 - round 14 high - +#ifdef __AARCH64EB__ + rev x22, x22 +#endif aese v1.16b, v28.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 10 eor x23, x23, x13 //AES block 4k+3 - round 14 low - +#ifdef __AARCH64EB__ + rev x23, x23 +#endif aese v2.16b, v29.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 11 eor v10.16b, v10.16b, v9.16b //MODULO - fold into mid @@ -5748,12 +6087,18 @@ aes_gcm_dec_256_kernel: aese v1.16b, v29.16b aesmc v1.16b, v1.16b //AES block 4k+5 - round 11 eor x21, x21, x13 //AES block 4k+2 - round 14 low +#ifdef __AARCH64EB__ + rev x21, x21 +#endif aese v2.16b, v30.16b aesmc v2.16b, v2.16b //AES block 4k+6 - round 12 pmull v8.1q, v10.1d, v8.1d //MODULO - mid 64b align with low eor x24, x24, x14 //AES block 4k+3 - round 14 high +#ifdef __AARCH64EB__ + rev x24, x24 +#endif aese v3.16b, v29.16b aesmc v3.16b, v3.16b //AES block 4k+7 - round 11 @@ -5794,8 +6139,14 @@ aes_gcm_dec_256_kernel: cmp x5, #48 eor x6, x6, x13 //AES block 4k+4 - round 14 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif eor x7, x7, x14 //AES block 4k+4 - round 14 high +#ifdef __AARCH64EB__ + rev x7, x7 +#endif b.gt .L256_dec_blocks_more_than_3 sub w12, w12, #1 @@ -5843,9 +6194,15 @@ aes_gcm_dec_256_kernel: pmull v10.1q, v22.1d, v10.1d //GHASH final-3 block - mid eor x6, x6, x13 //AES final-2 block - round 14 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif pmull v11.1q, v4.1d, v15.1d //GHASH final-3 block - low eor x7, x7, x14 //AES final-2 block - round 14 high +#ifdef __AARCH64EB__ + rev x7, x7 +#endif .L256_dec_blocks_more_than_2: //blocks left > 2 rev64 v4.16b, v5.16b //GHASH final-2 block @@ -5873,9 +6230,15 @@ aes_gcm_dec_256_kernel: eor v9.16b, v9.16b, v20.16b //GHASH final-2 block - high eor x6, x6, x13 //AES final-1 block - round 14 low +#ifdef __AARCH64EB__ + rev x6, x6 +#endif eor v10.16b, v10.16b, v22.16b //GHASH final-2 block - mid eor x7, x7, x14 //AES final-1 block - round 14 high +#ifdef __AARCH64EB__ + rev x7, x7 +#endif .L256_dec_blocks_more_than_1: //blocks left > 1 stp x6, x7, [x2], #16 //AES final-1 block - store result @@ -5903,13 +6266,18 @@ aes_gcm_dec_256_kernel: pmull2 v22.1q, v22.2d, v16.2d //GHASH final-1 block - mid eor x6, x6, x13 //AES final block - round 14 low - +#ifdef __AARCH64EB__ + rev x6, x6 +#endif eor v11.16b, v11.16b, v21.16b //GHASH final-1 block - low eor v9.16b, v9.16b, v20.16b //GHASH final-1 block - high eor v10.16b, v10.16b, v22.16b //GHASH final-1 block - mid eor x7, x7, x14 //AES final block - round 14 high +#ifdef __AARCH64EB__ + rev x7, x7 +#endif .L256_dec_blocks_less_than_1: //blocks left <= 1 and x1, x1, #127 //bit_length %= 128 @@ -5935,7 +6303,11 @@ aes_gcm_dec_256_kernel: mov v0.d[1], x10 bic x4, x4, x9 //mask out low existing bytes +#ifndef __AARCH64EB__ rev w9, w12 +#else + mov w9, w12 +#endif bic x5, x5, x10 //mask out high existing bytes diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/cmp.h b/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/cmp.h +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); 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 086d6f011ed1a7..1b938a927c7d59 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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* 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-fips.gypi b/deps/openssl/config/archs/linux-aarch64/asm_avx2/openssl-fips.gypi index b25322dee227fc..35653fd9e7ab0e 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/openssl-fips.gypi @@ -33,7 +33,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/des_enc.c', 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 47c4568a09e6e9..c7cb2091b5a793 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/openssl.gypi @@ -192,7 +192,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/camellia.c', 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 767845d1ffeab8..6fa7cbd666927f 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.8+quic", + "full_version" => "3.0.9+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,7 +206,7 @@ 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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -225,7 +225,7 @@ our %config = ( "AS" => undef, "ASFLAGS" => undef, "BUILDFILE" => undef, - "CC" => "gcc", + "CC" => undef, "CFLAGS" => undef, "CPP" => undef, "CPPDEFINES" => undef, @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux-aarch64", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1330,6 +1330,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3917,6 +3920,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4025,6 +4031,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6290,6 +6299,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6398,6 +6410,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7747,6 +7762,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8411,7 +8430,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-bn_add.o", "crypto/bn/libfips-lib-bn_asm.o", "crypto/bn/libfips-lib-bn_blind.o", @@ -8439,8 +8457,7 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_shift.o", "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", - "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o" + "crypto/bn/libfips-lib-bn_word.o" ], "products" => { "lib" => [ @@ -12885,6 +12902,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -12993,6 +13013,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15258,6 +15281,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15366,6 +15392,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16878,6 +16907,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -16914,6 +16944,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18825,6 +18856,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19849,6 +19884,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19885,6 +19921,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20150,6 +20187,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -20987,9 +21025,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_x931p.o" => [ "crypto/bn/bn_x931p.c" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-bn_add.o" => [ "crypto/bn/bn_add.c" ], @@ -21074,9 +21109,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_word.o" => [ "crypto/bn/bn_word.c" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/buffer/libcrypto-lib-buf_err.o" => [ "crypto/buffer/buf_err.c" ], @@ -23573,7 +23605,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/buffer/libcrypto-lib-buf_err.o", "crypto/buffer/libcrypto-lib-buffer.o", "crypto/camellia/libcrypto-lib-camellia.o", @@ -25142,7 +25173,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/buffer/libfips-lib-buffer.o", "crypto/cmac/libfips-lib-cmac.o", "crypto/des/libfips-lib-des_enc.o", @@ -26652,6 +26682,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27353,8 +27389,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27381,7 +27417,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27398,8 +27434,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ 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 70225641423263..6312c75141ff39 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 Feb 13 14:07:26 2023 UTC" +#define DATE "built on: Fri Jun 9 12:04:34 2023 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/cmp.h b/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/cmp.h +++ b/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); 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 086d6f011ed1a7..1b938a927c7d59 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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/linux-aarch64/no-asm/openssl-fips.gypi index f2c87f3d8a1f21..3f8a43dccf7f8e 100644 --- a/deps/openssl/config/archs/linux-aarch64/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-aarch64/no-asm/openssl-fips.gypi @@ -33,7 +33,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/des_enc.c', diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/openssl.gypi b/deps/openssl/config/archs/linux-aarch64/no-asm/openssl.gypi index 68295b71021b7e..f20a2ba245d462 100644 --- a/deps/openssl/config/archs/linux-aarch64/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-aarch64/no-asm/openssl.gypi @@ -192,7 +192,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/camellia.c', diff --git a/deps/openssl/config/archs/linux-armv4/asm/configdata.pm b/deps/openssl/config/archs/linux-armv4/asm/configdata.pm index ca6e6c4421a97d..c8549b716ed284 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/configdata.pm +++ b/deps/openssl/config/archs/linux-armv4/asm/configdata.pm @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux-armv4", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1329,6 +1329,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3956,6 +3959,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4064,6 +4070,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6329,6 +6338,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6437,6 +6449,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7786,6 +7801,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8458,7 +8477,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-armv4-gf2m.o", "crypto/bn/libfips-lib-armv4-mont.o", "crypto/bn/libfips-lib-bn_add.o", @@ -8488,8 +8506,7 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_shift.o", "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", - "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o" + "crypto/bn/libfips-lib-bn_word.o" ], "products" => { "lib" => [ @@ -12949,6 +12966,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -13057,6 +13077,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15322,6 +15345,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15430,6 +15456,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16942,6 +16971,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -16978,6 +17008,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18973,6 +19004,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19997,6 +20032,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -20033,6 +20069,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20298,6 +20335,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -21153,9 +21191,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_x931p.o" => [ "crypto/bn/bn_x931p.c" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-armv4-gf2m.o" => [ "crypto/bn/armv4-gf2m.S" ], @@ -21246,9 +21281,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_word.o" => [ "crypto/bn/bn_word.c" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/buffer/libcrypto-lib-buf_err.o" => [ "crypto/buffer/buf_err.c" ], @@ -23800,7 +23832,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/buffer/libcrypto-lib-buf_err.o", "crypto/buffer/libcrypto-lib-buffer.o", "crypto/camellia/libcrypto-lib-camellia.o", @@ -25382,7 +25413,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/buffer/libfips-lib-buffer.o", "crypto/cmac/libfips-lib-cmac.o", "crypto/des/libfips-lib-des_enc.o", @@ -26900,6 +26930,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27598,8 +27634,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27626,7 +27662,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27643,8 +27679,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-armv4/asm/crypto/aes/bsaes-armv7.S b/deps/openssl/config/archs/linux-armv4/asm/crypto/aes/bsaes-armv7.S index 2bdbe2f1dc0e91..4b7f662140fba1 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/crypto/aes/bsaes-armv7.S +++ b/deps/openssl/config/archs/linux-armv4/asm/crypto/aes/bsaes-armv7.S @@ -1,4 +1,4 @@ -@ Copyright 2012-2021 The OpenSSL Project Authors. All Rights Reserved. +@ Copyright 2012-2023 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 @@ -13,7 +13,7 @@ @ details see http://www.openssl.org/~appro/cryptogams/. @ @ Specific modes and adaptation for Linux kernel by Ard Biesheuvel -@ of Linaro. Permission to use under GPL terms is granted. +@ of Linaro. @ ==================================================================== @ Bit-sliced AES for ARM NEON @@ -1393,7 +1393,7 @@ ossl_bsaes_ctr32_encrypt_blocks: .align 2 add r12, r3, #248 vld1.8 {q0}, [r8] @ load counter - adrl r8, .LREVM0SR @ borrow r8 + add r8, r6, #.LREVM0SR-.LM0 @ borrow r8 vldmia r12, {q4} @ load round0 key sub sp, #0x10 @ place for adjusted round0 key #endif diff --git a/deps/openssl/config/archs/linux-armv4/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-armv4/asm/crypto/buildinf.h index 7042561ace3828..5483148e0d9fa3 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-armv4/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-armv4" -#define DATE "built on: Mon Feb 13 14:07:37 2023 UTC" +#define DATE "built on: Fri Jun 9 12:04:54 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-armv4/asm/include/openssl/cmp.h b/deps/openssl/config/archs/linux-armv4/asm/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/include/openssl/cmp.h +++ b/deps/openssl/config/archs/linux-armv4/asm/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/linux-armv4/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-armv4/asm/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-armv4/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux-armv4/asm/openssl-fips.gypi b/deps/openssl/config/archs/linux-armv4/asm/openssl-fips.gypi index 2feafecff2620b..98918f2400bea1 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-armv4/asm/openssl-fips.gypi @@ -32,7 +32,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/des_enc.c', diff --git a/deps/openssl/config/archs/linux-armv4/asm/openssl.gypi b/deps/openssl/config/archs/linux-armv4/asm/openssl.gypi index ce260f32abd774..8fd7c43c4db633 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-armv4/asm/openssl.gypi @@ -191,7 +191,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/camellia.c', diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux-armv4/asm_avx2/configdata.pm index b5353cd8d1bf7d..203ca2516c4476 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/configdata.pm @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux-armv4", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1329,6 +1329,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3956,6 +3959,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4064,6 +4070,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6329,6 +6338,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6437,6 +6449,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7786,6 +7801,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8458,7 +8477,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-armv4-gf2m.o", "crypto/bn/libfips-lib-armv4-mont.o", "crypto/bn/libfips-lib-bn_add.o", @@ -8488,8 +8506,7 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_shift.o", "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", - "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o" + "crypto/bn/libfips-lib-bn_word.o" ], "products" => { "lib" => [ @@ -12949,6 +12966,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -13057,6 +13077,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15322,6 +15345,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15430,6 +15456,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16942,6 +16971,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -16978,6 +17008,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18973,6 +19004,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19997,6 +20032,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -20033,6 +20069,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20298,6 +20335,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -21153,9 +21191,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_x931p.o" => [ "crypto/bn/bn_x931p.c" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-armv4-gf2m.o" => [ "crypto/bn/armv4-gf2m.S" ], @@ -21246,9 +21281,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_word.o" => [ "crypto/bn/bn_word.c" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/buffer/libcrypto-lib-buf_err.o" => [ "crypto/buffer/buf_err.c" ], @@ -23800,7 +23832,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/buffer/libcrypto-lib-buf_err.o", "crypto/buffer/libcrypto-lib-buffer.o", "crypto/camellia/libcrypto-lib-camellia.o", @@ -25382,7 +25413,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/buffer/libfips-lib-buffer.o", "crypto/cmac/libfips-lib-cmac.o", "crypto/des/libfips-lib-des_enc.o", @@ -26900,6 +26930,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27598,8 +27634,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27626,7 +27662,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27643,8 +27679,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/aes/bsaes-armv7.S b/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/aes/bsaes-armv7.S index 2bdbe2f1dc0e91..4b7f662140fba1 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/aes/bsaes-armv7.S +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/aes/bsaes-armv7.S @@ -1,4 +1,4 @@ -@ Copyright 2012-2021 The OpenSSL Project Authors. All Rights Reserved. +@ Copyright 2012-2023 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 @@ -13,7 +13,7 @@ @ details see http://www.openssl.org/~appro/cryptogams/. @ @ Specific modes and adaptation for Linux kernel by Ard Biesheuvel -@ of Linaro. Permission to use under GPL terms is granted. +@ of Linaro. @ ==================================================================== @ Bit-sliced AES for ARM NEON @@ -1393,7 +1393,7 @@ ossl_bsaes_ctr32_encrypt_blocks: .align 2 add r12, r3, #248 vld1.8 {q0}, [r8] @ load counter - adrl r8, .LREVM0SR @ borrow r8 + add r8, r6, #.LREVM0SR-.LM0 @ borrow r8 vldmia r12, {q4} @ load round0 key sub sp, #0x10 @ place for adjusted round0 key #endif diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/buildinf.h index 87e991db3dc33a..d0aa130324d6ba 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-armv4" -#define DATE "built on: Mon Feb 13 14:07:48 2023 UTC" +#define DATE "built on: Fri Jun 9 12:05:16 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/cmp.h b/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/cmp.h +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-armv4/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/linux-armv4/asm_avx2/openssl-fips.gypi index 9f1419831d5d1e..6a72c2a7f4b090 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/openssl-fips.gypi @@ -32,7 +32,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/des_enc.c', diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux-armv4/asm_avx2/openssl.gypi index bd952c84c1aaba..9b594145412313 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/openssl.gypi @@ -191,7 +191,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/camellia.c', diff --git a/deps/openssl/config/archs/linux-armv4/no-asm/configdata.pm b/deps/openssl/config/archs/linux-armv4/no-asm/configdata.pm index 578cfc3cc1f0fa..ce3e0a42c34881 100644 --- a/deps/openssl/config/archs/linux-armv4/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux-armv4/no-asm/configdata.pm @@ -157,7 +157,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,7 +206,7 @@ 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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -225,7 +225,7 @@ our %config = ( "AS" => undef, "ASFLAGS" => undef, "BUILDFILE" => undef, - "CC" => "gcc", + "CC" => undef, "CFLAGS" => undef, "CPP" => undef, "CPPDEFINES" => undef, @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux-armv4", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1330,6 +1330,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3917,6 +3920,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4025,6 +4031,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6290,6 +6299,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6398,6 +6410,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7747,6 +7762,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8411,7 +8430,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-bn_add.o", "crypto/bn/libfips-lib-bn_asm.o", "crypto/bn/libfips-lib-bn_blind.o", @@ -8439,8 +8457,7 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_shift.o", "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", - "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o" + "crypto/bn/libfips-lib-bn_word.o" ], "products" => { "lib" => [ @@ -12885,6 +12902,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -12993,6 +13013,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15258,6 +15281,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15366,6 +15392,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16878,6 +16907,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -16914,6 +16944,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18825,6 +18856,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19849,6 +19884,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19885,6 +19921,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20150,6 +20187,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -20987,9 +21025,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_x931p.o" => [ "crypto/bn/bn_x931p.c" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-bn_add.o" => [ "crypto/bn/bn_add.c" ], @@ -21074,9 +21109,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_word.o" => [ "crypto/bn/bn_word.c" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/buffer/libcrypto-lib-buf_err.o" => [ "crypto/buffer/buf_err.c" ], @@ -23573,7 +23605,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/buffer/libcrypto-lib-buf_err.o", "crypto/buffer/libcrypto-lib-buffer.o", "crypto/camellia/libcrypto-lib-camellia.o", @@ -25142,7 +25173,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/buffer/libfips-lib-buffer.o", "crypto/cmac/libfips-lib-cmac.o", "crypto/des/libfips-lib-des_enc.o", @@ -26652,6 +26682,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27353,8 +27389,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27381,7 +27417,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27398,8 +27434,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-armv4/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-armv4/no-asm/crypto/buildinf.h index c913adc886b00b..d5645c2e250669 100644 --- a/deps/openssl/config/archs/linux-armv4/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-armv4/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-armv4" -#define DATE "built on: Mon Feb 13 14:07:59 2023 UTC" +#define DATE "built on: Fri Jun 9 12:05:35 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/cmp.h b/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/cmp.h +++ b/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-armv4/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux-armv4/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/linux-armv4/no-asm/openssl-fips.gypi index cf6735c3fc871d..1c35efba7565fa 100644 --- a/deps/openssl/config/archs/linux-armv4/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-armv4/no-asm/openssl-fips.gypi @@ -33,7 +33,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/des_enc.c', diff --git a/deps/openssl/config/archs/linux-armv4/no-asm/openssl.gypi b/deps/openssl/config/archs/linux-armv4/no-asm/openssl.gypi index a4dd9a9c97cb4f..cc4efdf7d59fad 100644 --- a/deps/openssl/config/archs/linux-armv4/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-armv4/no-asm/openssl.gypi @@ -192,7 +192,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/camellia.c', diff --git a/deps/openssl/config/archs/linux-elf/asm/configdata.pm b/deps/openssl/config/archs/linux-elf/asm/configdata.pm index f9e3a0d113b0d4..35521a3b9a8248 100644 --- a/deps/openssl/config/archs/linux-elf/asm/configdata.pm +++ b/deps/openssl/config/archs/linux-elf/asm/configdata.pm @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux-elf", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1328,6 +1328,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3972,6 +3975,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4080,6 +4086,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6345,6 +6354,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6453,6 +6465,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7802,6 +7817,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8469,7 +8488,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", "crypto/bn/libcrypto-lib-co-586.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-x86-gf2m.o", "crypto/bn/libcrypto-lib-x86-mont.o", "crypto/bn/libfips-lib-bn-586.o", @@ -8501,7 +8519,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", "crypto/bn/libfips-lib-co-586.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-x86-gf2m.o", "crypto/bn/libfips-lib-x86-mont.o" ], @@ -12962,6 +12979,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -13070,6 +13090,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15335,6 +15358,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15443,6 +15469,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16955,6 +16984,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -16991,6 +17021,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18902,6 +18933,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19926,6 +19961,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19962,6 +19998,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20227,6 +20264,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -21073,9 +21111,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-co-586.o" => [ "crypto/bn/co-586.S" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libcrypto-lib-x86-gf2m.o" => [ "crypto/bn/x86-gf2m.S" ], @@ -21169,9 +21204,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-co-586.o" => [ "crypto/bn/co-586.S" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-x86-gf2m.o" => [ "crypto/bn/x86-gf2m.S" ], @@ -23718,7 +23750,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", "crypto/bn/libcrypto-lib-co-586.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-x86-gf2m.o", "crypto/bn/libcrypto-lib-x86-mont.o", "crypto/buffer/libcrypto-lib-buf_err.o", @@ -25299,7 +25330,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", "crypto/bn/libfips-lib-co-586.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-x86-gf2m.o", "crypto/bn/libfips-lib-x86-mont.o", "crypto/buffer/libfips-lib-buffer.o", @@ -26817,6 +26847,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27515,8 +27551,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27543,7 +27579,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27560,8 +27596,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-elf/asm/crypto/buildinf.h index 9ccd3ef95668f7..2833ceecca2d7a 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-elf" -#define DATE "built on: Mon Feb 13 14:08:10 2023 UTC" +#define DATE "built on: Fri Jun 9 12:05:54 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-elf/asm/include/openssl/cmp.h b/deps/openssl/config/archs/linux-elf/asm/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/linux-elf/asm/include/openssl/cmp.h +++ b/deps/openssl/config/archs/linux-elf/asm/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/linux-elf/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-elf/asm/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/linux-elf/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-elf/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux-elf/asm/openssl-fips.gypi b/deps/openssl/config/archs/linux-elf/asm/openssl-fips.gypi index 4050394c4ea13b..dc1432627615a1 100644 --- a/deps/openssl/config/archs/linux-elf/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-elf/asm/openssl-fips.gypi @@ -30,7 +30,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/ecb3_enc.c', diff --git a/deps/openssl/config/archs/linux-elf/asm/openssl.gypi b/deps/openssl/config/archs/linux-elf/asm/openssl.gypi index 7d1253f97ee1c4..f8bb8061186381 100644 --- a/deps/openssl/config/archs/linux-elf/asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-elf/asm/openssl.gypi @@ -188,7 +188,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/cmll_cfb.c', diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux-elf/asm_avx2/configdata.pm index 03cc80d0737589..f1c5d3bdc01ed4 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/configdata.pm @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux-elf", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1328,6 +1328,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3972,6 +3975,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4080,6 +4086,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6345,6 +6354,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6453,6 +6465,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7802,6 +7817,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8469,7 +8488,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", "crypto/bn/libcrypto-lib-co-586.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-x86-gf2m.o", "crypto/bn/libcrypto-lib-x86-mont.o", "crypto/bn/libfips-lib-bn-586.o", @@ -8501,7 +8519,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", "crypto/bn/libfips-lib-co-586.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-x86-gf2m.o", "crypto/bn/libfips-lib-x86-mont.o" ], @@ -12962,6 +12979,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -13070,6 +13090,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15335,6 +15358,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15443,6 +15469,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16955,6 +16984,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -16991,6 +17021,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18902,6 +18933,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19926,6 +19961,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19962,6 +19998,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20227,6 +20264,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -21073,9 +21111,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-co-586.o" => [ "crypto/bn/co-586.S" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libcrypto-lib-x86-gf2m.o" => [ "crypto/bn/x86-gf2m.S" ], @@ -21169,9 +21204,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-co-586.o" => [ "crypto/bn/co-586.S" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-x86-gf2m.o" => [ "crypto/bn/x86-gf2m.S" ], @@ -23718,7 +23750,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", "crypto/bn/libcrypto-lib-co-586.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-x86-gf2m.o", "crypto/bn/libcrypto-lib-x86-mont.o", "crypto/buffer/libcrypto-lib-buf_err.o", @@ -25299,7 +25330,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", "crypto/bn/libfips-lib-co-586.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-x86-gf2m.o", "crypto/bn/libfips-lib-x86-mont.o", "crypto/buffer/libfips-lib-buffer.o", @@ -26817,6 +26847,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27515,8 +27551,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27543,7 +27579,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27560,8 +27596,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/buildinf.h index df213b5b82f78b..f17e29484d2840 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-elf" -#define DATE "built on: Mon Feb 13 14:08:22 2023 UTC" +#define DATE "built on: Fri Jun 9 12:06:15 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/cmp.h b/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/cmp.h +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-elf/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/linux-elf/asm_avx2/openssl-fips.gypi index f53dae5e624bc0..d54f35535931b5 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/openssl-fips.gypi @@ -30,7 +30,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/ecb3_enc.c', diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux-elf/asm_avx2/openssl.gypi index f23e5c6f5ff333..31ae85eee1e27f 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/openssl.gypi @@ -188,7 +188,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/cmll_cfb.c', diff --git a/deps/openssl/config/archs/linux-elf/no-asm/configdata.pm b/deps/openssl/config/archs/linux-elf/no-asm/configdata.pm index 998091bdcdda71..69069353323851 100644 --- a/deps/openssl/config/archs/linux-elf/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux-elf/no-asm/configdata.pm @@ -157,7 +157,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,7 +206,7 @@ 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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -225,7 +225,7 @@ our %config = ( "AS" => undef, "ASFLAGS" => undef, "BUILDFILE" => undef, - "CC" => "gcc", + "CC" => undef, "CFLAGS" => undef, "CPP" => undef, "CPPDEFINES" => undef, @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux-elf", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1329,6 +1329,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3916,6 +3919,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4024,6 +4030,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6289,6 +6298,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6397,6 +6409,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7746,6 +7761,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8410,7 +8429,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-bn_add.o", "crypto/bn/libfips-lib-bn_asm.o", "crypto/bn/libfips-lib-bn_blind.o", @@ -8438,8 +8456,7 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_shift.o", "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", - "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o" + "crypto/bn/libfips-lib-bn_word.o" ], "products" => { "lib" => [ @@ -12884,6 +12901,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -12992,6 +13012,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15257,6 +15280,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15365,6 +15391,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16877,6 +16906,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -16913,6 +16943,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18824,6 +18855,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19848,6 +19883,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19884,6 +19920,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20149,6 +20186,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -20986,9 +21024,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_x931p.o" => [ "crypto/bn/bn_x931p.c" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-bn_add.o" => [ "crypto/bn/bn_add.c" ], @@ -21073,9 +21108,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_word.o" => [ "crypto/bn/bn_word.c" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/buffer/libcrypto-lib-buf_err.o" => [ "crypto/buffer/buf_err.c" ], @@ -23572,7 +23604,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/buffer/libcrypto-lib-buf_err.o", "crypto/buffer/libcrypto-lib-buffer.o", "crypto/camellia/libcrypto-lib-camellia.o", @@ -25141,7 +25172,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/buffer/libfips-lib-buffer.o", "crypto/cmac/libfips-lib-cmac.o", "crypto/des/libfips-lib-des_enc.o", @@ -26651,6 +26681,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27352,8 +27388,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27380,7 +27416,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27397,8 +27433,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-elf/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-elf/no-asm/crypto/buildinf.h index 73a36ecf339b82..8289ac097f3f28 100644 --- a/deps/openssl/config/archs/linux-elf/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-elf/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-elf" -#define DATE "built on: Mon Feb 13 14:08:33 2023 UTC" +#define DATE "built on: Fri Jun 9 12:06:35 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/cmp.h b/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/cmp.h +++ b/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-elf/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux-elf/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/linux-elf/no-asm/openssl-fips.gypi index 752887bcd75fe9..b82762a2a4e69a 100644 --- a/deps/openssl/config/archs/linux-elf/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-elf/no-asm/openssl-fips.gypi @@ -33,7 +33,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/des_enc.c', diff --git a/deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi b/deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi index 90416f7348628a..3b06ffbeef4280 100644 --- a/deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi @@ -192,7 +192,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/camellia.c', diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/configdata.pm b/deps/openssl/config/archs/linux-ppc64le/asm/configdata.pm index f0fcac5a812010..ba849aab6ad85e 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm/configdata.pm +++ b/deps/openssl/config/archs/linux-ppc64le/asm/configdata.pm @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux-ppc64le", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1329,6 +1329,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3954,6 +3957,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4062,6 +4068,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6327,6 +6336,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6435,6 +6447,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7784,6 +7799,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8458,7 +8477,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", "crypto/bn/libcrypto-lib-ppc-mont.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-bn-ppc.o", "crypto/bn/libfips-lib-bn_add.o", "crypto/bn/libfips-lib-bn_blind.o", @@ -8488,8 +8506,7 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-ppc-mont.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o" + "crypto/bn/libfips-lib-ppc-mont.o" ], "products" => { "lib" => [ @@ -12960,6 +12977,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -13068,6 +13088,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15333,6 +15356,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15441,6 +15467,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16953,6 +16982,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -16989,6 +17019,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18900,6 +18931,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19924,6 +19959,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19960,6 +19996,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20225,6 +20262,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -21086,9 +21124,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-ppc-mont.o" => [ "crypto/bn/ppc-mont.s" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-bn-ppc.o" => [ "crypto/bn/bn-ppc.s" ], @@ -21179,9 +21214,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-ppc-mont.o" => [ "crypto/bn/ppc-mont.s" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/buffer/libcrypto-lib-buf_err.o" => [ "crypto/buffer/buf_err.c" ], @@ -23767,7 +23799,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", "crypto/bn/libcrypto-lib-ppc-mont.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/buffer/libcrypto-lib-buf_err.o", "crypto/buffer/libcrypto-lib-buffer.o", "crypto/camellia/libcrypto-lib-camellia.o", @@ -25357,7 +25388,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", "crypto/bn/libfips-lib-ppc-mont.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/buffer/libfips-lib-buffer.o", "crypto/cmac/libfips-lib-cmac.o", "crypto/des/libfips-lib-des_enc.o", @@ -26879,6 +26909,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27577,8 +27613,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27605,7 +27641,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27622,8 +27658,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-ppc64le/asm/crypto/buildinf.h index bd01cb4bc554c6..02933f6dcf4c97 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-ppc64le/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-ppc64le" -#define DATE "built on: Mon Feb 13 14:09:22 2023 UTC" +#define DATE "built on: Fri Jun 9 12:08:05 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/cmp.h b/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/cmp.h +++ b/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-ppc64le/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/openssl-fips.gypi b/deps/openssl/config/archs/linux-ppc64le/asm/openssl-fips.gypi index 6750f0cc5d9e8d..7880353436c5ef 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-ppc64le/asm/openssl-fips.gypi @@ -33,7 +33,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/des_enc.c', diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/openssl.gypi b/deps/openssl/config/archs/linux-ppc64le/asm/openssl.gypi index 9be0d3b726b8b2..a7479e90fbe74c 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-ppc64le/asm/openssl.gypi @@ -192,7 +192,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/camellia.c', diff --git a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/configdata.pm index 6c1d9bf76fa677..be99b4e22f7b01 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/configdata.pm @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux-ppc64le", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1329,6 +1329,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3954,6 +3957,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4062,6 +4068,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6327,6 +6336,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6435,6 +6447,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7784,6 +7799,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8458,7 +8477,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", "crypto/bn/libcrypto-lib-ppc-mont.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-bn-ppc.o", "crypto/bn/libfips-lib-bn_add.o", "crypto/bn/libfips-lib-bn_blind.o", @@ -8488,8 +8506,7 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-ppc-mont.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o" + "crypto/bn/libfips-lib-ppc-mont.o" ], "products" => { "lib" => [ @@ -12960,6 +12977,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -13068,6 +13088,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15333,6 +15356,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15441,6 +15467,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16953,6 +16982,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -16989,6 +17019,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18900,6 +18931,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19924,6 +19959,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19960,6 +19996,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20225,6 +20262,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -21086,9 +21124,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-ppc-mont.o" => [ "crypto/bn/ppc-mont.s" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-bn-ppc.o" => [ "crypto/bn/bn-ppc.s" ], @@ -21179,9 +21214,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-ppc-mont.o" => [ "crypto/bn/ppc-mont.s" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/buffer/libcrypto-lib-buf_err.o" => [ "crypto/buffer/buf_err.c" ], @@ -23767,7 +23799,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", "crypto/bn/libcrypto-lib-ppc-mont.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/buffer/libcrypto-lib-buf_err.o", "crypto/buffer/libcrypto-lib-buffer.o", "crypto/camellia/libcrypto-lib-camellia.o", @@ -25357,7 +25388,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", "crypto/bn/libfips-lib-ppc-mont.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/buffer/libfips-lib-buffer.o", "crypto/cmac/libfips-lib-cmac.o", "crypto/des/libfips-lib-des_enc.o", @@ -26879,6 +26909,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27577,8 +27613,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27605,7 +27641,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27622,8 +27658,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/crypto/buildinf.h index a81d5872c32ff1..adf8760ec18c50 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-ppc64le" -#define DATE "built on: Mon Feb 13 14:09:34 2023 UTC" +#define DATE "built on: Fri Jun 9 12:08:25 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/cmp.h b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/cmp.h +++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-ppc64le/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/openssl-fips.gypi index dc35fea0d83dc8..97e9aed93d862c 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/openssl-fips.gypi @@ -33,7 +33,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/des_enc.c', diff --git a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/openssl.gypi index 6bf44c25d41c24..f07a1c9c6a49d1 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/openssl.gypi @@ -192,7 +192,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/camellia.c', diff --git a/deps/openssl/config/archs/linux-ppc64le/no-asm/configdata.pm b/deps/openssl/config/archs/linux-ppc64le/no-asm/configdata.pm index e39cc01df26fbb..8e3ad7b5776a38 100644 --- a/deps/openssl/config/archs/linux-ppc64le/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/configdata.pm @@ -157,7 +157,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,7 +206,7 @@ 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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -225,7 +225,7 @@ our %config = ( "AS" => undef, "ASFLAGS" => undef, "BUILDFILE" => undef, - "CC" => "gcc", + "CC" => undef, "CFLAGS" => undef, "CPP" => undef, "CPPDEFINES" => undef, @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux-ppc64le", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1330,6 +1330,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3917,6 +3920,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4025,6 +4031,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6290,6 +6299,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6398,6 +6410,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7747,6 +7762,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8411,7 +8430,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-bn_add.o", "crypto/bn/libfips-lib-bn_asm.o", "crypto/bn/libfips-lib-bn_blind.o", @@ -8439,8 +8457,7 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_shift.o", "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", - "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o" + "crypto/bn/libfips-lib-bn_word.o" ], "products" => { "lib" => [ @@ -12885,6 +12902,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -12993,6 +13013,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15258,6 +15281,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15366,6 +15392,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16878,6 +16907,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -16914,6 +16944,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18825,6 +18856,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19849,6 +19884,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19885,6 +19921,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20150,6 +20187,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -20987,9 +21025,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_x931p.o" => [ "crypto/bn/bn_x931p.c" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-bn_add.o" => [ "crypto/bn/bn_add.c" ], @@ -21074,9 +21109,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_word.o" => [ "crypto/bn/bn_word.c" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/buffer/libcrypto-lib-buf_err.o" => [ "crypto/buffer/buf_err.c" ], @@ -23573,7 +23605,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/buffer/libcrypto-lib-buf_err.o", "crypto/buffer/libcrypto-lib-buffer.o", "crypto/camellia/libcrypto-lib-camellia.o", @@ -25142,7 +25173,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/buffer/libfips-lib-buffer.o", "crypto/cmac/libfips-lib-cmac.o", "crypto/des/libfips-lib-des_enc.o", @@ -26652,6 +26682,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27353,8 +27389,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27381,7 +27417,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27398,8 +27434,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/buildinf.h index de34a7265dad25..b77a7e069c3273 100644 --- a/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-ppc64le" -#define DATE "built on: Mon Feb 13 14:09:45 2023 UTC" +#define DATE "built on: Fri Jun 9 12:08:46 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/cmp.h b/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/cmp.h +++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-ppc64le/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl-fips.gypi index c3880a22c4b0ae..8e3fcb8b75a483 100644 --- a/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl-fips.gypi @@ -33,7 +33,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/des_enc.c', diff --git a/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl.gypi b/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl.gypi index e00d264d0a10fb..046ec44ce8eb20 100644 --- a/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl.gypi @@ -192,7 +192,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/camellia.c', diff --git a/deps/openssl/config/archs/linux-x86_64/asm/configdata.pm b/deps/openssl/config/archs/linux-x86_64/asm/configdata.pm index 900b5731987426..c2f948fe7636b2 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/configdata.pm +++ b/deps/openssl/config/archs/linux-x86_64/asm/configdata.pm @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux-x86_64", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1330,6 +1330,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3979,6 +3982,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4087,6 +4093,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6352,6 +6361,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6460,6 +6472,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7809,6 +7824,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8482,7 +8501,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-rsaz-avx2.o", "crypto/bn/libcrypto-lib-rsaz-avx512.o", "crypto/bn/libcrypto-lib-rsaz-x86_64.o", @@ -8518,7 +8536,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-rsaz-avx2.o", "crypto/bn/libfips-lib-rsaz-avx512.o", "crypto/bn/libfips-lib-rsaz-x86_64.o", @@ -13005,6 +13022,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -13113,6 +13133,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15378,6 +15401,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15486,6 +15512,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16998,6 +17027,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -17034,6 +17064,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18945,6 +18976,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19969,6 +20004,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -20005,6 +20041,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20270,6 +20307,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -21140,9 +21178,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_x931p.o" => [ "crypto/bn/bn_x931p.c" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libcrypto-lib-rsaz-avx2.o" => [ "crypto/bn/rsaz-avx2.s" ], @@ -21248,9 +21283,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_word.o" => [ "crypto/bn/bn_word.c" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-rsaz-avx2.o" => [ "crypto/bn/rsaz-avx2.s" ], @@ -23842,7 +23874,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-rsaz-avx2.o", "crypto/bn/libcrypto-lib-rsaz-avx512.o", "crypto/bn/libcrypto-lib-rsaz-x86_64.o", @@ -25436,7 +25467,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-rsaz-avx2.o", "crypto/bn/libfips-lib-rsaz-avx512.o", "crypto/bn/libfips-lib-rsaz-x86_64.o", @@ -26964,6 +26994,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27662,8 +27698,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27690,7 +27726,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27707,8 +27743,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-x86_64/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-x86_64/asm/crypto/buildinf.h index e296c1e9fdf25a..b79059d5f8a546 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-x86_64/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-x86_64" -#define DATE "built on: Mon Feb 13 14:08:44 2023 UTC" +#define DATE "built on: Fri Jun 9 12:06:54 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/cmp.h b/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/cmp.h +++ b/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-x86_64/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux-x86_64/asm/openssl-fips.gypi b/deps/openssl/config/archs/linux-x86_64/asm/openssl-fips.gypi index 92771a65dcdbad..55e1e664a79a63 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-x86_64/asm/openssl-fips.gypi @@ -31,7 +31,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/bn/rsaz_exp.c', 'openssl/crypto/bn/rsaz_exp_x2.c', 'openssl/crypto/buffer/buffer.c', diff --git a/deps/openssl/config/archs/linux-x86_64/asm/openssl.gypi b/deps/openssl/config/archs/linux-x86_64/asm/openssl.gypi index bf7e514da615cd..0f35968566e11d 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-x86_64/asm/openssl.gypi @@ -190,7 +190,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/bn/rsaz_exp.c', 'openssl/crypto/bn/rsaz_exp_x2.c', 'openssl/crypto/buffer/buf_err.c', diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux-x86_64/asm_avx2/configdata.pm index d5e10dd923b04c..44a4cc40e82632 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/configdata.pm @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux-x86_64", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1330,6 +1330,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3979,6 +3982,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4087,6 +4093,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6352,6 +6361,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6460,6 +6472,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7809,6 +7824,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8482,7 +8501,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-rsaz-avx2.o", "crypto/bn/libcrypto-lib-rsaz-avx512.o", "crypto/bn/libcrypto-lib-rsaz-x86_64.o", @@ -8518,7 +8536,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-rsaz-avx2.o", "crypto/bn/libfips-lib-rsaz-avx512.o", "crypto/bn/libfips-lib-rsaz-x86_64.o", @@ -13005,6 +13022,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -13113,6 +13133,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15378,6 +15401,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15486,6 +15512,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16998,6 +17027,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -17034,6 +17064,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18945,6 +18976,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19969,6 +20004,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -20005,6 +20041,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20270,6 +20307,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -21140,9 +21178,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_x931p.o" => [ "crypto/bn/bn_x931p.c" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libcrypto-lib-rsaz-avx2.o" => [ "crypto/bn/rsaz-avx2.s" ], @@ -21248,9 +21283,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_word.o" => [ "crypto/bn/bn_word.c" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-rsaz-avx2.o" => [ "crypto/bn/rsaz-avx2.s" ], @@ -23842,7 +23874,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-rsaz-avx2.o", "crypto/bn/libcrypto-lib-rsaz-avx512.o", "crypto/bn/libcrypto-lib-rsaz-x86_64.o", @@ -25436,7 +25467,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-rsaz-avx2.o", "crypto/bn/libfips-lib-rsaz-avx512.o", "crypto/bn/libfips-lib-rsaz-x86_64.o", @@ -26964,6 +26994,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27662,8 +27698,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27690,7 +27726,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27707,8 +27743,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/buildinf.h index c5cd8000e5197f..7309b9400bf53d 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-x86_64" -#define DATE "built on: Mon Feb 13 14:08:58 2023 UTC" +#define DATE "built on: Fri Jun 9 12:07:21 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/cmp.h b/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/cmp.h +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-x86_64/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl-fips.gypi index db7be077be2e49..cad5b27e655b2f 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl-fips.gypi @@ -31,7 +31,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/bn/rsaz_exp.c', 'openssl/crypto/bn/rsaz_exp_x2.c', 'openssl/crypto/buffer/buffer.c', diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl.gypi index c4bd96ac6cd940..f65991fee158c8 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl.gypi @@ -190,7 +190,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/bn/rsaz_exp.c', 'openssl/crypto/bn/rsaz_exp_x2.c', 'openssl/crypto/buffer/buf_err.c', diff --git a/deps/openssl/config/archs/linux-x86_64/no-asm/configdata.pm b/deps/openssl/config/archs/linux-x86_64/no-asm/configdata.pm index f245b95e42cba6..29376e60ea0182 100644 --- a/deps/openssl/config/archs/linux-x86_64/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux-x86_64/no-asm/configdata.pm @@ -157,7 +157,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,7 +206,7 @@ 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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -225,7 +225,7 @@ our %config = ( "AS" => undef, "ASFLAGS" => undef, "BUILDFILE" => undef, - "CC" => "gcc", + "CC" => undef, "CFLAGS" => undef, "CPP" => undef, "CPPDEFINES" => undef, @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux-x86_64", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1331,6 +1331,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3918,6 +3921,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4026,6 +4032,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6291,6 +6300,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6399,6 +6411,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7748,6 +7763,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8412,7 +8431,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-bn_add.o", "crypto/bn/libfips-lib-bn_asm.o", "crypto/bn/libfips-lib-bn_blind.o", @@ -8440,8 +8458,7 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_shift.o", "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", - "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o" + "crypto/bn/libfips-lib-bn_word.o" ], "products" => { "lib" => [ @@ -12886,6 +12903,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -12994,6 +13014,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15259,6 +15282,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15367,6 +15393,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16879,6 +16908,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -16915,6 +16945,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18826,6 +18857,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19850,6 +19885,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19886,6 +19922,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20151,6 +20188,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -20988,9 +21026,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_x931p.o" => [ "crypto/bn/bn_x931p.c" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-bn_add.o" => [ "crypto/bn/bn_add.c" ], @@ -21075,9 +21110,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_word.o" => [ "crypto/bn/bn_word.c" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/buffer/libcrypto-lib-buf_err.o" => [ "crypto/buffer/buf_err.c" ], @@ -23574,7 +23606,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/buffer/libcrypto-lib-buf_err.o", "crypto/buffer/libcrypto-lib-buffer.o", "crypto/camellia/libcrypto-lib-camellia.o", @@ -25143,7 +25174,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/buffer/libfips-lib-buffer.o", "crypto/cmac/libfips-lib-cmac.o", "crypto/des/libfips-lib-des_enc.o", @@ -26653,6 +26683,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27354,8 +27390,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27382,7 +27418,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27399,8 +27435,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/buildinf.h index 196af15559fadf..1a65c33e1a42c7 100644 --- a/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-x86_64" -#define DATE "built on: Mon Feb 13 14:09:12 2023 UTC" +#define DATE "built on: Fri Jun 9 12:07:46 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/cmp.h b/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/cmp.h +++ b/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-x86_64/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux-x86_64/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/linux-x86_64/no-asm/openssl-fips.gypi index f0dcf27f89dacd..c7b6bbbec688d9 100644 --- a/deps/openssl/config/archs/linux-x86_64/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-x86_64/no-asm/openssl-fips.gypi @@ -33,7 +33,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/des_enc.c', diff --git a/deps/openssl/config/archs/linux-x86_64/no-asm/openssl.gypi b/deps/openssl/config/archs/linux-x86_64/no-asm/openssl.gypi index 935390342dda8e..f9ab8cd8ad2d05 100644 --- a/deps/openssl/config/archs/linux-x86_64/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-x86_64/no-asm/openssl.gypi @@ -192,7 +192,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/camellia.c', diff --git a/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm b/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm index a696f077770c4b..9c834e7af9f81f 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm +++ b/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux32-s390x", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1329,6 +1329,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3959,6 +3962,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4067,6 +4073,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6332,6 +6341,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6440,6 +6452,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7789,6 +7804,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8453,7 +8472,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-s390x-gf2m.o", "crypto/bn/libcrypto-lib-s390x-mont.o", "crypto/bn/libfips-lib-bn_add.o", @@ -8484,7 +8502,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-s390x-gf2m.o", "crypto/bn/libfips-lib-s390x-mont.o" ], @@ -12943,6 +12960,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -13051,6 +13071,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15316,6 +15339,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15424,6 +15450,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16936,6 +16965,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -16972,6 +17002,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18937,6 +18968,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19961,6 +19996,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19997,6 +20033,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20262,6 +20299,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -21093,9 +21131,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_x931p.o" => [ "crypto/bn/bn_x931p.c" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libcrypto-lib-s390x-gf2m.o" => [ "crypto/bn/s390x-gf2m.s" ], @@ -21186,9 +21221,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_word.o" => [ "crypto/bn/bn_word.c" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-s390x-gf2m.o" => [ "crypto/bn/s390x-gf2m.s" ], @@ -23732,7 +23764,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-s390x-gf2m.o", "crypto/bn/libcrypto-lib-s390x-mont.o", "crypto/buffer/libcrypto-lib-buf_err.o", @@ -25309,7 +25340,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-s390x-gf2m.o", "crypto/bn/libfips-lib-s390x-mont.o", "crypto/buffer/libfips-lib-buffer.o", @@ -26828,6 +26858,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27526,8 +27562,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27554,7 +27590,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27571,8 +27607,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux32-s390x/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux32-s390x/asm/crypto/buildinf.h index 7714fc2b8ac05d..e90bf206b73b2d 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux32-s390x/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux32-s390x" -#define DATE "built on: Mon Feb 13 14:09:56 2023 UTC" +#define DATE "built on: Fri Jun 9 12:09:05 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/cmp.h b/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/cmp.h +++ b/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux32-s390x/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux32-s390x/asm/openssl-fips.gypi b/deps/openssl/config/archs/linux32-s390x/asm/openssl-fips.gypi index 30225aeda433f3..1ea8f67823afd8 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux32-s390x/asm/openssl-fips.gypi @@ -31,7 +31,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/des_enc.c', diff --git a/deps/openssl/config/archs/linux32-s390x/asm/openssl.gypi b/deps/openssl/config/archs/linux32-s390x/asm/openssl.gypi index 798bf77851587b..21816e45dad68b 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/openssl.gypi +++ b/deps/openssl/config/archs/linux32-s390x/asm/openssl.gypi @@ -190,7 +190,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/camellia.c', diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux32-s390x/asm_avx2/configdata.pm index d0fa7395b8c772..e2a285be53885d 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/configdata.pm @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux32-s390x", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1329,6 +1329,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3959,6 +3962,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4067,6 +4073,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6332,6 +6341,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6440,6 +6452,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7789,6 +7804,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8453,7 +8472,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-s390x-gf2m.o", "crypto/bn/libcrypto-lib-s390x-mont.o", "crypto/bn/libfips-lib-bn_add.o", @@ -8484,7 +8502,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-s390x-gf2m.o", "crypto/bn/libfips-lib-s390x-mont.o" ], @@ -12943,6 +12960,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -13051,6 +13071,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15316,6 +15339,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15424,6 +15450,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16936,6 +16965,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -16972,6 +17002,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18937,6 +18968,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19961,6 +19996,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19997,6 +20033,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20262,6 +20299,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -21093,9 +21131,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_x931p.o" => [ "crypto/bn/bn_x931p.c" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libcrypto-lib-s390x-gf2m.o" => [ "crypto/bn/s390x-gf2m.s" ], @@ -21186,9 +21221,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_word.o" => [ "crypto/bn/bn_word.c" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-s390x-gf2m.o" => [ "crypto/bn/s390x-gf2m.s" ], @@ -23732,7 +23764,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-s390x-gf2m.o", "crypto/bn/libcrypto-lib-s390x-mont.o", "crypto/buffer/libcrypto-lib-buf_err.o", @@ -25309,7 +25340,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-s390x-gf2m.o", "crypto/bn/libfips-lib-s390x-mont.o", "crypto/buffer/libfips-lib-buffer.o", @@ -26828,6 +26858,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27526,8 +27562,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27554,7 +27590,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27571,8 +27607,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/buildinf.h index 5a8b092365a2bb..5c8bda117c2ed5 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux32-s390x" -#define DATE "built on: Mon Feb 13 14:10:07 2023 UTC" +#define DATE "built on: Fri Jun 9 12:09:25 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/cmp.h b/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/cmp.h +++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux32-s390x/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/linux32-s390x/asm_avx2/openssl-fips.gypi index b9face90d39841..acc4e71742ea93 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/openssl-fips.gypi @@ -31,7 +31,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/des_enc.c', diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux32-s390x/asm_avx2/openssl.gypi index d72bf55441b1b2..a036ce3acab1ae 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/openssl.gypi @@ -190,7 +190,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/camellia.c', diff --git a/deps/openssl/config/archs/linux32-s390x/no-asm/configdata.pm b/deps/openssl/config/archs/linux32-s390x/no-asm/configdata.pm index e72b28358d3dc7..278f09a8eb2d28 100644 --- a/deps/openssl/config/archs/linux32-s390x/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux32-s390x/no-asm/configdata.pm @@ -157,7 +157,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,7 +206,7 @@ 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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -225,7 +225,7 @@ our %config = ( "AS" => undef, "ASFLAGS" => undef, "BUILDFILE" => undef, - "CC" => "gcc", + "CC" => undef, "CFLAGS" => undef, "CPP" => undef, "CPPDEFINES" => undef, @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux32-s390x", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1330,6 +1330,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3917,6 +3920,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4025,6 +4031,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6290,6 +6299,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6398,6 +6410,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7747,6 +7762,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8411,7 +8430,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-bn_add.o", "crypto/bn/libfips-lib-bn_asm.o", "crypto/bn/libfips-lib-bn_blind.o", @@ -8439,8 +8457,7 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_shift.o", "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", - "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o" + "crypto/bn/libfips-lib-bn_word.o" ], "products" => { "lib" => [ @@ -12885,6 +12902,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -12993,6 +13013,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15258,6 +15281,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15366,6 +15392,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16878,6 +16907,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -16914,6 +16944,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18825,6 +18856,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19849,6 +19884,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19885,6 +19921,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20150,6 +20187,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -20987,9 +21025,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_x931p.o" => [ "crypto/bn/bn_x931p.c" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-bn_add.o" => [ "crypto/bn/bn_add.c" ], @@ -21074,9 +21109,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_word.o" => [ "crypto/bn/bn_word.c" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/buffer/libcrypto-lib-buf_err.o" => [ "crypto/buffer/buf_err.c" ], @@ -23573,7 +23605,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/buffer/libcrypto-lib-buf_err.o", "crypto/buffer/libcrypto-lib-buffer.o", "crypto/camellia/libcrypto-lib-camellia.o", @@ -25142,7 +25173,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/buffer/libfips-lib-buffer.o", "crypto/cmac/libfips-lib-cmac.o", "crypto/des/libfips-lib-des_enc.o", @@ -26652,6 +26682,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27353,8 +27389,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27381,7 +27417,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27398,8 +27434,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/buildinf.h index 05777f13416023..e96f91eeb354f0 100644 --- a/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux32-s390x" -#define DATE "built on: Mon Feb 13 14:10:18 2023 UTC" +#define DATE "built on: Fri Jun 9 12:09:46 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/cmp.h b/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/cmp.h +++ b/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux32-s390x/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux32-s390x/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/linux32-s390x/no-asm/openssl-fips.gypi index 1676c256f22837..63cfc208b50dc1 100644 --- a/deps/openssl/config/archs/linux32-s390x/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux32-s390x/no-asm/openssl-fips.gypi @@ -33,7 +33,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/des_enc.c', diff --git a/deps/openssl/config/archs/linux32-s390x/no-asm/openssl.gypi b/deps/openssl/config/archs/linux32-s390x/no-asm/openssl.gypi index 98678dbf0db300..1b3c2428a59557 100644 --- a/deps/openssl/config/archs/linux32-s390x/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux32-s390x/no-asm/openssl.gypi @@ -192,7 +192,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/camellia.c', diff --git a/deps/openssl/config/archs/linux64-loongarch64/no-asm/configdata.pm b/deps/openssl/config/archs/linux64-loongarch64/no-asm/configdata.pm index 7092f963d0e3ce..0cce7c2cd8bc69 100644 --- a/deps/openssl/config/archs/linux64-loongarch64/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux64-loongarch64/no-asm/configdata.pm @@ -157,7 +157,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,7 +206,7 @@ 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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -225,7 +225,7 @@ our %config = ( "AS" => undef, "ASFLAGS" => undef, "BUILDFILE" => undef, - "CC" => "gcc", + "CC" => undef, "CFLAGS" => undef, "CPP" => undef, "CPPDEFINES" => undef, @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux64-loongarch64", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1329,6 +1329,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3916,6 +3919,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4024,6 +4030,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6289,6 +6298,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6397,6 +6409,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7746,6 +7761,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8410,7 +8429,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-bn_add.o", "crypto/bn/libfips-lib-bn_asm.o", "crypto/bn/libfips-lib-bn_blind.o", @@ -8438,8 +8456,7 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_shift.o", "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", - "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o" + "crypto/bn/libfips-lib-bn_word.o" ], "products" => { "lib" => [ @@ -12884,6 +12901,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -12992,6 +13012,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15257,6 +15280,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15365,6 +15391,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16877,6 +16906,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -16913,6 +16943,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18824,6 +18855,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19848,6 +19883,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19884,6 +19920,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20149,6 +20186,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -20986,9 +21024,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_x931p.o" => [ "crypto/bn/bn_x931p.c" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-bn_add.o" => [ "crypto/bn/bn_add.c" ], @@ -21073,9 +21108,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_word.o" => [ "crypto/bn/bn_word.c" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/buffer/libcrypto-lib-buf_err.o" => [ "crypto/buffer/buf_err.c" ], @@ -23572,7 +23604,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/buffer/libcrypto-lib-buf_err.o", "crypto/buffer/libcrypto-lib-buffer.o", "crypto/camellia/libcrypto-lib-camellia.o", @@ -25141,7 +25172,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/buffer/libfips-lib-buffer.o", "crypto/cmac/libfips-lib-cmac.o", "crypto/des/libfips-lib-des_enc.o", @@ -26651,6 +26681,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27352,8 +27388,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27380,7 +27416,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27397,8 +27433,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux64-loongarch64/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux64-loongarch64/no-asm/crypto/buildinf.h index 176ffff0870934..2a82a356209006 100644 --- a/deps/openssl/config/archs/linux64-loongarch64/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux64-loongarch64/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux64-loongarch64" -#define DATE "built on: Thu May 4 02:11:25 2023 UTC" +#define DATE "built on: Fri Jun 9 12:16:55 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux64-loongarch64/no-asm/include/openssl/cmp.h b/deps/openssl/config/archs/linux64-loongarch64/no-asm/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/linux64-loongarch64/no-asm/include/openssl/cmp.h +++ b/deps/openssl/config/archs/linux64-loongarch64/no-asm/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/linux64-loongarch64/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux64-loongarch64/no-asm/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/linux64-loongarch64/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux64-loongarch64/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux64-loongarch64/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/linux64-loongarch64/no-asm/openssl-fips.gypi index 91b4e61c4de229..97b6d28086e2ff 100644 --- a/deps/openssl/config/archs/linux64-loongarch64/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux64-loongarch64/no-asm/openssl-fips.gypi @@ -33,7 +33,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/des_enc.c', diff --git a/deps/openssl/config/archs/linux64-loongarch64/no-asm/openssl.gypi b/deps/openssl/config/archs/linux64-loongarch64/no-asm/openssl.gypi index 357c6fbc057fd4..7646500a7b4e33 100644 --- a/deps/openssl/config/archs/linux64-loongarch64/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux64-loongarch64/no-asm/openssl.gypi @@ -192,7 +192,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/camellia.c', diff --git a/deps/openssl/config/archs/linux64-mips64/asm/configdata.pm b/deps/openssl/config/archs/linux64-mips64/asm/configdata.pm index 63ad4d384327ce..15b1926241b516 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm/configdata.pm +++ b/deps/openssl/config/archs/linux64-mips64/asm/configdata.pm @@ -146,6 +146,7 @@ our %config = ( "build_type" => "release", "builddir" => ".", "cflags" => [ + "-mips3", "-Wa,--noexecstack" ], "conf_files" => [ @@ -153,13 +154,15 @@ our %config = ( "Configurations/10-main.conf" ], "cppflags" => [], - "cxxflags" => [], + "cxxflags" => [ + "-mips3" + ], "defines" => [ "NDEBUG" ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,7 +210,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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -259,11 +262,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux64-mips64", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1330,6 +1333,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3939,6 +3945,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4047,6 +4056,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6312,6 +6324,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6420,6 +6435,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7769,6 +7787,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8434,7 +8456,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", "crypto/bn/libcrypto-lib-mips-mont.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-bn-mips.o", "crypto/bn/libfips-lib-bn_add.o", "crypto/bn/libfips-lib-bn_blind.o", @@ -8463,8 +8484,7 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-mips-mont.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o" + "crypto/bn/libfips-lib-mips-mont.o" ], "products" => { "lib" => [ @@ -12916,6 +12936,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -13024,6 +13047,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15289,6 +15315,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15397,6 +15426,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16909,6 +16941,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -16945,6 +16978,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18895,6 +18929,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19919,6 +19957,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19955,6 +19994,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20220,6 +20260,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -21060,9 +21101,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-mips-mont.o" => [ "crypto/bn/mips-mont.S" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-bn-mips.o" => [ "crypto/bn/bn-mips.S" ], @@ -21150,9 +21188,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-mips-mont.o" => [ "crypto/bn/mips-mont.S" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/buffer/libcrypto-lib-buf_err.o" => [ "crypto/buffer/buf_err.c" ], @@ -23671,7 +23706,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", "crypto/bn/libcrypto-lib-mips-mont.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/buffer/libcrypto-lib-buf_err.o", "crypto/buffer/libcrypto-lib-buffer.o", "crypto/camellia/libcrypto-lib-camellia.o", @@ -25245,7 +25279,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", "crypto/bn/libfips-lib-mips-mont.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/buffer/libfips-lib-buffer.o", "crypto/cmac/libfips-lib-cmac.o", "crypto/des/libfips-lib-des_enc.o", @@ -26758,6 +26791,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27456,8 +27495,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27484,7 +27523,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27501,8 +27540,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux64-mips64/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux64-mips64/asm/crypto/buildinf.h index 40fdf1436bab6c..2d223c9b46e7d0 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux64-mips64/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux64-mips64" -#define DATE "built on: Mon Feb 13 14:11:02 2023 UTC" +#define DATE "built on: Fri Jun 9 12:11:06 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -21,11 +21,12 @@ static const char compiler_flags[] = { 'c','o','m','p','i','l','e','r',':',' ','g','c','c',' ','-','f', 'P','I','C',' ','-','p','t','h','r','e','a','d',' ','-','m','a', - 'b','i','=','6','4',' ','-','W','a',',','-','-','n','o','e','x', - 'e','c','s','t','a','c','k',' ','-','W','a','l','l',' ','-','O', - '3',' ','-','D','O','P','E','N','S','S','L','_','U','S','E','_', - 'N','O','D','E','L','E','T','E',' ','-','D','O','P','E','N','S', - 'S','L','_','P','I','C',' ','-','D','O','P','E','N','S','S','L', - '_','B','U','I','L','D','I','N','G','_','O','P','E','N','S','S', - 'L',' ','-','D','N','D','E','B','U','G','\0' + 'b','i','=','6','4',' ','-','m','i','p','s','3',' ','-','W','a', + ',','-','-','n','o','e','x','e','c','s','t','a','c','k',' ','-', + 'W','a','l','l',' ','-','O','3',' ','-','D','O','P','E','N','S', + 'S','L','_','U','S','E','_','N','O','D','E','L','E','T','E',' ', + '-','D','O','P','E','N','S','S','L','_','P','I','C',' ','-','D', + 'O','P','E','N','S','S','L','_','B','U','I','L','D','I','N','G', + '_','O','P','E','N','S','S','L',' ','-','D','N','D','E','B','U', + 'G','\0' }; diff --git a/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/cmp.h b/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/cmp.h +++ b/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux64-mips64/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux64-mips64/asm/openssl-cl.gypi b/deps/openssl/config/archs/linux64-mips64/asm/openssl-cl.gypi index 1325c04e2aa310..263cf3c2e00334 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/linux64-mips64/asm/openssl-cl.gypi @@ -13,6 +13,7 @@ 'OPENSSL_PIC', ], 'openssl_cflags_linux64-mips64': [ + '-mips3', '-Wa,--noexecstack', '-Wall -O3', '-pthread -mabi=64', diff --git a/deps/openssl/config/archs/linux64-mips64/asm/openssl-fips.gypi b/deps/openssl/config/archs/linux64-mips64/asm/openssl-fips.gypi index 5022e423888d0a..c7660305e294c7 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux64-mips64/asm/openssl-fips.gypi @@ -31,7 +31,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/des_enc.c', @@ -302,6 +301,7 @@ 'FIPS_MODULE', ], 'openssl_cflags_linux64-mips64': [ + '-mips3', '-Wa,--noexecstack', '-Wall -O3', '-pthread -mabi=64', diff --git a/deps/openssl/config/archs/linux64-mips64/asm/openssl.gypi b/deps/openssl/config/archs/linux64-mips64/asm/openssl.gypi index b448469c3e7bbe..530cea8a707d21 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm/openssl.gypi +++ b/deps/openssl/config/archs/linux64-mips64/asm/openssl.gypi @@ -190,7 +190,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/camellia.c', @@ -982,6 +981,7 @@ 'OPENSSL_PIC', ], 'openssl_cflags_linux64-mips64': [ + '-mips3', '-Wa,--noexecstack', '-Wall -O3', '-pthread -mabi=64', diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux64-mips64/asm_avx2/configdata.pm index 2a3f0256786e61..7c704ad5c61386 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/configdata.pm @@ -146,6 +146,7 @@ our %config = ( "build_type" => "release", "builddir" => ".", "cflags" => [ + "-mips3", "-Wa,--noexecstack" ], "conf_files" => [ @@ -153,13 +154,15 @@ our %config = ( "Configurations/10-main.conf" ], "cppflags" => [], - "cxxflags" => [], + "cxxflags" => [ + "-mips3" + ], "defines" => [ "NDEBUG" ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,7 +210,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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -259,11 +262,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux64-mips64", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1330,6 +1333,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3939,6 +3945,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4047,6 +4056,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6312,6 +6324,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6420,6 +6435,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7769,6 +7787,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8434,7 +8456,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", "crypto/bn/libcrypto-lib-mips-mont.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-bn-mips.o", "crypto/bn/libfips-lib-bn_add.o", "crypto/bn/libfips-lib-bn_blind.o", @@ -8463,8 +8484,7 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-mips-mont.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o" + "crypto/bn/libfips-lib-mips-mont.o" ], "products" => { "lib" => [ @@ -12916,6 +12936,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -13024,6 +13047,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15289,6 +15315,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15397,6 +15426,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16909,6 +16941,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -16945,6 +16978,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18895,6 +18929,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19919,6 +19957,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19955,6 +19994,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20220,6 +20260,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -21060,9 +21101,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-mips-mont.o" => [ "crypto/bn/mips-mont.S" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-bn-mips.o" => [ "crypto/bn/bn-mips.S" ], @@ -21150,9 +21188,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-mips-mont.o" => [ "crypto/bn/mips-mont.S" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/buffer/libcrypto-lib-buf_err.o" => [ "crypto/buffer/buf_err.c" ], @@ -23671,7 +23706,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", "crypto/bn/libcrypto-lib-mips-mont.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/buffer/libcrypto-lib-buf_err.o", "crypto/buffer/libcrypto-lib-buffer.o", "crypto/camellia/libcrypto-lib-camellia.o", @@ -25245,7 +25279,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", "crypto/bn/libfips-lib-mips-mont.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/buffer/libfips-lib-buffer.o", "crypto/cmac/libfips-lib-cmac.o", "crypto/des/libfips-lib-des_enc.o", @@ -26758,6 +26791,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27456,8 +27495,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27484,7 +27523,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27501,8 +27540,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux64-mips64/asm_avx2/crypto/buildinf.h index 1abcc6f84a15d2..1143c2dce57b12 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux64-mips64" -#define DATE "built on: Mon Feb 13 14:11:13 2023 UTC" +#define DATE "built on: Fri Jun 9 12:11:25 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -22,11 +22,12 @@ static const char compiler_flags[] = { 'c','o','m','p','i','l','e','r',':',' ','.','.','/','c','o','n', 'f','i','g','/','f','a','k','e','_','g','c','c','.','p','l',' ', '-','f','P','I','C',' ','-','p','t','h','r','e','a','d',' ','-', - 'm','a','b','i','=','6','4',' ','-','W','a',',','-','-','n','o', - 'e','x','e','c','s','t','a','c','k',' ','-','W','a','l','l',' ', - '-','O','3',' ','-','D','O','P','E','N','S','S','L','_','U','S', - 'E','_','N','O','D','E','L','E','T','E',' ','-','D','O','P','E', - 'N','S','S','L','_','P','I','C',' ','-','D','O','P','E','N','S', - 'S','L','_','B','U','I','L','D','I','N','G','_','O','P','E','N', - 'S','S','L',' ','-','D','N','D','E','B','U','G','\0' + 'm','a','b','i','=','6','4',' ','-','m','i','p','s','3',' ','-', + 'W','a',',','-','-','n','o','e','x','e','c','s','t','a','c','k', + ' ','-','W','a','l','l',' ','-','O','3',' ','-','D','O','P','E', + 'N','S','S','L','_','U','S','E','_','N','O','D','E','L','E','T', + 'E',' ','-','D','O','P','E','N','S','S','L','_','P','I','C',' ', + '-','D','O','P','E','N','S','S','L','_','B','U','I','L','D','I', + 'N','G','_','O','P','E','N','S','S','L',' ','-','D','N','D','E', + 'B','U','G','\0' }; diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/cmp.h b/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/cmp.h +++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux64-mips64/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/linux64-mips64/asm_avx2/openssl-cl.gypi index 3171479312fa78..b64cb827aad2a2 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/openssl-cl.gypi +++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/openssl-cl.gypi @@ -13,6 +13,7 @@ 'OPENSSL_PIC', ], 'openssl_cflags_linux64-mips64': [ + '-mips3', '-Wa,--noexecstack', '-Wall -O3', '-pthread -mabi=64', diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/linux64-mips64/asm_avx2/openssl-fips.gypi index c3258274c5c906..e4a55e998a64fa 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/openssl-fips.gypi @@ -31,7 +31,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/des_enc.c', @@ -302,6 +301,7 @@ 'FIPS_MODULE', ], 'openssl_cflags_linux64-mips64': [ + '-mips3', '-Wa,--noexecstack', '-Wall -O3', '-pthread -mabi=64', diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux64-mips64/asm_avx2/openssl.gypi index 59cbb04e4ed717..04841c7652189d 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/openssl.gypi @@ -190,7 +190,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/camellia.c', @@ -982,6 +981,7 @@ 'OPENSSL_PIC', ], 'openssl_cflags_linux64-mips64': [ + '-mips3', '-Wa,--noexecstack', '-Wall -O3', '-pthread -mabi=64', diff --git a/deps/openssl/config/archs/linux64-mips64/no-asm/configdata.pm b/deps/openssl/config/archs/linux64-mips64/no-asm/configdata.pm index 3159bc887ee608..7b25eb874e412e 100644 --- a/deps/openssl/config/archs/linux64-mips64/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux64-mips64/no-asm/configdata.pm @@ -157,7 +157,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,7 +206,7 @@ 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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -225,7 +225,7 @@ our %config = ( "AS" => undef, "ASFLAGS" => undef, "BUILDFILE" => undef, - "CC" => "gcc", + "CC" => undef, "CFLAGS" => undef, "CPP" => undef, "CPPDEFINES" => undef, @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux64-mips64", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1331,6 +1331,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3918,6 +3921,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4026,6 +4032,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6291,6 +6300,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6399,6 +6411,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7748,6 +7763,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8412,7 +8431,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-bn_add.o", "crypto/bn/libfips-lib-bn_asm.o", "crypto/bn/libfips-lib-bn_blind.o", @@ -8440,8 +8458,7 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_shift.o", "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", - "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o" + "crypto/bn/libfips-lib-bn_word.o" ], "products" => { "lib" => [ @@ -12886,6 +12903,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -12994,6 +13014,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15259,6 +15282,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15367,6 +15393,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16879,6 +16908,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -16915,6 +16945,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18826,6 +18857,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19850,6 +19885,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19886,6 +19922,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20151,6 +20188,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -20988,9 +21026,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_x931p.o" => [ "crypto/bn/bn_x931p.c" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-bn_add.o" => [ "crypto/bn/bn_add.c" ], @@ -21075,9 +21110,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_word.o" => [ "crypto/bn/bn_word.c" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/buffer/libcrypto-lib-buf_err.o" => [ "crypto/buffer/buf_err.c" ], @@ -23574,7 +23606,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/buffer/libcrypto-lib-buf_err.o", "crypto/buffer/libcrypto-lib-buffer.o", "crypto/camellia/libcrypto-lib-camellia.o", @@ -25143,7 +25174,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/buffer/libfips-lib-buffer.o", "crypto/cmac/libfips-lib-cmac.o", "crypto/des/libfips-lib-des_enc.o", @@ -26653,6 +26683,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27354,8 +27390,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27382,7 +27418,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27399,8 +27435,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux64-mips64/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux64-mips64/no-asm/crypto/buildinf.h index dc152ec243cce0..4303c5e7f82648 100644 --- a/deps/openssl/config/archs/linux64-mips64/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux64-mips64/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux64-mips64" -#define DATE "built on: Mon Feb 13 14:11:23 2023 UTC" +#define DATE "built on: Fri Jun 9 12:11:45 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/cmp.h b/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/cmp.h +++ b/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux64-mips64/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux64-mips64/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/linux64-mips64/no-asm/openssl-fips.gypi index f2a5f5ed28c902..a6178f1c65a5e9 100644 --- a/deps/openssl/config/archs/linux64-mips64/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux64-mips64/no-asm/openssl-fips.gypi @@ -33,7 +33,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/des_enc.c', diff --git a/deps/openssl/config/archs/linux64-mips64/no-asm/openssl.gypi b/deps/openssl/config/archs/linux64-mips64/no-asm/openssl.gypi index 7f1608d30a1b18..0051a07280ecd4 100644 --- a/deps/openssl/config/archs/linux64-mips64/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux64-mips64/no-asm/openssl.gypi @@ -192,7 +192,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/camellia.c', diff --git a/deps/openssl/config/archs/linux64-riscv64/no-asm/configdata.pm b/deps/openssl/config/archs/linux64-riscv64/no-asm/configdata.pm index 3a4b270d9249bc..76fc8399a00801 100644 --- a/deps/openssl/config/archs/linux64-riscv64/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux64-riscv64/no-asm/configdata.pm @@ -157,7 +157,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,7 +206,7 @@ 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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -225,7 +225,7 @@ our %config = ( "AS" => undef, "ASFLAGS" => undef, "BUILDFILE" => undef, - "CC" => "gcc", + "CC" => undef, "CFLAGS" => undef, "CPP" => undef, "CPPDEFINES" => undef, @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux64-riscv64", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1329,6 +1329,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3916,6 +3919,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4024,6 +4030,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6289,6 +6298,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6397,6 +6409,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7746,6 +7761,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8410,7 +8429,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-bn_add.o", "crypto/bn/libfips-lib-bn_asm.o", "crypto/bn/libfips-lib-bn_blind.o", @@ -8438,8 +8456,7 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_shift.o", "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", - "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o" + "crypto/bn/libfips-lib-bn_word.o" ], "products" => { "lib" => [ @@ -12884,6 +12901,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -12992,6 +13012,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15257,6 +15280,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15365,6 +15391,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16877,6 +16906,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -16913,6 +16943,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18824,6 +18855,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19848,6 +19883,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19884,6 +19920,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20149,6 +20186,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -20986,9 +21024,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_x931p.o" => [ "crypto/bn/bn_x931p.c" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-bn_add.o" => [ "crypto/bn/bn_add.c" ], @@ -21073,9 +21108,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_word.o" => [ "crypto/bn/bn_word.c" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/buffer/libcrypto-lib-buf_err.o" => [ "crypto/buffer/buf_err.c" ], @@ -23572,7 +23604,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/buffer/libcrypto-lib-buf_err.o", "crypto/buffer/libcrypto-lib-buffer.o", "crypto/camellia/libcrypto-lib-camellia.o", @@ -25141,7 +25172,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/buffer/libfips-lib-buffer.o", "crypto/cmac/libfips-lib-cmac.o", "crypto/des/libfips-lib-des_enc.o", @@ -26651,6 +26681,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27352,8 +27388,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27380,7 +27416,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27397,8 +27433,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux64-riscv64/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux64-riscv64/no-asm/crypto/buildinf.h index 78193a4f5c05fd..5a857cbdc61f87 100644 --- a/deps/openssl/config/archs/linux64-riscv64/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux64-riscv64/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux64-riscv64" -#define DATE "built on: Mon Feb 13 14:14:06 2023 UTC" +#define DATE "built on: Fri Jun 9 12:16:36 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/cmp.h b/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/cmp.h +++ b/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux64-riscv64/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux64-riscv64/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/linux64-riscv64/no-asm/openssl-fips.gypi index bcac25e341be09..0d7994f5f4acc5 100644 --- a/deps/openssl/config/archs/linux64-riscv64/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux64-riscv64/no-asm/openssl-fips.gypi @@ -33,7 +33,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/des_enc.c', diff --git a/deps/openssl/config/archs/linux64-riscv64/no-asm/openssl.gypi b/deps/openssl/config/archs/linux64-riscv64/no-asm/openssl.gypi index 2d594b01ff1e7c..b4549cc91f5c0d 100644 --- a/deps/openssl/config/archs/linux64-riscv64/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux64-riscv64/no-asm/openssl.gypi @@ -192,7 +192,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/camellia.c', diff --git a/deps/openssl/config/archs/linux64-s390x/asm/configdata.pm b/deps/openssl/config/archs/linux64-s390x/asm/configdata.pm index 6fb7092bc19e87..bd313bf90b2e1a 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/configdata.pm +++ b/deps/openssl/config/archs/linux64-s390x/asm/configdata.pm @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux64-s390x", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1330,6 +1330,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3960,6 +3963,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4068,6 +4074,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6333,6 +6342,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6441,6 +6453,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7790,6 +7805,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8453,7 +8472,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-s390x-gf2m.o", "crypto/bn/libcrypto-lib-s390x-mont.o", "crypto/bn/libfips-lib-bn_add.o", @@ -8483,7 +8501,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-s390x-gf2m.o", "crypto/bn/libfips-lib-s390x-mont.o" ], @@ -12954,6 +12971,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -13062,6 +13082,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15327,6 +15350,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15435,6 +15461,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16947,6 +16976,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -16983,6 +17013,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18948,6 +18979,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19972,6 +20007,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -20008,6 +20044,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20273,6 +20310,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -21107,9 +21145,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_x931p.o" => [ "crypto/bn/bn_x931p.c" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libcrypto-lib-s390x-gf2m.o" => [ "crypto/bn/s390x-gf2m.s" ], @@ -21197,9 +21232,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_word.o" => [ "crypto/bn/bn_word.c" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-s390x-gf2m.o" => [ "crypto/bn/s390x-gf2m.s" ], @@ -23743,7 +23775,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-s390x-gf2m.o", "crypto/bn/libcrypto-lib-s390x-mont.o", "crypto/buffer/libcrypto-lib-buf_err.o", @@ -25320,7 +25351,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-s390x-gf2m.o", "crypto/bn/libfips-lib-s390x-mont.o", "crypto/buffer/libfips-lib-buffer.o", @@ -26839,6 +26869,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27537,8 +27573,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27565,7 +27601,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27582,8 +27618,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux64-s390x/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux64-s390x/asm/crypto/buildinf.h index 8df8dfadaa3944..53de14744e5bbc 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux64-s390x/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux64-s390x" -#define DATE "built on: Mon Feb 13 14:10:29 2023 UTC" +#define DATE "built on: Fri Jun 9 12:10:05 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/cmp.h b/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/cmp.h +++ b/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux64-s390x/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux64-s390x/asm/openssl-fips.gypi b/deps/openssl/config/archs/linux64-s390x/asm/openssl-fips.gypi index 00e6ffb8b4ab89..3bcdcbddacd407 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux64-s390x/asm/openssl-fips.gypi @@ -30,7 +30,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/des_enc.c', diff --git a/deps/openssl/config/archs/linux64-s390x/asm/openssl.gypi b/deps/openssl/config/archs/linux64-s390x/asm/openssl.gypi index aad2f33cb33dc9..5598e6a54b4a35 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/openssl.gypi +++ b/deps/openssl/config/archs/linux64-s390x/asm/openssl.gypi @@ -189,7 +189,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/camellia.c', diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux64-s390x/asm_avx2/configdata.pm index d9f8bb1853aa48..529ed98264331d 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/configdata.pm @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux64-s390x", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1330,6 +1330,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3960,6 +3963,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4068,6 +4074,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6333,6 +6342,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6441,6 +6453,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7790,6 +7805,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8453,7 +8472,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-s390x-gf2m.o", "crypto/bn/libcrypto-lib-s390x-mont.o", "crypto/bn/libfips-lib-bn_add.o", @@ -8483,7 +8501,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-s390x-gf2m.o", "crypto/bn/libfips-lib-s390x-mont.o" ], @@ -12954,6 +12971,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -13062,6 +13082,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15327,6 +15350,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15435,6 +15461,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16947,6 +16976,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -16983,6 +17013,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18948,6 +18979,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19972,6 +20007,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -20008,6 +20044,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20273,6 +20310,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -21107,9 +21145,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_x931p.o" => [ "crypto/bn/bn_x931p.c" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libcrypto-lib-s390x-gf2m.o" => [ "crypto/bn/s390x-gf2m.s" ], @@ -21197,9 +21232,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_word.o" => [ "crypto/bn/bn_word.c" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-s390x-gf2m.o" => [ "crypto/bn/s390x-gf2m.s" ], @@ -23743,7 +23775,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-s390x-gf2m.o", "crypto/bn/libcrypto-lib-s390x-mont.o", "crypto/buffer/libcrypto-lib-buf_err.o", @@ -25320,7 +25351,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-s390x-gf2m.o", "crypto/bn/libfips-lib-s390x-mont.o", "crypto/buffer/libfips-lib-buffer.o", @@ -26839,6 +26869,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27537,8 +27573,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27565,7 +27601,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27582,8 +27618,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/buildinf.h index cf9cea4cd1f88d..8708546f4b92ea 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux64-s390x" -#define DATE "built on: Mon Feb 13 14:10:40 2023 UTC" +#define DATE "built on: Fri Jun 9 12:10:26 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/cmp.h b/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/cmp.h +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux64-s390x/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/linux64-s390x/asm_avx2/openssl-fips.gypi index 307fc21d40181a..39b31bd756c491 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/openssl-fips.gypi @@ -30,7 +30,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/des_enc.c', diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux64-s390x/asm_avx2/openssl.gypi index 4b708f51e22da2..4c8db95c0c4788 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/openssl.gypi @@ -189,7 +189,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/camellia.c', diff --git a/deps/openssl/config/archs/linux64-s390x/no-asm/configdata.pm b/deps/openssl/config/archs/linux64-s390x/no-asm/configdata.pm index 7b33d3503d0926..6973e7b5daf869 100644 --- a/deps/openssl/config/archs/linux64-s390x/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux64-s390x/no-asm/configdata.pm @@ -157,7 +157,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,7 +206,7 @@ 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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -225,7 +225,7 @@ our %config = ( "AS" => undef, "ASFLAGS" => undef, "BUILDFILE" => undef, - "CC" => "gcc", + "CC" => undef, "CFLAGS" => undef, "CPP" => undef, "CPPDEFINES" => undef, @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux64-s390x", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1331,6 +1331,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3918,6 +3921,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4026,6 +4032,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6291,6 +6300,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6399,6 +6411,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7748,6 +7763,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8412,7 +8431,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-bn_add.o", "crypto/bn/libfips-lib-bn_asm.o", "crypto/bn/libfips-lib-bn_blind.o", @@ -8440,8 +8458,7 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_shift.o", "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", - "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o" + "crypto/bn/libfips-lib-bn_word.o" ], "products" => { "lib" => [ @@ -12886,6 +12903,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -12994,6 +13014,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15259,6 +15282,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15367,6 +15393,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16879,6 +16908,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -16915,6 +16945,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18826,6 +18857,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19850,6 +19885,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19886,6 +19922,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20151,6 +20188,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -20988,9 +21026,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_x931p.o" => [ "crypto/bn/bn_x931p.c" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-bn_add.o" => [ "crypto/bn/bn_add.c" ], @@ -21075,9 +21110,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_word.o" => [ "crypto/bn/bn_word.c" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/buffer/libcrypto-lib-buf_err.o" => [ "crypto/buffer/buf_err.c" ], @@ -23574,7 +23606,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/buffer/libcrypto-lib-buf_err.o", "crypto/buffer/libcrypto-lib-buffer.o", "crypto/camellia/libcrypto-lib-camellia.o", @@ -25143,7 +25174,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/buffer/libfips-lib-buffer.o", "crypto/cmac/libfips-lib-cmac.o", "crypto/des/libfips-lib-des_enc.o", @@ -26653,6 +26683,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27354,8 +27390,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27382,7 +27418,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27399,8 +27435,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/buildinf.h index 8d7f8d42ff031a..8e157bc6576140 100644 --- a/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux64-s390x" -#define DATE "built on: Mon Feb 13 14:10:52 2023 UTC" +#define DATE "built on: Fri Jun 9 12:10:47 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/cmp.h b/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/cmp.h +++ b/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux64-s390x/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux64-s390x/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/linux64-s390x/no-asm/openssl-fips.gypi index fb8300f9ce7b18..0456b3edfab136 100644 --- a/deps/openssl/config/archs/linux64-s390x/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux64-s390x/no-asm/openssl-fips.gypi @@ -33,7 +33,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/des_enc.c', diff --git a/deps/openssl/config/archs/linux64-s390x/no-asm/openssl.gypi b/deps/openssl/config/archs/linux64-s390x/no-asm/openssl.gypi index 86b632b80bf320..c1c132a136e21f 100644 --- a/deps/openssl/config/archs/linux64-s390x/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux64-s390x/no-asm/openssl.gypi @@ -192,7 +192,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/camellia.c', diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/configdata.pm b/deps/openssl/config/archs/solaris-x86-gcc/asm/configdata.pm index 724627a3e4d870..f399600323b9e1 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/configdata.pm +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/configdata.pm @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -204,7 +204,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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -256,11 +256,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "solaris-x86-gcc", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1321,6 +1321,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3965,6 +3968,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4073,6 +4079,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6338,6 +6347,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6446,6 +6458,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7795,6 +7810,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8462,7 +8481,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", "crypto/bn/libcrypto-lib-co-586.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-x86-gf2m.o", "crypto/bn/libcrypto-lib-x86-mont.o", "crypto/bn/libfips-lib-bn-586.o", @@ -8494,7 +8512,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", "crypto/bn/libfips-lib-co-586.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-x86-gf2m.o", "crypto/bn/libfips-lib-x86-mont.o" ], @@ -12955,6 +12972,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -13063,6 +13083,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15328,6 +15351,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15436,6 +15462,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16948,6 +16977,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -16984,6 +17014,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18895,6 +18926,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19919,6 +19954,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19955,6 +19991,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20220,6 +20257,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -21066,9 +21104,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-co-586.o" => [ "crypto/bn/co-586.S" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libcrypto-lib-x86-gf2m.o" => [ "crypto/bn/x86-gf2m.S" ], @@ -21162,9 +21197,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-co-586.o" => [ "crypto/bn/co-586.S" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-x86-gf2m.o" => [ "crypto/bn/x86-gf2m.S" ], @@ -23711,7 +23743,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", "crypto/bn/libcrypto-lib-co-586.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-x86-gf2m.o", "crypto/bn/libcrypto-lib-x86-mont.o", "crypto/buffer/libcrypto-lib-buf_err.o", @@ -25292,7 +25323,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", "crypto/bn/libfips-lib-co-586.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-x86-gf2m.o", "crypto/bn/libfips-lib-x86-mont.o", "crypto/buffer/libfips-lib-buffer.o", @@ -26810,6 +26840,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27508,8 +27544,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27536,7 +27572,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27553,8 +27589,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/buildinf.h b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/buildinf.h index fd9283291a8969..93ad98d61cce58 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: solaris-x86-gcc" -#define DATE "built on: Mon Feb 13 14:11:34 2023 UTC" +#define DATE "built on: Fri Jun 9 12:12:04 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/cmp.h b/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/cmp.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl-fips.gypi b/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl-fips.gypi index a88e6da227c1a8..feb230cca13b6f 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl-fips.gypi @@ -30,7 +30,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/ecb3_enc.c', diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl.gypi b/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl.gypi index 4651ec209e8e5c..883e7f68eef574 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl.gypi +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl.gypi @@ -188,7 +188,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/cmll_cfb.c', diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/configdata.pm b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/configdata.pm index 953ff8ca7bcec6..b06229aff138ff 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/configdata.pm @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -204,7 +204,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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -256,11 +256,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "solaris-x86-gcc", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1321,6 +1321,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3965,6 +3968,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4073,6 +4079,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6338,6 +6347,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6446,6 +6458,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7795,6 +7810,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8462,7 +8481,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", "crypto/bn/libcrypto-lib-co-586.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-x86-gf2m.o", "crypto/bn/libcrypto-lib-x86-mont.o", "crypto/bn/libfips-lib-bn-586.o", @@ -8494,7 +8512,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", "crypto/bn/libfips-lib-co-586.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-x86-gf2m.o", "crypto/bn/libfips-lib-x86-mont.o" ], @@ -12955,6 +12972,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -13063,6 +13083,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15328,6 +15351,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15436,6 +15462,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16948,6 +16977,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -16984,6 +17014,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18895,6 +18926,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19919,6 +19954,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19955,6 +19991,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20220,6 +20257,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -21066,9 +21104,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-co-586.o" => [ "crypto/bn/co-586.S" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libcrypto-lib-x86-gf2m.o" => [ "crypto/bn/x86-gf2m.S" ], @@ -21162,9 +21197,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-co-586.o" => [ "crypto/bn/co-586.S" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-x86-gf2m.o" => [ "crypto/bn/x86-gf2m.S" ], @@ -23711,7 +23743,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", "crypto/bn/libcrypto-lib-co-586.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-x86-gf2m.o", "crypto/bn/libcrypto-lib-x86-mont.o", "crypto/buffer/libcrypto-lib-buf_err.o", @@ -25292,7 +25323,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", "crypto/bn/libfips-lib-co-586.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-x86-gf2m.o", "crypto/bn/libfips-lib-x86-mont.o", "crypto/buffer/libfips-lib-buffer.o", @@ -26810,6 +26840,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27508,8 +27544,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27536,7 +27572,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27553,8 +27589,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/buildinf.h index d2da0a6da4f349..f0a50817f4335a 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: solaris-x86-gcc" -#define DATE "built on: Mon Feb 13 14:11:45 2023 UTC" +#define DATE "built on: Fri Jun 9 12:12:25 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/cmp.h b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/cmp.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl-fips.gypi index 97a04cd87d8b5e..e0cbef98e5d70b 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl-fips.gypi @@ -30,7 +30,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/ecb3_enc.c', diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl.gypi b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl.gypi index 6dde7d6df396c1..62eff30b7c26e6 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl.gypi @@ -188,7 +188,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/cmll_cfb.c', diff --git a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/configdata.pm b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/configdata.pm index b927ec6515f860..03ef078f0f9784 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/configdata.pm +++ b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/configdata.pm @@ -154,7 +154,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -203,7 +203,7 @@ 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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -222,7 +222,7 @@ our %config = ( "AS" => undef, "ASFLAGS" => undef, "BUILDFILE" => undef, - "CC" => "gcc", + "CC" => undef, "CFLAGS" => undef, "CPP" => undef, "CPPDEFINES" => undef, @@ -256,11 +256,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "solaris-x86-gcc", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1322,6 +1322,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3909,6 +3912,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4017,6 +4023,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6282,6 +6291,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6390,6 +6402,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7739,6 +7754,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8403,7 +8422,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-bn_add.o", "crypto/bn/libfips-lib-bn_asm.o", "crypto/bn/libfips-lib-bn_blind.o", @@ -8431,8 +8449,7 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_shift.o", "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", - "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o" + "crypto/bn/libfips-lib-bn_word.o" ], "products" => { "lib" => [ @@ -12877,6 +12894,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -12985,6 +13005,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15250,6 +15273,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15358,6 +15384,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16870,6 +16899,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -16906,6 +16936,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18817,6 +18848,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19841,6 +19876,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19877,6 +19913,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20142,6 +20179,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -20979,9 +21017,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_x931p.o" => [ "crypto/bn/bn_x931p.c" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-bn_add.o" => [ "crypto/bn/bn_add.c" ], @@ -21066,9 +21101,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_word.o" => [ "crypto/bn/bn_word.c" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/buffer/libcrypto-lib-buf_err.o" => [ "crypto/buffer/buf_err.c" ], @@ -23565,7 +23597,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/buffer/libcrypto-lib-buf_err.o", "crypto/buffer/libcrypto-lib-buffer.o", "crypto/camellia/libcrypto-lib-camellia.o", @@ -25134,7 +25165,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/buffer/libfips-lib-buffer.o", "crypto/cmac/libfips-lib-cmac.o", "crypto/des/libfips-lib-des_enc.o", @@ -26644,6 +26674,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27345,8 +27381,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27373,7 +27409,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27390,8 +27426,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/crypto/buildinf.h index 50da629364076e..c3e3d1195709e1 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: solaris-x86-gcc" -#define DATE "built on: Mon Feb 13 14:11:57 2023 UTC" +#define DATE "built on: Fri Jun 9 12:12:46 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/cmp.h b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/cmp.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/openssl-fips.gypi index dd9ffe17b0dc81..2ca187efc74ce1 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/openssl-fips.gypi @@ -33,7 +33,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/des_enc.c', diff --git a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/openssl.gypi b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/openssl.gypi index 5007acc6eb7fae..5af311edc163dc 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/openssl.gypi @@ -192,7 +192,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/camellia.c', diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/configdata.pm b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/configdata.pm index 52894c352e0542..9c98dc83a1170f 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/configdata.pm +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/configdata.pm @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -204,7 +204,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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -256,11 +256,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "solaris64-x86_64-gcc", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1322,6 +1322,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3971,6 +3974,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4079,6 +4085,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6344,6 +6353,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6452,6 +6464,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7801,6 +7816,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8474,7 +8493,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-rsaz-avx2.o", "crypto/bn/libcrypto-lib-rsaz-avx512.o", "crypto/bn/libcrypto-lib-rsaz-x86_64.o", @@ -8510,7 +8528,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-rsaz-avx2.o", "crypto/bn/libfips-lib-rsaz-avx512.o", "crypto/bn/libfips-lib-rsaz-x86_64.o", @@ -12997,6 +13014,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -13105,6 +13125,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15370,6 +15393,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15478,6 +15504,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16990,6 +17019,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -17026,6 +17056,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18937,6 +18968,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19961,6 +19996,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19997,6 +20033,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20262,6 +20299,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -21132,9 +21170,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_x931p.o" => [ "crypto/bn/bn_x931p.c" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libcrypto-lib-rsaz-avx2.o" => [ "crypto/bn/rsaz-avx2.s" ], @@ -21240,9 +21275,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_word.o" => [ "crypto/bn/bn_word.c" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-rsaz-avx2.o" => [ "crypto/bn/rsaz-avx2.s" ], @@ -23834,7 +23866,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-rsaz-avx2.o", "crypto/bn/libcrypto-lib-rsaz-avx512.o", "crypto/bn/libcrypto-lib-rsaz-x86_64.o", @@ -25428,7 +25459,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-rsaz-avx2.o", "crypto/bn/libfips-lib-rsaz-avx512.o", "crypto/bn/libfips-lib-rsaz-x86_64.o", @@ -26956,6 +26986,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27654,8 +27690,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27682,7 +27718,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27699,8 +27735,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/buildinf.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/buildinf.h index 559a342d610282..5a27ac2232180c 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: solaris64-x86_64-gcc" -#define DATE "built on: Mon Feb 13 14:12:08 2023 UTC" +#define DATE "built on: Fri Jun 9 12:13:05 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/cmp.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/cmp.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl-fips.gypi b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl-fips.gypi index fffcf49e1dfe11..c8295104cf6f8c 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl-fips.gypi @@ -31,7 +31,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/bn/rsaz_exp.c', 'openssl/crypto/bn/rsaz_exp_x2.c', 'openssl/crypto/buffer/buffer.c', diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl.gypi b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl.gypi index d954f6bcbbb212..875d3bd1ac265f 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl.gypi +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl.gypi @@ -190,7 +190,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/bn/rsaz_exp.c', 'openssl/crypto/bn/rsaz_exp_x2.c', 'openssl/crypto/buffer/buf_err.c', diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/configdata.pm b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/configdata.pm index 0c3d04bc285a0e..df0e95e3192755 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/configdata.pm @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -204,7 +204,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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -256,11 +256,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "solaris64-x86_64-gcc", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1322,6 +1322,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3971,6 +3974,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4079,6 +4085,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6344,6 +6353,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6452,6 +6464,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7801,6 +7816,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8474,7 +8493,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-rsaz-avx2.o", "crypto/bn/libcrypto-lib-rsaz-avx512.o", "crypto/bn/libcrypto-lib-rsaz-x86_64.o", @@ -8510,7 +8528,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-rsaz-avx2.o", "crypto/bn/libfips-lib-rsaz-avx512.o", "crypto/bn/libfips-lib-rsaz-x86_64.o", @@ -12997,6 +13014,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -13105,6 +13125,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15370,6 +15393,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15478,6 +15504,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16990,6 +17019,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -17026,6 +17056,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18937,6 +18968,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19961,6 +19996,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19997,6 +20033,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20262,6 +20299,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -21132,9 +21170,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_x931p.o" => [ "crypto/bn/bn_x931p.c" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libcrypto-lib-rsaz-avx2.o" => [ "crypto/bn/rsaz-avx2.s" ], @@ -21240,9 +21275,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_word.o" => [ "crypto/bn/bn_word.c" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-rsaz-avx2.o" => [ "crypto/bn/rsaz-avx2.s" ], @@ -23834,7 +23866,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libcrypto-lib-rsaz-avx2.o", "crypto/bn/libcrypto-lib-rsaz-avx512.o", "crypto/bn/libcrypto-lib-rsaz-x86_64.o", @@ -25428,7 +25459,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-rsaz-avx2.o", "crypto/bn/libfips-lib-rsaz-avx512.o", "crypto/bn/libfips-lib-rsaz-x86_64.o", @@ -26956,6 +26986,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27654,8 +27690,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27682,7 +27718,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27699,8 +27735,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/buildinf.h index ba26c35f3094a9..6d870e373a7b98 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: solaris64-x86_64-gcc" -#define DATE "built on: Mon Feb 13 14:12:22 2023 UTC" +#define DATE "built on: Fri Jun 9 12:13:30 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/cmp.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/cmp.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl-fips.gypi index 342925e41df474..5d26f6e0eb28fc 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl-fips.gypi @@ -31,7 +31,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/bn/rsaz_exp.c', 'openssl/crypto/bn/rsaz_exp_x2.c', 'openssl/crypto/buffer/buffer.c', diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl.gypi b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl.gypi index d1f5a494564d15..902e4549ddfb52 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl.gypi @@ -190,7 +190,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/bn/rsaz_exp.c', 'openssl/crypto/bn/rsaz_exp_x2.c', 'openssl/crypto/buffer/buf_err.c', diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/configdata.pm b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/configdata.pm index 1418cc033afa89..46bbb88086a196 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/configdata.pm +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/configdata.pm @@ -154,7 +154,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.8+quic", + "full_version" => "3.0.9+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -203,7 +203,7 @@ 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" => "8", + "patch" => "9", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", @@ -222,7 +222,7 @@ our %config = ( "AS" => undef, "ASFLAGS" => undef, "BUILDFILE" => undef, - "CC" => "gcc", + "CC" => undef, "CFLAGS" => undef, "CPP" => undef, "CPPDEFINES" => undef, @@ -256,11 +256,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "7 Feb 2023", + "release_date" => "30 May 2023", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "solaris64-x86_64-gcc", - "version" => "3.0.8" + "version" => "3.0.9" ); our %target = ( "AR" => "ar", @@ -1323,6 +1323,9 @@ our %unified_info = ( "test/namemap_internal_test" => { "noinst" => "1" }, + "test/nodefltctxtest" => { + "noinst" => "1" + }, "test/ocspapitest" => { "noinst" => "1" }, @@ -3910,6 +3913,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -4018,6 +4024,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -6283,6 +6292,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -6391,6 +6403,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -7740,6 +7755,10 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/nodefltctxtest" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/ocspapitest" => [ "libcrypto", "test/libtestutil.a" @@ -8404,7 +8423,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/bn/libfips-lib-bn_add.o", "crypto/bn/libfips-lib-bn_asm.o", "crypto/bn/libfips-lib-bn_blind.o", @@ -8432,8 +8450,7 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_shift.o", "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", - "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o" + "crypto/bn/libfips-lib-bn_word.o" ], "products" => { "lib" => [ @@ -12878,6 +12895,9 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-IDEA.html" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/html/man7/EVP_CIPHER-NULL.html" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/html/man7/EVP_CIPHER-RC2.html" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -12986,6 +13006,9 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MDC2.html" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/html/man7/EVP_MD-NULL.html" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/html/man7/EVP_MD-RIPEMD160.html" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -15251,6 +15274,9 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-IDEA.7" => [ "doc/man7/EVP_CIPHER-IDEA.pod" ], + "doc/man/man7/EVP_CIPHER-NULL.7" => [ + "doc/man7/EVP_CIPHER-NULL.pod" + ], "doc/man/man7/EVP_CIPHER-RC2.7" => [ "doc/man7/EVP_CIPHER-RC2.pod" ], @@ -15359,6 +15385,9 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MDC2.7" => [ "doc/man7/EVP_MD-MDC2.pod" ], + "doc/man/man7/EVP_MD-NULL.7" => [ + "doc/man7/EVP_MD-NULL.pod" + ], "doc/man/man7/EVP_MD-RIPEMD160.7" => [ "doc/man7/EVP_MD-RIPEMD160.pod" ], @@ -16871,6 +16900,7 @@ our %unified_info = ( "doc/html/man7/EVP_CIPHER-CHACHA.html", "doc/html/man7/EVP_CIPHER-DES.html", "doc/html/man7/EVP_CIPHER-IDEA.html", + "doc/html/man7/EVP_CIPHER-NULL.html", "doc/html/man7/EVP_CIPHER-RC2.html", "doc/html/man7/EVP_CIPHER-RC4.html", "doc/html/man7/EVP_CIPHER-RC5.html", @@ -16907,6 +16937,7 @@ our %unified_info = ( "doc/html/man7/EVP_MD-MD5-SHA1.html", "doc/html/man7/EVP_MD-MD5.html", "doc/html/man7/EVP_MD-MDC2.html", + "doc/html/man7/EVP_MD-NULL.html", "doc/html/man7/EVP_MD-RIPEMD160.html", "doc/html/man7/EVP_MD-SHA1.html", "doc/html/man7/EVP_MD-SHA2.html", @@ -18818,6 +18849,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/nodefltctxtest" => [ + "include", + "apps/include" + ], "test/ocspapitest" => [ "include", "apps/include" @@ -19842,6 +19877,7 @@ our %unified_info = ( "doc/man/man7/EVP_CIPHER-CHACHA.7", "doc/man/man7/EVP_CIPHER-DES.7", "doc/man/man7/EVP_CIPHER-IDEA.7", + "doc/man/man7/EVP_CIPHER-NULL.7", "doc/man/man7/EVP_CIPHER-RC2.7", "doc/man/man7/EVP_CIPHER-RC4.7", "doc/man/man7/EVP_CIPHER-RC5.7", @@ -19878,6 +19914,7 @@ our %unified_info = ( "doc/man/man7/EVP_MD-MD5-SHA1.7", "doc/man/man7/EVP_MD-MD5.7", "doc/man/man7/EVP_MD-MDC2.7", + "doc/man/man7/EVP_MD-NULL.7", "doc/man/man7/EVP_MD-RIPEMD160.7", "doc/man/man7/EVP_MD-SHA1.7", "doc/man/man7/EVP_MD-SHA2.7", @@ -20143,6 +20180,7 @@ our %unified_info = ( "test/memleaktest", "test/modes_internal_test", "test/namemap_internal_test", + "test/nodefltctxtest", "test/ocspapitest", "test/ossl_store_test", "test/packettest", @@ -20980,9 +21018,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_x931p.o" => [ "crypto/bn/bn_x931p.c" ], - "crypto/bn/libcrypto-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/bn/libfips-lib-bn_add.o" => [ "crypto/bn/bn_add.c" ], @@ -21067,9 +21102,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_word.o" => [ "crypto/bn/bn_word.c" ], - "crypto/bn/libfips-lib-rsa_sup_mul.o" => [ - "crypto/bn/rsa_sup_mul.c" - ], "crypto/buffer/libcrypto-lib-buf_err.o" => [ "crypto/buffer/buf_err.c" ], @@ -23566,7 +23598,6 @@ our %unified_info = ( "crypto/bn/libcrypto-lib-bn_srp.o", "crypto/bn/libcrypto-lib-bn_word.o", "crypto/bn/libcrypto-lib-bn_x931p.o", - "crypto/bn/libcrypto-lib-rsa_sup_mul.o", "crypto/buffer/libcrypto-lib-buf_err.o", "crypto/buffer/libcrypto-lib-buffer.o", "crypto/camellia/libcrypto-lib-camellia.o", @@ -25135,7 +25166,6 @@ our %unified_info = ( "crypto/bn/libfips-lib-bn_sqr.o", "crypto/bn/libfips-lib-bn_sqrt.o", "crypto/bn/libfips-lib-bn_word.o", - "crypto/bn/libfips-lib-rsa_sup_mul.o", "crypto/buffer/libfips-lib-buffer.o", "crypto/cmac/libfips-lib-cmac.o", "crypto/des/libfips-lib-des_enc.o", @@ -26645,6 +26675,12 @@ our %unified_info = ( "test/namemap_internal_test-bin-namemap_internal_test.o" => [ "test/namemap_internal_test.c" ], + "test/nodefltctxtest" => [ + "test/nodefltctxtest-bin-nodefltctxtest.o" + ], + "test/nodefltctxtest-bin-nodefltctxtest.o" => [ + "test/nodefltctxtest.c" + ], "test/ocspapitest" => [ "test/ocspapitest-bin-ocspapitest.o" ], @@ -27346,8 +27382,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - 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'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27374,7 +27410,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; + use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27391,8 +27427,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -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 '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; +use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/crypto/buildinf.h index 58b74230dc7f80..525c1b8631c4b4 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: solaris64-x86_64-gcc" -#define DATE "built on: Mon Feb 13 14:12:36 2023 UTC" +#define DATE "built on: Fri Jun 9 12:13:56 2023 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/cmp.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/cmp.h index cfb269257a5bf2..49825570d8c303 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/cmp.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/opensslv.h index 086d6f011ed1a7..1b938a927c7d59 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/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 8 +# define OPENSSL_VERSION_PATCH 9 /* * 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.8" -# define OPENSSL_FULL_VERSION_STR "3.0.8+quic" +# define OPENSSL_VERSION_STR "3.0.9" +# define OPENSSL_FULL_VERSION_STR "3.0.9+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "7 Feb 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8+quic 7 Feb 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9+quic 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/openssl-fips.gypi index acb0c11e3d782c..fc662ceeab7d97 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/openssl-fips.gypi @@ -33,7 +33,6 @@ 'openssl/crypto/bn/bn_sqr.c', 'openssl/crypto/bn/bn_sqrt.c', 'openssl/crypto/bn/bn_word.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/cmac/cmac.c', 'openssl/crypto/des/des_enc.c', diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/openssl.gypi b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/openssl.gypi index f37ed40f79241d..18879acfa1918b 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/openssl.gypi @@ -192,7 +192,6 @@ 'openssl/crypto/bn/bn_srp.c', 'openssl/crypto/bn/bn_word.c', 'openssl/crypto/bn/bn_x931p.c', - 'openssl/crypto/bn/rsa_sup_mul.c', 'openssl/crypto/buffer/buf_err.c', 'openssl/crypto/buffer/buffer.c', 'openssl/crypto/camellia/camellia.c', diff --git a/deps/openssl/openssl/crypto/perlasm/x86asm.pl b/deps/openssl/openssl/crypto/perlasm/x86asm.pl index 8dcde9eacaa3d1..98a7159a5f131c 100644 --- a/deps/openssl/openssl/crypto/perlasm/x86asm.pl +++ b/deps/openssl/openssl/crypto/perlasm/x86asm.pl @@ -174,9 +174,9 @@ sub ::vprotd sub ::endbranch { - &::generic("#ifdef __CET__\n"); + &::generic("%ifdef __CET__\n"); &::data_byte(0xf3,0x0f,0x1e,0xfb); - &::generic("#endif\n"); + &::generic("%endif\n"); } # label management diff --git a/deps/openssl/openssl/include/crypto/bn_conf.h b/deps/openssl/openssl/include/crypto/bn_conf.h new file mode 100644 index 00000000000000..79400c6472a49c --- /dev/null +++ b/deps/openssl/openssl/include/crypto/bn_conf.h @@ -0,0 +1 @@ +#include "../../../config/bn_conf.h" diff --git a/deps/openssl/openssl/include/crypto/dso_conf.h b/deps/openssl/openssl/include/crypto/dso_conf.h new file mode 100644 index 00000000000000..e7f2afa9872320 --- /dev/null +++ b/deps/openssl/openssl/include/crypto/dso_conf.h @@ -0,0 +1 @@ +#include "../../../config/dso_conf.h" diff --git a/deps/openssl/openssl/include/openssl/asn1.h b/deps/openssl/openssl/include/openssl/asn1.h new file mode 100644 index 00000000000000..cd9fc7cc706c37 --- /dev/null +++ b/deps/openssl/openssl/include/openssl/asn1.h @@ -0,0 +1 @@ +#include "../../../config/asn1.h" diff --git a/deps/openssl/openssl/include/openssl/asn1t.h b/deps/openssl/openssl/include/openssl/asn1t.h new file mode 100644 index 00000000000000..6ff4f574949bbd --- /dev/null +++ b/deps/openssl/openssl/include/openssl/asn1t.h @@ -0,0 +1 @@ +#include "../../../config/asn1t.h" diff --git a/deps/openssl/openssl/include/openssl/bio.h b/deps/openssl/openssl/include/openssl/bio.h new file mode 100644 index 00000000000000..dcece3cb4d6ebf --- /dev/null +++ b/deps/openssl/openssl/include/openssl/bio.h @@ -0,0 +1 @@ +#include "../../../config/bio.h" diff --git a/deps/openssl/openssl/include/openssl/cmp.h b/deps/openssl/openssl/include/openssl/cmp.h new file mode 100644 index 00000000000000..7c8a6dc96fc360 --- /dev/null +++ b/deps/openssl/openssl/include/openssl/cmp.h @@ -0,0 +1 @@ +#include "../../../config/cmp.h" diff --git a/deps/openssl/openssl/include/openssl/cms.h b/deps/openssl/openssl/include/openssl/cms.h new file mode 100644 index 00000000000000..33a00775c9fa76 --- /dev/null +++ b/deps/openssl/openssl/include/openssl/cms.h @@ -0,0 +1 @@ +#include "../../../config/cms.h" diff --git a/deps/openssl/openssl/include/openssl/conf.h b/deps/openssl/openssl/include/openssl/conf.h new file mode 100644 index 00000000000000..2712886cafcd78 --- /dev/null +++ b/deps/openssl/openssl/include/openssl/conf.h @@ -0,0 +1 @@ +#include "../../../config/conf.h" diff --git a/deps/openssl/openssl/include/openssl/configuration.h b/deps/openssl/openssl/include/openssl/configuration.h new file mode 100644 index 00000000000000..8ffad996047c5e --- /dev/null +++ b/deps/openssl/openssl/include/openssl/configuration.h @@ -0,0 +1 @@ +#include "../../../config/configuration.h" diff --git a/deps/openssl/openssl/include/openssl/crmf.h b/deps/openssl/openssl/include/openssl/crmf.h new file mode 100644 index 00000000000000..4103852ecb21c2 --- /dev/null +++ b/deps/openssl/openssl/include/openssl/crmf.h @@ -0,0 +1 @@ +#include "../../../config/crmf.h" diff --git a/deps/openssl/openssl/include/openssl/crypto.h b/deps/openssl/openssl/include/openssl/crypto.h new file mode 100644 index 00000000000000..6d0e701ebd3c19 --- /dev/null +++ b/deps/openssl/openssl/include/openssl/crypto.h @@ -0,0 +1 @@ +#include "../../../config/crypto.h" diff --git a/deps/openssl/openssl/include/openssl/ct.h b/deps/openssl/openssl/include/openssl/ct.h new file mode 100644 index 00000000000000..7ebb84387135be --- /dev/null +++ b/deps/openssl/openssl/include/openssl/ct.h @@ -0,0 +1 @@ +#include "../../../config/ct.h" diff --git a/deps/openssl/openssl/include/openssl/err.h b/deps/openssl/openssl/include/openssl/err.h new file mode 100644 index 00000000000000..bf482070474781 --- /dev/null +++ b/deps/openssl/openssl/include/openssl/err.h @@ -0,0 +1 @@ +#include "../../../config/err.h" diff --git a/deps/openssl/openssl/include/openssl/ess.h b/deps/openssl/openssl/include/openssl/ess.h new file mode 100644 index 00000000000000..64cc016225119f --- /dev/null +++ b/deps/openssl/openssl/include/openssl/ess.h @@ -0,0 +1 @@ +#include "../../../config/ess.h" diff --git a/deps/openssl/openssl/include/openssl/fipskey.h b/deps/openssl/openssl/include/openssl/fipskey.h new file mode 100644 index 00000000000000..c012013d98d4e8 --- /dev/null +++ b/deps/openssl/openssl/include/openssl/fipskey.h @@ -0,0 +1 @@ +#include "../../../config/fipskey.h" diff --git a/deps/openssl/openssl/include/openssl/lhash.h b/deps/openssl/openssl/include/openssl/lhash.h new file mode 100644 index 00000000000000..8d824f5cfe6274 --- /dev/null +++ b/deps/openssl/openssl/include/openssl/lhash.h @@ -0,0 +1 @@ +#include "../../../config/lhash.h" diff --git a/deps/openssl/openssl/include/openssl/ocsp.h b/deps/openssl/openssl/include/openssl/ocsp.h new file mode 100644 index 00000000000000..5b13afedf36bb6 --- /dev/null +++ b/deps/openssl/openssl/include/openssl/ocsp.h @@ -0,0 +1 @@ +#include "../../../config/ocsp.h" diff --git a/deps/openssl/openssl/include/openssl/opensslv.h b/deps/openssl/openssl/include/openssl/opensslv.h new file mode 100644 index 00000000000000..078cfba40fbe73 --- /dev/null +++ b/deps/openssl/openssl/include/openssl/opensslv.h @@ -0,0 +1 @@ +#include "../../../config/opensslv.h" diff --git a/deps/openssl/openssl/include/openssl/pkcs12.h b/deps/openssl/openssl/include/openssl/pkcs12.h new file mode 100644 index 00000000000000..2d7e2c08e99175 --- /dev/null +++ b/deps/openssl/openssl/include/openssl/pkcs12.h @@ -0,0 +1 @@ +#include "../../../config/pkcs12.h" diff --git a/deps/openssl/openssl/include/openssl/pkcs7.h b/deps/openssl/openssl/include/openssl/pkcs7.h new file mode 100644 index 00000000000000..b553f9d0f053b0 --- /dev/null +++ b/deps/openssl/openssl/include/openssl/pkcs7.h @@ -0,0 +1 @@ +#include "../../../config/pkcs7.h" diff --git a/deps/openssl/openssl/include/openssl/safestack.h b/deps/openssl/openssl/include/openssl/safestack.h new file mode 100644 index 00000000000000..989eafb33023b9 --- /dev/null +++ b/deps/openssl/openssl/include/openssl/safestack.h @@ -0,0 +1 @@ +#include "../../../config/safestack.h" diff --git a/deps/openssl/openssl/include/openssl/srp.h b/deps/openssl/openssl/include/openssl/srp.h new file mode 100644 index 00000000000000..9df42dad4c3127 --- /dev/null +++ b/deps/openssl/openssl/include/openssl/srp.h @@ -0,0 +1 @@ +#include "../../../config/srp.h" diff --git a/deps/openssl/openssl/include/openssl/ssl.h b/deps/openssl/openssl/include/openssl/ssl.h new file mode 100644 index 00000000000000..eb74ca98a9759a --- /dev/null +++ b/deps/openssl/openssl/include/openssl/ssl.h @@ -0,0 +1 @@ +#include "../../../config/ssl.h" diff --git a/deps/openssl/openssl/include/openssl/ui.h b/deps/openssl/openssl/include/openssl/ui.h new file mode 100644 index 00000000000000..f5edb766b4fc6c --- /dev/null +++ b/deps/openssl/openssl/include/openssl/ui.h @@ -0,0 +1 @@ +#include "../../../config/ui.h" diff --git a/deps/openssl/openssl/include/openssl/x509.h b/deps/openssl/openssl/include/openssl/x509.h new file mode 100644 index 00000000000000..ed28bd68cb2474 --- /dev/null +++ b/deps/openssl/openssl/include/openssl/x509.h @@ -0,0 +1 @@ +#include "../../../config/x509.h" diff --git a/deps/openssl/openssl/include/openssl/x509_vfy.h b/deps/openssl/openssl/include/openssl/x509_vfy.h new file mode 100644 index 00000000000000..9270a3ee09750a --- /dev/null +++ b/deps/openssl/openssl/include/openssl/x509_vfy.h @@ -0,0 +1 @@ +#include "../../../config/x509_vfy.h" diff --git a/deps/openssl/openssl/include/openssl/x509v3.h b/deps/openssl/openssl/include/openssl/x509v3.h new file mode 100644 index 00000000000000..5629ae9a3a90af --- /dev/null +++ b/deps/openssl/openssl/include/openssl/x509v3.h @@ -0,0 +1 @@ +#include "../../../config/x509v3.h"