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 3.0.3+quic #43022

Closed
wants to merge 2 commits into from
Closed

deps: update OpenSSL 3.0.3+quic #43022

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
587d6f9
deps: upgrade openssl sources to quictls/openssl-3.0.3
RafaelGSS May 9, 2022
1a9c642
deps: update archs files for quictls/openssl-3.0.3+quic
RafaelGSS May 9, 2022
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
  •  
  •  
  •  
73 changes: 61 additions & 12 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.2+quic",
"full_version" => "3.0.3+quic",
"includes" => [],
"lflags" => [],
"lib_defines" => [
Expand Down Expand Up @@ -203,10 +203,10 @@ our %config = (
"openssl_sys_defines" => [],
"openssldir" => "",
"options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic",
"patch" => "2",
"perl_archname" => "x86_64-linux-thread-multi",
"patch" => "3",
"perl_archname" => "x86_64-linux-gnu-thread-multi",
"perl_cmd" => "/usr/bin/perl",
"perl_version" => "5.34.1",
"perl_version" => "5.30.0",
"perlargv" => [
"no-comp",
"no-shared",
Expand Down Expand Up @@ -255,11 +255,11 @@ our %config = (
"prerelease" => "",
"processor" => "",
"rc4_int" => "unsigned int",
"release_date" => "15 Mar 2022",
"release_date" => "3 May 2022",
"shlib_version" => "81.3",
"sourcedir" => ".",
"target" => "BSD-x86",
"version" => "3.0.2"
"version" => "3.0.3"
);
our %target = (
"AR" => "ar",
Expand Down Expand Up @@ -1243,6 +1243,9 @@ our %unified_info = (
"test/evp_libctx_test" => {
"noinst" => "1"
},
"test/evp_pkey_ctx_new_from_name" => {
"noinst" => "1"
},
"test/evp_pkey_dparams_test" => {
"noinst" => "1"
},
Expand Down Expand Up @@ -1288,6 +1291,9 @@ our %unified_info = (
"test/lhash_test" => {
"noinst" => "1"
},
"test/localetest" => {
"noinst" => "1"
},
"test/mdc2_internal_test" => {
"noinst" => "1"
},
Expand Down Expand Up @@ -2890,6 +2896,9 @@ our %unified_info = (
"doc/html/man3/OPENSSL_secure_malloc.html" => [
"doc/man3/OPENSSL_secure_malloc.pod"
],
"doc/html/man3/OPENSSL_strcasecmp.html" => [
"doc/man3/OPENSSL_strcasecmp.pod"
],
"doc/html/man3/OSSL_CMP_CTX_new.html" => [
"doc/man3/OSSL_CMP_CTX_new.pod"
],
Expand Down Expand Up @@ -5233,6 +5242,9 @@ our %unified_info = (
"doc/man/man3/OPENSSL_secure_malloc.3" => [
"doc/man3/OPENSSL_secure_malloc.pod"
],
"doc/man/man3/OPENSSL_strcasecmp.3" => [
"doc/man3/OPENSSL_strcasecmp.pod"
],
"doc/man/man3/OSSL_CMP_CTX_new.3" => [
"doc/man3/OSSL_CMP_CTX_new.pod"
],
Expand Down Expand Up @@ -7613,6 +7625,9 @@ our %unified_info = (
"libcrypto.a",
"test/libtestutil.a"
],
"test/evp_pkey_ctx_new_from_name" => [
"libcrypto"
],
"test/evp_pkey_dparams_test" => [
"libcrypto",
"test/libtestutil.a"
Expand Down Expand Up @@ -7677,6 +7692,10 @@ our %unified_info = (
"test/libtestutil.a" => [
"libcrypto"
],
"test/localetest" => [
"libcrypto",
"test/libtestutil.a"
],
"test/mdc2_internal_test" => [
"libcrypto.a",
"test/libtestutil.a"
Expand Down Expand Up @@ -10484,7 +10503,7 @@ our %unified_info = (
"crypto/chacha/chacha-c64xplus.S" => [
"crypto/chacha/asm/chacha-c64xplus.pl"
],
"crypto/chacha/chacha-ia64.S" => [
"crypto/chacha/chacha-ia64.s" => [
"crypto/chacha/asm/chacha-ia64.pl"
],
"crypto/chacha/chacha-ppc.s" => [
Expand Down Expand Up @@ -11804,6 +11823,9 @@ our %unified_info = (
"doc/html/man3/OPENSSL_secure_malloc.html" => [
"doc/man3/OPENSSL_secure_malloc.pod"
],
"doc/html/man3/OPENSSL_strcasecmp.html" => [
"doc/man3/OPENSSL_strcasecmp.pod"
],
"doc/html/man3/OSSL_CMP_CTX_new.html" => [
"doc/man3/OSSL_CMP_CTX_new.pod"
],
Expand Down Expand Up @@ -14147,6 +14169,9 @@ our %unified_info = (
"doc/man/man3/OPENSSL_secure_malloc.3" => [
"doc/man3/OPENSSL_secure_malloc.pod"
],
"doc/man/man3/OPENSSL_strcasecmp.3" => [
"doc/man3/OPENSSL_strcasecmp.pod"
],
"doc/man/man3/OSSL_CMP_CTX_new.3" => [
"doc/man3/OSSL_CMP_CTX_new.pod"
],
Expand Down Expand Up @@ -16435,6 +16460,7 @@ our %unified_info = (
"doc/html/man3/OPENSSL_malloc.html",
"doc/html/man3/OPENSSL_s390xcap.html",
"doc/html/man3/OPENSSL_secure_malloc.html",
"doc/html/man3/OPENSSL_strcasecmp.html",
"doc/html/man3/OSSL_CMP_CTX_new.html",
"doc/html/man3/OSSL_CMP_HDR_get0_transactionID.html",
"doc/html/man3/OSSL_CMP_ITAV_set0.html",
Expand Down Expand Up @@ -18500,6 +18526,10 @@ our %unified_info = (
"include",
"apps/include"
],
"test/evp_pkey_ctx_new_from_name" => [
"include",
"apps/include"
],
"test/evp_pkey_dparams_test" => [
"include",
"apps/include"
Expand Down Expand Up @@ -18687,6 +18717,10 @@ our %unified_info = (
"apps/include",
"."
],
"test/localetest" => [
"include",
"apps/include"
],
"test/mdc2_internal_test" => [
".",
"include",
Expand Down Expand Up @@ -19370,6 +19404,7 @@ our %unified_info = (
"doc/man/man3/OPENSSL_malloc.3",
"doc/man/man3/OPENSSL_s390xcap.3",
"doc/man/man3/OPENSSL_secure_malloc.3",
"doc/man/man3/OPENSSL_strcasecmp.3",
"doc/man/man3/OSSL_CMP_CTX_new.3",
"doc/man/man3/OSSL_CMP_HDR_get0_transactionID.3",
"doc/man/man3/OSSL_CMP_ITAV_set0.3",
Expand Down Expand Up @@ -19992,6 +20027,7 @@ our %unified_info = (
"test/evp_fetch_prov_test",
"test/evp_kdf_test",
"test/evp_libctx_test",
"test/evp_pkey_ctx_new_from_name",
"test/evp_pkey_dparams_test",
"test/evp_pkey_provided_test",
"test/evp_test",
Expand All @@ -20007,6 +20043,7 @@ our %unified_info = (
"test/igetest",
"test/keymgmt_internal_test",
"test/lhash_test",
"test/localetest",
"test/mdc2_internal_test",
"test/mdc2test",
"test/memleaktest",
Expand Down Expand Up @@ -26389,6 +26426,12 @@ our %unified_info = (
"test/evp_libctx_test-bin-evp_libctx_test.o" => [
"test/evp_libctx_test.c"
],
"test/evp_pkey_ctx_new_from_name" => [
"test/evp_pkey_ctx_new_from_name-bin-evp_pkey_ctx_new_from_name.o"
],
"test/evp_pkey_ctx_new_from_name-bin-evp_pkey_ctx_new_from_name.o" => [
"test/evp_pkey_ctx_new_from_name.c"
],
"test/evp_pkey_dparams_test" => [
"test/evp_pkey_dparams_test-bin-evp_pkey_dparams_test.o"
],
Expand Down Expand Up @@ -26578,6 +26621,12 @@ our %unified_info = (
"test/testutil/libtestutil-lib-tests.o",
"test/testutil/libtestutil-lib-testutil_init.o"
],
"test/localetest" => [
"test/localetest-bin-localetest.o"
],
"test/localetest-bin-localetest.o" => [
"test/localetest.c"
],
"test/mdc2_internal_test" => [
"test/mdc2_internal_test-bin-mdc2_internal_test.o"
],
Expand Down Expand Up @@ -27290,8 +27339,8 @@ unless (caller) {
use File::Copy;
use Pod::Usage;

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

my $here = dirname($0);

Expand All @@ -27318,7 +27367,7 @@ unless (caller) {
);

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

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

my $prepend = <<'_____';
use File::Spec::Functions;
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl';
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations';
use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/util/perl';
use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations';
use lib '.';
use platform;
_____
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: Thu May 5 17:00:46 2022 UTC"
#define DATE "built on: Mon May 9 17:35:57 2022 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
2 changes: 2 additions & 0 deletions deps/openssl/config/archs/BSD-x86/asm/include/openssl/crypto.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,8 @@ int OPENSSL_hexstr2buf_ex(unsigned char *buf, size_t buf_n, size_t *buflen,
const char *str, const char sep);
unsigned char *OPENSSL_hexstr2buf(const char *str, long *buflen);
int OPENSSL_hexchar2int(unsigned char c);
int OPENSSL_strcasecmp(const char *s1, const char *s2);
int OPENSSL_strncasecmp(const char *s1, const char *s2, size_t n);

# define OPENSSL_MALLOC_MAX_NELEMS(type) (((1U<<(sizeof(int)*8-1))-1)/sizeof(type))

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 2
# define OPENSSL_VERSION_PATCH 3

/*
* 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.2"
# define OPENSSL_FULL_VERSION_STR "3.0.2+quic"
# define OPENSSL_VERSION_STR "3.0.3"
# define OPENSSL_FULL_VERSION_STR "3.0.3+quic"

/*
* SECTION 3: ADDITIONAL METADATA
*
* These strings are defined separately to allow them to be parsable.
*/
# define OPENSSL_RELEASE_DATE "15 Mar 2022"
# define OPENSSL_RELEASE_DATE "3 May 2022"

/*
* SECTION 4: BACKWARD COMPATIBILITY
*/

# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.2+quic 15 Mar 2022"
# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.3+quic 3 May 2022"

/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
# ifdef OPENSSL_VERSION_PRE_RELEASE
Expand Down
11 changes: 11 additions & 0 deletions deps/openssl/config/archs/BSD-x86/asm/include/openssl/ssl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1381,6 +1381,8 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
# define SSL_CTRL_GET_TMP_KEY 133
# define SSL_CTRL_GET_NEGOTIATED_GROUP 134
# define SSL_CTRL_SET_RETRY_VERIFY 136
# define SSL_CTRL_GET_VERIFY_CERT_STORE 137
# define SSL_CTRL_GET_CHAIN_CERT_STORE 138
# define SSL_CERT_SET_FIRST 1
# define SSL_CERT_SET_NEXT 2
# define SSL_CERT_SET_SERVER 3
Expand Down Expand Up @@ -1442,10 +1444,14 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
SSL_CTX_ctrl(ctx,SSL_CTRL_SET_VERIFY_CERT_STORE,0,(char *)(st))
# define SSL_CTX_set1_verify_cert_store(ctx,st) \
SSL_CTX_ctrl(ctx,SSL_CTRL_SET_VERIFY_CERT_STORE,1,(char *)(st))
# define SSL_CTX_get0_verify_cert_store(ctx,st) \
SSL_CTX_ctrl(ctx,SSL_CTRL_GET_VERIFY_CERT_STORE,0,(char *)(st))
# define SSL_CTX_set0_chain_cert_store(ctx,st) \
SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CHAIN_CERT_STORE,0,(char *)(st))
# define SSL_CTX_set1_chain_cert_store(ctx,st) \
SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CHAIN_CERT_STORE,1,(char *)(st))
# define SSL_CTX_get0_chain_cert_store(ctx,st) \
SSL_CTX_ctrl(ctx,SSL_CTRL_GET_CHAIN_CERT_STORE,0,(char *)(st))
# define SSL_set0_chain(s,sk) \
SSL_ctrl(s,SSL_CTRL_CHAIN,0,(char *)(sk))
# define SSL_set1_chain(s,sk) \
Expand All @@ -1468,10 +1474,15 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
SSL_ctrl(s,SSL_CTRL_SET_VERIFY_CERT_STORE,0,(char *)(st))
# define SSL_set1_verify_cert_store(s,st) \
SSL_ctrl(s,SSL_CTRL_SET_VERIFY_CERT_STORE,1,(char *)(st))
#define SSL_get0_verify_cert_store(s,st) \
SSL_ctrl(s,SSL_CTRL_GET_VERIFY_CERT_STORE,0,(char *)(st))
# define SSL_set0_chain_cert_store(s,st) \
SSL_ctrl(s,SSL_CTRL_SET_CHAIN_CERT_STORE,0,(char *)(st))
# define SSL_set1_chain_cert_store(s,st) \
SSL_ctrl(s,SSL_CTRL_SET_CHAIN_CERT_STORE,1,(char *)(st))
#define SSL_get0_chain_cert_store(s,st) \
SSL_ctrl(s,SSL_CTRL_GET_CHAIN_CERT_STORE,0,(char *)(st))

# define SSL_get1_groups(s, glist) \
SSL_ctrl(s,SSL_CTRL_GET_GROUPS,0,(int*)(glist))
# define SSL_CTX_set1_groups(ctx, glist, glistlen) \
Expand Down
8 changes: 4 additions & 4 deletions deps/openssl/config/archs/BSD-x86/asm/include/openssl/x509.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/x509.h.in
*
* Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
Expand Down Expand Up @@ -552,11 +552,11 @@ int X509_NAME_digest(const X509_NAME *data, const EVP_MD *type,
X509 *X509_load_http(const char *url, BIO *bio, BIO *rbio, int timeout);
X509_CRL *X509_CRL_load_http(const char *url, BIO *bio, BIO *rbio, int timeout);
# ifndef OPENSSL_NO_DEPRECATED_3_0
# include <openssl/ocsp.h> /* OCSP_REQ_CTX_nbio_d2i */
# include <openssl/http.h> /* OSSL_HTTP_REQ_CTX_nbio_d2i */
# define X509_http_nbio(rctx, pcert) \
OCSP_REQ_CTX_nbio_d2i(rctx, pcert, ASN1_ITEM_rptr(X509))
OSSL_HTTP_REQ_CTX_nbio_d2i(rctx, pcert, ASN1_ITEM_rptr(X509))
# define X509_CRL_http_nbio(rctx, pcrl) \
OCSP_REQ_CTX_nbio_d2i(rctx, pcrl, ASN1_ITEM_rptr(X509_CRL))
OSSL_HTTP_REQ_CTX_nbio_d2i(rctx, pcrl, ASN1_ITEM_rptr(X509_CRL))
# endif

# ifndef OPENSSL_NO_STDIO
Expand Down
Loading