Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

deps: update OpenSSL to 3.0.9-quic1 #48402

Closed
wants to merge 2 commits into from
Closed

deps: update OpenSSL to 3.0.9-quic1 #48402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
791ef05
deps: upgrade openssl sources to quictls/openssl-3.0.9-quic1
nodejs-github-bot Jun 9, 2023
63e5171
deps: update archs files for openssl-3.0.9-quic1
nodejs-github-bot Jun 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
74 changes: 55 additions & 19 deletions deps/openssl/config/archs/BSD-x86/asm/configdata.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ our %config = (
],
"dynamic_engines" => "0",
"ex_libs" => [],
"full_version" => "3.0.8+quic",
"full_version" => "3.0.9+quic",
"includes" => [],
"lflags" => [],
"lib_defines" => [
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -1320,6 +1320,9 @@ our %unified_info = (
"test/namemap_internal_test" => {
"noinst" => "1"
},
"test/nodefltctxtest" => {
"noinst" => "1"
},
"test/ocspapitest" => {
"noinst" => "1"
},
Expand Down Expand Up @@ -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"
],
Expand Down Expand Up @@ -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"
],
Expand Down Expand Up @@ -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"
],
Expand Down Expand Up @@ -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"
],
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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"
],
Expand Down Expand Up @@ -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"
],
Expand Down Expand Up @@ -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"
],
Expand Down Expand Up @@ -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"
],
Expand Down Expand Up @@ -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"
],
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -18895,6 +18926,10 @@ our %unified_info = (
"include",
"apps/include"
],
"test/nodefltctxtest" => [
"include",
"apps/include"
],
"test/ocspapitest" => [
"include",
"apps/include"
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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"
],
Expand Down Expand Up @@ -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"
],
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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"
],
Expand Down Expand Up @@ -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);

Expand All @@ -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"
Expand All @@ -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;
_____
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86"
#define DATE "built on: 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
Expand Down
7 changes: 4 additions & 3 deletions deps/openssl/config/archs/BSD-x86/asm/include/openssl/cmp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
10 changes: 5 additions & 5 deletions deps/openssl/config/archs/BSD-x86/asm/include/openssl/opensslv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ extern "C" {
*/
# define OPENSSL_VERSION_MAJOR 3
# define OPENSSL_VERSION_MINOR 0
# define OPENSSL_VERSION_PATCH 8
# define OPENSSL_VERSION_PATCH 9

/*
* Additional version information
Expand Down Expand Up @@ -74,21 +74,21 @@ extern "C" {
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
*/
# define OPENSSL_VERSION_STR "3.0.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
Expand Down
1 change: 0 additions & 1 deletion deps/openssl/config/archs/BSD-x86/asm/openssl-fips.gypi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
1 change: 0 additions & 1 deletion deps/openssl/config/archs/BSD-x86/asm/openssl.gypi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Loading