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 OpenSSL 3.0.2 #42356

Closed
wants to merge 3 commits into from
Closed

deps: update openssl to OpenSSL 3.0.2 #42356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e06c733
deps: upgrade openssl sources to quictls/openssl-3.0.2+quic
hassaanp Mar 16, 2022
3361921
deps: update archs files for quictls/openssl-3.0.2+quic
hassaanp Mar 16, 2022
d37dceb
test: fix tests affected by OpenSSL update
mhdawson Mar 15, 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
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86/asm/apps/progs.c
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 apps/progs.pl
*
* Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 1995-2022 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
Expand Down
52 changes: 40 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.1+quic",
"full_version" => "3.0.2+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" => "1",
"patch" => "2",
"perl_archname" => "x86_64-linux-gnu-thread-multi",
"perl_cmd" => "/usr/bin/perl",
"perl_version" => "5.30.0",
"perl_version" => "5.28.1",
"perlargv" => [
"no-comp",
"no-shared",
Expand Down Expand Up @@ -255,11 +255,11 @@ our %config = (
"prerelease" => "",
"processor" => "",
"rc4_int" => "unsigned int",
"release_date" => "14 Dec 2021",
"release_date" => "15 Mar 2022",
"shlib_version" => "81.3",
"sourcedir" => ".",
"target" => "BSD-x86",
"version" => "3.0.1"
"version" => "3.0.2"
);
our %target = (
"AR" => "ar",
Expand Down Expand Up @@ -3556,6 +3556,9 @@ our %unified_info = (
"doc/html/man3/SSL_get_all_async_fds.html" => [
"doc/man3/SSL_get_all_async_fds.pod"
],
"doc/html/man3/SSL_get_certificate.html" => [
"doc/man3/SSL_get_certificate.pod"
],
"doc/html/man3/SSL_get_ciphers.html" => [
"doc/man3/SSL_get_ciphers.pod"
],
Expand Down Expand Up @@ -3655,6 +3658,9 @@ our %unified_info = (
"doc/html/man3/SSL_set_fd.html" => [
"doc/man3/SSL_set_fd.pod"
],
"doc/html/man3/SSL_set_retry_verify.html" => [
"doc/man3/SSL_set_retry_verify.pod"
],
"doc/html/man3/SSL_set_session.html" => [
"doc/man3/SSL_set_session.pod"
],
Expand Down Expand Up @@ -5893,6 +5899,9 @@ our %unified_info = (
"doc/man/man3/SSL_get_all_async_fds.3" => [
"doc/man3/SSL_get_all_async_fds.pod"
],
"doc/man/man3/SSL_get_certificate.3" => [
"doc/man3/SSL_get_certificate.pod"
],
"doc/man/man3/SSL_get_ciphers.3" => [
"doc/man3/SSL_get_ciphers.pod"
],
Expand Down Expand Up @@ -5992,6 +6001,9 @@ our %unified_info = (
"doc/man/man3/SSL_set_fd.3" => [
"doc/man3/SSL_set_fd.pod"
],
"doc/man/man3/SSL_set_retry_verify.3" => [
"doc/man3/SSL_set_retry_verify.pod"
],
"doc/man/man3/SSL_set_session.3" => [
"doc/man3/SSL_set_session.pod"
],
Expand Down Expand Up @@ -9729,10 +9741,10 @@ our %unified_info = (
},
"providers/fips" => {
"deps" => [
"providers/fips/fips-dso-fips_entry.o",
"providers/fips/libfips-lib-fipsprov.o",
"providers/fips/libfips-lib-self_test.o",
"providers/fips/libfips-lib-self_test_kats.o",
"providers/fips/fips-dso-fips_entry.o"
"providers/fips/libfips-lib-self_test_kats.o"
],
"products" => {
"dso" => [
Expand Down Expand Up @@ -12458,6 +12470,9 @@ our %unified_info = (
"doc/html/man3/SSL_get_all_async_fds.html" => [
"doc/man3/SSL_get_all_async_fds.pod"
],
"doc/html/man3/SSL_get_certificate.html" => [
"doc/man3/SSL_get_certificate.pod"
],
"doc/html/man3/SSL_get_ciphers.html" => [
"doc/man3/SSL_get_ciphers.pod"
],
Expand Down Expand Up @@ -12557,6 +12572,9 @@ our %unified_info = (
"doc/html/man3/SSL_set_fd.html" => [
"doc/man3/SSL_set_fd.pod"
],
"doc/html/man3/SSL_set_retry_verify.html" => [
"doc/man3/SSL_set_retry_verify.pod"
],
"doc/html/man3/SSL_set_session.html" => [
"doc/man3/SSL_set_session.pod"
],
Expand Down Expand Up @@ -14795,6 +14813,9 @@ our %unified_info = (
"doc/man/man3/SSL_get_all_async_fds.3" => [
"doc/man3/SSL_get_all_async_fds.pod"
],
"doc/man/man3/SSL_get_certificate.3" => [
"doc/man3/SSL_get_certificate.pod"
],
"doc/man/man3/SSL_get_ciphers.3" => [
"doc/man3/SSL_get_ciphers.pod"
],
Expand Down Expand Up @@ -14894,6 +14915,9 @@ our %unified_info = (
"doc/man/man3/SSL_set_fd.3" => [
"doc/man3/SSL_set_fd.pod"
],
"doc/man/man3/SSL_set_retry_verify.3" => [
"doc/man3/SSL_set_retry_verify.pod"
],
"doc/man/man3/SSL_set_session.3" => [
"doc/man3/SSL_set_session.pod"
],
Expand Down Expand Up @@ -16633,6 +16657,7 @@ our %unified_info = (
"doc/html/man3/SSL_get0_peer_scts.html",
"doc/html/man3/SSL_get_SSL_CTX.html",
"doc/html/man3/SSL_get_all_async_fds.html",
"doc/html/man3/SSL_get_certificate.html",
"doc/html/man3/SSL_get_ciphers.html",
"doc/html/man3/SSL_get_client_random.html",
"doc/html/man3/SSL_get_current_cipher.html",
Expand Down Expand Up @@ -16666,6 +16691,7 @@ our %unified_info = (
"doc/html/man3/SSL_set_bio.html",
"doc/html/man3/SSL_set_connect_state.html",
"doc/html/man3/SSL_set_fd.html",
"doc/html/man3/SSL_set_retry_verify.html",
"doc/html/man3/SSL_set_session.html",
"doc/html/man3/SSL_set_shutdown.html",
"doc/html/man3/SSL_set_verify_result.html",
Expand Down Expand Up @@ -19566,6 +19592,7 @@ our %unified_info = (
"doc/man/man3/SSL_get0_peer_scts.3",
"doc/man/man3/SSL_get_SSL_CTX.3",
"doc/man/man3/SSL_get_all_async_fds.3",
"doc/man/man3/SSL_get_certificate.3",
"doc/man/man3/SSL_get_ciphers.3",
"doc/man/man3/SSL_get_client_random.3",
"doc/man/man3/SSL_get_current_cipher.3",
Expand Down Expand Up @@ -19599,6 +19626,7 @@ our %unified_info = (
"doc/man/man3/SSL_set_bio.3",
"doc/man/man3/SSL_set_connect_state.3",
"doc/man/man3/SSL_set_fd.3",
"doc/man/man3/SSL_set_retry_verify.3",
"doc/man/man3/SSL_set_session.3",
"doc/man/man3/SSL_set_shutdown.3",
"doc/man/man3/SSL_set_verify_result.3",
Expand Down Expand Up @@ -27262,8 +27290,8 @@ unless (caller) {
use File::Copy;
use Pod::Usage;

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

my $here = dirname($0);

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

use lib '.';
use lib '/node/deps/openssl/openssl/Configurations';
use lib '/home/hassaan/node/deps/openssl/openssl/Configurations';
use gentemplate;

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

my $prepend = <<'_____';
use File::Spec::Functions;
use lib '/node/deps/openssl/openssl/util/perl';
use lib '/node/deps/openssl/openssl/Configurations';
use lib '/home/hassaan/node/deps/openssl/openssl/util/perl';
use lib '/home/hassaan/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: Tue Dec 14 22:49:16 2021 UTC"
#define DATE "built on: Wed Mar 16 04:51:37 2022 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
4 changes: 3 additions & 1 deletion deps/openssl/config/archs/BSD-x86/asm/include/openssl/bio.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/bio.h.in
*
* Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 1995-2022 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
Expand Down Expand Up @@ -208,6 +208,8 @@ extern "C" {
# define BIO_FLAGS_NONCLEAR_RST 0x400
# define BIO_FLAGS_IN_EOF 0x800

/* the BIO FLAGS values 0x1000 to 0x4000 are reserved for internal KTLS flags */

typedef union bio_addr_st BIO_ADDR;
typedef struct bio_addrinfo_st BIO_ADDRINFO;

Expand Down
4 changes: 2 additions & 2 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 @@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/crypto.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 @@ -124,7 +124,7 @@ int CRYPTO_atomic_load(uint64_t *val, uint64_t *ret, CRYPTO_RWLOCK *lock);
size_t OPENSSL_strlcpy(char *dst, const char *src, size_t siz);
size_t OPENSSL_strlcat(char *dst, const char *src, size_t siz);
size_t OPENSSL_strnlen(const char *str, size_t maxlen);
int OPENSSL_buf2hexstr_ex(char *str, size_t str_n, size_t *strlen,
int OPENSSL_buf2hexstr_ex(char *str, size_t str_n, size_t *strlength,
const unsigned char *buf, size_t buflen,
const char sep);
char *OPENSSL_buf2hexstr(const unsigned char *buf, long buflen);
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 1
# define OPENSSL_VERSION_PATCH 2

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

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

/*
* SECTION 4: BACKWARD COMPATIBILITY
*/

# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.1+quic 14 Dec 2021"
# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.2+quic 15 Mar 2022"

/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
# ifdef OPENSSL_VERSION_PRE_RELEASE
Expand Down
5 changes: 4 additions & 1 deletion 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 @@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/ssl.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
* Copyright 2005 Nokia. All rights reserved.
*
Expand Down Expand Up @@ -1380,6 +1380,7 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
# define SSL_CTRL_GET_SIGNATURE_NID 132
# define SSL_CTRL_GET_TMP_KEY 133
# define SSL_CTRL_GET_NEGOTIATED_GROUP 134
# define SSL_CTRL_SET_RETRY_VERIFY 136
# define SSL_CERT_SET_FIRST 1
# define SSL_CERT_SET_NEXT 2
# define SSL_CERT_SET_SERVER 3
Expand Down Expand Up @@ -2202,6 +2203,8 @@ __owur int SSL_get_ex_data_X509_STORE_CTX_idx(void);
SSL_CTX_ctrl(ctx,SSL_CTRL_SET_MAX_PIPELINES,m,NULL)
# define SSL_set_max_pipelines(ssl,m) \
SSL_ctrl(ssl,SSL_CTRL_SET_MAX_PIPELINES,m,NULL)
# define SSL_set_retry_verify(ssl) \
(SSL_ctrl(ssl,SSL_CTRL_SET_RETRY_VERIFY,0,NULL) > 0)

void SSL_CTX_set_default_read_buffer_len(SSL_CTX *ctx, size_t len);
void SSL_set_default_read_buffer_len(SSL *s, size_t len);
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86/asm/include/progs.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 apps/progs.pl
*
* Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 1995-2022 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
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86/asm_avx2/apps/progs.c
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 apps/progs.pl
*
* Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 1995-2022 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
Expand Down
Loading