diff options
| author | Hassaan Pasha <pasha.hassaan@gmail.com> | 2022-03-16 08:05:03 +0300 |
|---|---|---|
| committer | Node.js GitHub Bot <github-bot@iojs.org> | 2022-03-17 13:14:52 +0300 |
| commit | 07ee7966ff2fa753a81e34354e96fcd7fe0f40b1 (patch) | |
| tree | 4a0af42ac54fb90cbaef3f5b8ae817b9a3da4de8 /deps | |
| parent | 0690b7f60febc9179f2c8dd694b0a0e992c3eb9a (diff) | |
deps: update archs files for quictls/openssl-3.0.2+quic
After an OpenSSL source update, all the config files need to be
regenerated and committed by:
$ make -C deps/openssl/config
$ git add deps/openssl/config/archs
$ git add deps/openssl/openssl
$ git commit
PR-URL: https://github.com/nodejs/node/pull/42356
Refs: https://mta.openssl.org/pipermail/openssl-announce/2022-March/000217.html
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Darshan Sen <raisinten@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Michael Dawson <midawson@redhat.com>
Diffstat (limited to 'deps')
601 files changed, 3887 insertions, 1607 deletions
diff --git a/deps/openssl/config/archs/BSD-x86/asm/apps/progs.c b/deps/openssl/config/archs/BSD-x86/asm/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/apps/progs.c +++ b/deps/openssl/config/archs/BSD-x86/asm/apps/progs.c @@ -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 diff --git a/deps/openssl/config/archs/BSD-x86/asm/configdata.pm b/deps/openssl/config/archs/BSD-x86/asm/configdata.pm index a641047e0a6..28e6c0549b2 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.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -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", @@ -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", @@ -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" ], @@ -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" ], @@ -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" ], @@ -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" ], @@ -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" => [ @@ -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" ], @@ -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" ], @@ -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" ], @@ -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" ], @@ -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", @@ -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", @@ -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", @@ -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", @@ -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); @@ -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"; @@ -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; _____ 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 2e712738376..9cdc86eca87 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: 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 diff --git a/deps/openssl/config/archs/BSD-x86/asm/include/openssl/bio.h b/deps/openssl/config/archs/BSD-x86/asm/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/BSD-x86/asm/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/BSD-x86/asm/include/openssl/crypto.h b/deps/openssl/config/archs/BSD-x86/asm/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/include/openssl/crypto.h +++ b/deps/openssl/config/archs/BSD-x86/asm/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/BSD-x86/asm/include/openssl/ssl.h b/deps/openssl/config/archs/BSD-x86/asm/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/BSD-x86/asm/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/BSD-x86/asm/include/progs.h b/deps/openssl/config/archs/BSD-x86/asm/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/include/progs.h +++ b/deps/openssl/config/archs/BSD-x86/asm/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/apps/progs.c b/deps/openssl/config/archs/BSD-x86/asm_avx2/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/apps/progs.c +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/apps/progs.c @@ -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 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 154622700ce..3ead4d7f9b6 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.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -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", @@ -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", @@ -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" ], @@ -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" ], @@ -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" ], @@ -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" ], @@ -8008,9 +8020,6 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -8028,7 +8037,10 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o" + "apps/lib/libtestutil-lib-opt.o", + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o" ], "products" => { "bin" => [ @@ -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/libfips-lib-self_test_kats.o", + "providers/fips/fips-dso-fips_entry.o" ], "products" => { "dso" => [ @@ -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" ], @@ -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" ], @@ -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" ], @@ -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" ], @@ -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", @@ -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", @@ -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", @@ -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", @@ -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); @@ -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"; @@ -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; _____ 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 f7c161b8577..dffe36cdccc 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: Tue Dec 14 22:49:37 2021 UTC" +#define DATE "built on: Wed Mar 16 04:51:50 2022 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/bio.h b/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/bio.h +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/crypto.h b/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/crypto.h +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/include/progs.h b/deps/openssl/config/archs/BSD-x86/asm_avx2/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/apps/progs.c b/deps/openssl/config/archs/BSD-x86/no-asm/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/BSD-x86/no-asm/apps/progs.c +++ b/deps/openssl/config/archs/BSD-x86/no-asm/apps/progs.c @@ -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 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 6a60a5302dd..487299b334e 100644 --- a/deps/openssl/config/archs/BSD-x86/no-asm/configdata.pm +++ b/deps/openssl/config/archs/BSD-x86/no-asm/configdata.pm @@ -154,7 +154,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -202,10 +202,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-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", @@ -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", @@ -3499,6 +3499,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" ], @@ -3598,6 +3601,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" ], @@ -5836,6 +5842,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" ], @@ -5935,6 +5944,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" ], @@ -9646,10 +9658,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/libfips-lib-self_test_kats.o", + "providers/fips/fips-dso-fips_entry.o" ], "products" => { "dso" => [ @@ -12375,6 +12387,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" ], @@ -12474,6 +12489,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" ], @@ -14712,6 +14730,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" ], @@ -14811,6 +14832,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" ], @@ -16550,6 +16574,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", @@ -16583,6 +16608,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", @@ -19483,6 +19509,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", @@ -19516,6 +19543,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", @@ -27078,8 +27106,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); @@ -27106,7 +27134,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"; @@ -27123,8 +27151,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; _____ 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 c3bb81e8a4c..25722290c6d 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: Tue Dec 14 22:49:57 2021 UTC" +#define DATE "built on: Wed Mar 16 04:52:04 2022 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/bio.h b/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/crypto.h b/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/crypto.h +++ b/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/include/progs.h b/deps/openssl/config/archs/BSD-x86/no-asm/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/BSD-x86/no-asm/include/progs.h +++ b/deps/openssl/config/archs/BSD-x86/no-asm/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/apps/progs.c b/deps/openssl/config/archs/BSD-x86_64/asm/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/apps/progs.c +++ b/deps/openssl/config/archs/BSD-x86_64/asm/apps/progs.c @@ -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 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 0aabb457cd8..3c30036f99a 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.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -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", @@ -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_64", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3559,6 +3559,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" ], @@ -3658,6 +3661,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" ], @@ -5896,6 +5902,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" ], @@ -5995,6 +6004,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" ], @@ -8011,9 +8023,6 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -8031,7 +8040,10 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o" + "apps/lib/libtestutil-lib-opt.o", + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o" ], "products" => { "bin" => [ @@ -9774,10 +9786,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/libfips-lib-self_test_kats.o", + "providers/fips/fips-dso-fips_entry.o" ], "products" => { "dso" => [ @@ -12503,6 +12515,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" ], @@ -12602,6 +12617,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" ], @@ -14840,6 +14858,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" ], @@ -14939,6 +14960,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" ], @@ -16678,6 +16702,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", @@ -16711,6 +16736,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", @@ -19611,6 +19637,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", @@ -19644,6 +19671,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", @@ -27431,8 +27459,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); @@ -27459,7 +27487,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"; @@ -27476,8 +27504,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; _____ 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 81a96f8049c..8c90b3247c3 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: Tue Dec 14 22:50:15 2021 UTC" +#define DATE "built on: Wed Mar 16 04:52:16 2022 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/bio.h b/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/crypto.h b/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/crypto.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/ssl.h b/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/include/progs.h b/deps/openssl/config/archs/BSD-x86_64/asm/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/include/progs.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/apps/progs.c b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/apps/progs.c +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/apps/progs.c @@ -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 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 4f8a94a7c93..7f53b2e2d4a 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.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -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", @@ -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_64", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3559,6 +3559,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" ], @@ -3658,6 +3661,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" ], @@ -5896,6 +5902,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" ], @@ -5995,6 +6004,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" ], @@ -12503,6 +12515,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" ], @@ -12602,6 +12617,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" ], @@ -14840,6 +14858,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" ], @@ -14939,6 +14960,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" ], @@ -16678,6 +16702,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", @@ -16711,6 +16736,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", @@ -19611,6 +19637,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", @@ -19644,6 +19671,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", @@ -27431,8 +27459,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); @@ -27459,7 +27487,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"; @@ -27476,8 +27504,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; _____ 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 35592952849..29225178b43 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: Tue Dec 14 22:50:43 2021 UTC" +#define DATE "built on: Wed Mar 16 04:52:34 2022 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/bio.h b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/bio.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/crypto.h b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/crypto.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/progs.h b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/BSD-x86_64/no-asm/apps/progs.c b/deps/openssl/config/archs/BSD-x86_64/no-asm/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/BSD-x86_64/no-asm/apps/progs.c +++ b/deps/openssl/config/archs/BSD-x86_64/no-asm/apps/progs.c @@ -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 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 3c88f1d32f7..d63fe8ef502 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 @@ -154,7 +154,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -202,10 +202,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-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", @@ -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_64", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3500,6 +3500,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" ], @@ -3599,6 +3602,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" ], @@ -5837,6 +5843,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" ], @@ -5936,6 +5945,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" ], @@ -9647,10 +9659,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" => [ @@ -12376,6 +12388,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" ], @@ -12475,6 +12490,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" ], @@ -14713,6 +14731,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" ], @@ -14812,6 +14833,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" ], @@ -16551,6 +16575,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", @@ -16584,6 +16609,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", @@ -19484,6 +19510,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", @@ -19517,6 +19544,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", @@ -27079,8 +27107,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); @@ -27107,7 +27135,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"; @@ -27124,8 +27152,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; _____ 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 dd0a57e847a..9d4aa9a6944 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: Tue Dec 14 22:51:10 2021 UTC" +#define DATE "built on: Wed Mar 16 04:52:51 2022 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/bio.h b/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/crypto.h b/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/crypto.h +++ b/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/BSD-x86_64/no-asm/include/progs.h b/deps/openssl/config/archs/BSD-x86_64/no-asm/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/BSD-x86_64/no-asm/include/progs.h +++ b/deps/openssl/config/archs/BSD-x86_64/no-asm/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/VC-WIN32/asm/apps/progs.c b/deps/openssl/config/archs/VC-WIN32/asm/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/apps/progs.c +++ b/deps/openssl/config/archs/VC-WIN32/asm/apps/progs.c @@ -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 diff --git a/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm b/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm index 5816474c7a6..952d7ae9872 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.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -216,10 +216,10 @@ 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" => "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", @@ -268,11 +268,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" => "VC-WIN32", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "lib", @@ -287,7 +287,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x559bdf5df6e0)", + "RANLIB" => "CODE(0x564903bb20a0)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -3604,6 +3604,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" ], @@ -3703,6 +3706,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" ], @@ -5941,6 +5947,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" ], @@ -6040,6 +6049,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" ], @@ -12516,6 +12528,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" ], @@ -12615,6 +12630,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" ], @@ -14853,6 +14871,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" ], @@ -14952,6 +14973,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" ], @@ -16699,6 +16723,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", @@ -16732,6 +16757,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", @@ -19638,6 +19664,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", @@ -19671,6 +19698,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", @@ -27341,8 +27369,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); @@ -27369,7 +27397,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"; @@ -27386,8 +27414,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; _____ 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 645ecc9f2d6..6aa9f2de5c0 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: Tue Dec 14 23:08:57 2021 UTC" +#define DATE "built on: Wed Mar 16 05:03:33 2022 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/bio.h b/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/bio.h index 9534d5b5546..14f0ada683c 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/crypto.h b/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/crypto.h index 69775c2cd0c..0aab81b3c43 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/crypto.h +++ b/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/crypto.h @@ -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 @@ -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); 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 5f572d2ef13..c1fac576fd3 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/ssl.h b/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/ssl.h index 9376faf6e6f..fb02a445b2a 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/VC-WIN32/asm/include/progs.h b/deps/openssl/config/archs/VC-WIN32/asm/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/include/progs.h +++ b/deps/openssl/config/archs/VC-WIN32/asm/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/apps/progs.c b/deps/openssl/config/archs/VC-WIN32/asm_avx2/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/apps/progs.c +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/apps/progs.c @@ -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 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 41fa7896e89..d6f98464f55 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.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -216,10 +216,10 @@ 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" => "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", @@ -268,11 +268,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" => "VC-WIN32", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "lib", @@ -287,7 +287,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x55a124919710)", + "RANLIB" => "CODE(0x561566bd9380)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -3604,6 +3604,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" ], @@ -3703,6 +3706,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" ], @@ -5941,6 +5947,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" ], @@ -6040,6 +6049,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" ], @@ -8062,6 +8074,9 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -8081,10 +8096,7 @@ our %unified_info = ( "apps/lib/libapps-lib-tlssrp_depr.o", "apps/lib/libapps-lib-win32_init.o", "apps/lib/libtestutil-lib-opt.o", - "apps/lib/libtestutil-lib-win32_init.o", - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o" + "apps/lib/libtestutil-lib-win32_init.o" ], "products" => { "bin" => [ @@ -9784,10 +9796,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" => [ @@ -12516,6 +12528,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" ], @@ -12615,6 +12630,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" ], @@ -14853,6 +14871,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" ], @@ -14952,6 +14973,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" ], @@ -16699,6 +16723,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", @@ -16732,6 +16757,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", @@ -19638,6 +19664,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", @@ -19671,6 +19698,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", @@ -27341,8 +27369,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); @@ -27369,7 +27397,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"; @@ -27386,8 +27414,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; _____ 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 894424abf64..cfec505bcb6 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: Tue Dec 14 23:09:16 2021 UTC" +#define DATE "built on: Wed Mar 16 05:03:45 2022 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/bio.h b/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/bio.h index 9534d5b5546..14f0ada683c 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/bio.h +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/crypto.h b/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/crypto.h index 69775c2cd0c..0aab81b3c43 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/crypto.h +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/crypto.h @@ -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 @@ -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); 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 5f572d2ef13..c1fac576fd3 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/ssl.h index 9376faf6e6f..fb02a445b2a 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/progs.h b/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/apps/progs.c b/deps/openssl/config/archs/VC-WIN32/no-asm/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/VC-WIN32/no-asm/apps/progs.c +++ b/deps/openssl/config/archs/VC-WIN32/no-asm/apps/progs.c @@ -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 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 e2588aec1f1..27741848ffb 100644 --- a/deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm @@ -163,7 +163,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -215,10 +215,10 @@ 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" => "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", @@ -268,11 +268,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" => "VC-WIN32", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "lib", @@ -287,7 +287,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x55d20a1d5e40)", + "RANLIB" => "CODE(0x55f4c6692920)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -3547,6 +3547,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" ], @@ -3646,6 +3649,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" ], @@ -5884,6 +5890,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" ], @@ -5983,6 +5992,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" ], @@ -9701,10 +9713,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" => [ @@ -12433,6 +12445,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" ], @@ -12532,6 +12547,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" ], @@ -14770,6 +14788,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" ], @@ -14869,6 +14890,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" ], @@ -16616,6 +16640,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", @@ -16649,6 +16674,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", @@ -19555,6 +19581,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", @@ -19588,6 +19615,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", @@ -27157,8 +27185,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); @@ -27185,7 +27213,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"; @@ -27202,8 +27230,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; _____ 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 d8c351b06b7..3184d862959 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: Tue Dec 14 23:09:35 2021 UTC" +#define DATE "built on: Wed Mar 16 05:03:57 2022 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/bio.h b/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/bio.h index 9534d5b5546..14f0ada683c 100644 --- a/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/crypto.h b/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/crypto.h index 69775c2cd0c..0aab81b3c43 100644 --- a/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/crypto.h +++ b/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/crypto.h @@ -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 @@ -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); 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 5f572d2ef13..c1fac576fd3 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/ssl.h index 9376faf6e6f..fb02a445b2a 100644 --- a/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/include/progs.h b/deps/openssl/config/archs/VC-WIN32/no-asm/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/VC-WIN32/no-asm/include/progs.h +++ b/deps/openssl/config/archs/VC-WIN32/no-asm/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/apps/progs.c b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/apps/progs.c +++ b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/apps/progs.c @@ -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 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 da39c58010c..d8090707bb6 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 @@ -163,7 +163,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -213,10 +213,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "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", @@ -266,11 +266,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "14 Dec 2021", + "release_date" => "15 Mar 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "VC-WIN64-ARM", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "lib", @@ -283,7 +283,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x55d4902aca90)", + "RANLIB" => "CODE(0x562e2bc2c820)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -3539,6 +3539,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" ], @@ -3638,6 +3641,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" ], @@ -5876,6 +5882,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" ], @@ -5975,6 +5984,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" ], @@ -12425,6 +12437,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" ], @@ -12524,6 +12539,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" ], @@ -14762,6 +14780,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" ], @@ -14861,6 +14882,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" ], @@ -16608,6 +16632,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", @@ -16641,6 +16666,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", @@ -19547,6 +19573,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", @@ -19580,6 +19607,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", @@ -27149,8 +27177,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); @@ -27177,7 +27205,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"; @@ -27194,8 +27222,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; _____ 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 1612c4fc062..9660e2b5078 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: Tue Dec 14 23:09:51 2021 UTC" +#define DATE "built on: Wed Mar 16 05:04:07 2022 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/bio.h b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/bio.h index 9534d5b5546..14f0ada683c 100644 --- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/crypto.h b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/crypto.h index 69775c2cd0c..0aab81b3c43 100644 --- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/crypto.h +++ b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/crypto.h @@ -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 @@ -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); 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 5f572d2ef13..c1fac576fd3 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/ssl.h index 9376faf6e6f..fb02a445b2a 100644 --- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/progs.h b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/progs.h +++ b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/apps/progs.c b/deps/openssl/config/archs/VC-WIN64A/asm/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/apps/progs.c +++ b/deps/openssl/config/archs/VC-WIN64A/asm/apps/progs.c @@ -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 diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm b/deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm index 1a031d3d3d1..d2eb08f4967 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.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -219,10 +219,10 @@ 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" => "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", @@ -271,11 +271,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" => "VC-WIN64A", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "lib", @@ -290,7 +290,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x55a849a36c50)", + "RANLIB" => "CODE(0x5579ca06f6e0)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -3610,6 +3610,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" ], @@ -3709,6 +3712,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" ], @@ -5947,6 +5953,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" ], @@ -6046,6 +6055,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" ], @@ -9821,10 +9833,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" => [ @@ -12553,6 +12565,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" ], @@ -12652,6 +12667,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" ], @@ -14890,6 +14908,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" ], @@ -14989,6 +15010,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" ], @@ -16736,6 +16760,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", @@ -16769,6 +16794,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", @@ -19675,6 +19701,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", @@ -19708,6 +19735,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", @@ -27502,8 +27530,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); @@ -27530,7 +27558,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"; @@ -27547,8 +27575,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; _____ 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 1ab1493e8a6..bb6286128b5 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: Tue Dec 14 23:07:47 2021 UTC" +#define DATE "built on: Wed Mar 16 05:02:50 2022 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/bio.h b/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/bio.h index 9534d5b5546..14f0ada683c 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/crypto.h b/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/crypto.h index 69775c2cd0c..0aab81b3c43 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/crypto.h +++ b/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/crypto.h @@ -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 @@ -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); 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 5f572d2ef13..c1fac576fd3 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/ssl.h b/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/ssl.h index 9376faf6e6f..fb02a445b2a 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/include/progs.h b/deps/openssl/config/archs/VC-WIN64A/asm/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/include/progs.h +++ b/deps/openssl/config/archs/VC-WIN64A/asm/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/apps/progs.c b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/apps/progs.c +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/apps/progs.c @@ -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 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 524aa7e66be..674429534e3 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.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -219,10 +219,10 @@ 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" => "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", @@ -271,11 +271,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" => "VC-WIN64A", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "lib", @@ -290,7 +290,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x55bfc1739eb0)", + "RANLIB" => "CODE(0x5575e5b916a0)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -3610,6 +3610,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" ], @@ -3709,6 +3712,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" ], @@ -5947,6 +5953,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" ], @@ -6046,6 +6055,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" ], @@ -12553,6 +12565,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" ], @@ -12652,6 +12667,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" ], @@ -14890,6 +14908,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" ], @@ -14989,6 +15010,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" ], @@ -16736,6 +16760,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", @@ -16769,6 +16794,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", @@ -19675,6 +19701,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", @@ -19708,6 +19735,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", @@ -27502,8 +27530,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); @@ -27530,7 +27558,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"; @@ -27547,8 +27575,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; _____ 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 dd427f23c67..7268ba1317d 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: Tue Dec 14 23:08:14 2021 UTC" +#define DATE "built on: Wed Mar 16 05:03:06 2022 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/bio.h b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/bio.h index 9534d5b5546..14f0ada683c 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/bio.h +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/crypto.h b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/crypto.h index 69775c2cd0c..0aab81b3c43 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/crypto.h +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/crypto.h @@ -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 @@ -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); 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 5f572d2ef13..c1fac576fd3 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/ssl.h index 9376faf6e6f..fb02a445b2a 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/progs.h b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/VC-WIN64A/no-asm/apps/progs.c b/deps/openssl/config/archs/VC-WIN64A/no-asm/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/VC-WIN64A/no-asm/apps/progs.c +++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/apps/progs.c @@ -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 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 19191893d69..ff2d55e1b87 100644 --- a/deps/openssl/config/archs/VC-WIN64A/no-asm/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/configdata.pm @@ -166,7 +166,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -218,10 +218,10 @@ 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" => "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", @@ -271,11 +271,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" => "VC-WIN64A", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "lib", @@ -290,7 +290,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x55d60f0492d0)", + "RANLIB" => "CODE(0x557288449bd0)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -3551,6 +3551,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" ], @@ -3650,6 +3653,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" ], @@ -5888,6 +5894,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" ], @@ -5987,6 +5996,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" ], @@ -9705,10 +9717,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" => [ @@ -12437,6 +12449,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" ], @@ -12536,6 +12551,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" ], @@ -14774,6 +14792,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" ], @@ -14873,6 +14894,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" ], @@ -16620,6 +16644,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", @@ -16653,6 +16678,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", @@ -19559,6 +19585,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", @@ -19592,6 +19619,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", @@ -27161,8 +27189,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); @@ -27189,7 +27217,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"; @@ -27206,8 +27234,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; _____ 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 de49ca52d7b..92b9cdf819a 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: Tue Dec 14 23:08:41 2021 UTC" +#define DATE "built on: Wed Mar 16 05:03:22 2022 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/bio.h b/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/bio.h index 9534d5b5546..14f0ada683c 100644 --- a/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/crypto.h b/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/crypto.h index 69775c2cd0c..0aab81b3c43 100644 --- a/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/crypto.h +++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/crypto.h @@ -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 @@ -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); 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 5f572d2ef13..c1fac576fd3 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/ssl.h index 9376faf6e6f..fb02a445b2a 100644 --- a/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/VC-WIN64A/no-asm/include/progs.h b/deps/openssl/config/archs/VC-WIN64A/no-asm/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/VC-WIN64A/no-asm/include/progs.h +++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/aix-gcc/asm/apps/progs.c b/deps/openssl/config/archs/aix-gcc/asm/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/aix-gcc/asm/apps/progs.c +++ b/deps/openssl/config/archs/aix-gcc/asm/apps/progs.c @@ -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 diff --git a/deps/openssl/config/archs/aix-gcc/asm/configdata.pm b/deps/openssl/config/archs/aix-gcc/asm/configdata.pm index 86160bdcbea..0ea45c0d70b 100644 --- a/deps/openssl/config/archs/aix-gcc/asm/configdata.pm +++ b/deps/openssl/config/archs/aix-gcc/asm/configdata.pm @@ -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" => [ @@ -206,10 +206,10 @@ 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" => "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", @@ -258,11 +258,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "14 Dec 2021", + "release_date" => "15 Mar 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "aix-gcc", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar -X32", @@ -3529,6 +3529,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" ], @@ -3628,6 +3631,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" ], @@ -5866,6 +5872,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" ], @@ -5965,6 +5974,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" ], @@ -7981,6 +7993,9 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -7998,10 +8013,7 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o", - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o" + "apps/lib/libtestutil-lib-opt.o" ], "products" => { "bin" => [ @@ -12436,6 +12448,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" ], @@ -12535,6 +12550,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" ], @@ -14773,6 +14791,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" ], @@ -14872,6 +14893,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" ], @@ -16611,6 +16635,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", @@ -16644,6 +16669,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", @@ -19544,6 +19570,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", @@ -19577,6 +19604,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", @@ -27263,8 +27291,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); @@ -27291,7 +27319,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"; @@ -27308,8 +27336,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; _____ diff --git a/deps/openssl/config/archs/aix-gcc/asm/crypto/buildinf.h b/deps/openssl/config/archs/aix-gcc/asm/crypto/buildinf.h index 5849f226e6d..2bd8c3c431a 100644 --- a/deps/openssl/config/archs/aix-gcc/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/aix-gcc/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: aix-gcc" -#define DATE "built on: Tue Dec 14 22:47:22 2021 UTC" +#define DATE "built on: Wed Mar 16 04:50:23 2022 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/aix-gcc/asm/include/openssl/bio.h b/deps/openssl/config/archs/aix-gcc/asm/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/aix-gcc/asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/aix-gcc/asm/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/aix-gcc/asm/include/openssl/crypto.h b/deps/openssl/config/archs/aix-gcc/asm/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/aix-gcc/asm/include/openssl/crypto.h +++ b/deps/openssl/config/archs/aix-gcc/asm/include/openssl/crypto.h @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/aix-gcc/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/aix-gcc/asm/include/openssl/opensslv.h index 46afce5296f..ee2b0c90bf6 100644 --- a/deps/openssl/config/archs/aix-gcc/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/aix-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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/aix-gcc/asm/include/openssl/ssl.h b/deps/openssl/config/archs/aix-gcc/asm/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/aix-gcc/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/aix-gcc/asm/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/aix-gcc/asm/include/progs.h b/deps/openssl/config/archs/aix-gcc/asm/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/aix-gcc/asm/include/progs.h +++ b/deps/openssl/config/archs/aix-gcc/asm/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/aix-gcc/asm_avx2/apps/progs.c b/deps/openssl/config/archs/aix-gcc/asm_avx2/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/aix-gcc/asm_avx2/apps/progs.c +++ b/deps/openssl/config/archs/aix-gcc/asm_avx2/apps/progs.c @@ -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 diff --git a/deps/openssl/config/archs/aix-gcc/asm_avx2/configdata.pm b/deps/openssl/config/archs/aix-gcc/asm_avx2/configdata.pm index 24570d1bfe0..7aab380b513 100644 --- a/deps/openssl/config/archs/aix-gcc/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/aix-gcc/asm_avx2/configdata.pm @@ -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" => [ @@ -206,10 +206,10 @@ 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" => "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", @@ -258,11 +258,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "14 Dec 2021", + "release_date" => "15 Mar 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "aix-gcc", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar -X32", @@ -3529,6 +3529,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" ], @@ -3628,6 +3631,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" ], @@ -5866,6 +5872,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" ], @@ -5965,6 +5974,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" ], @@ -7981,9 +7993,6 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -8001,7 +8010,10 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o" + "apps/lib/libtestutil-lib-opt.o", + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o" ], "products" => { "bin" => [ @@ -9707,10 +9719,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/libfips-lib-self_test_kats.o", + "providers/fips/fips-dso-fips_entry.o" ], "products" => { "dso" => [ @@ -12436,6 +12448,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" ], @@ -12535,6 +12550,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" ], @@ -14773,6 +14791,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" ], @@ -14872,6 +14893,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" ], @@ -16611,6 +16635,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", @@ -16644,6 +16669,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", @@ -19544,6 +19570,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", @@ -19577,6 +19604,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", @@ -27263,8 +27291,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); @@ -27291,7 +27319,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"; @@ -27308,8 +27336,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; _____ diff --git a/deps/openssl/config/archs/aix-gcc/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/aix-gcc/asm_avx2/crypto/buildinf.h index e18adbeb2b4..d367ed8eba8 100644 --- a/deps/openssl/config/archs/aix-gcc/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/aix-gcc/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: aix-gcc" -#define DATE "built on: Tue Dec 14 22:47:41 2021 UTC" +#define DATE "built on: Wed Mar 16 04:50:36 2022 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/aix-gcc/asm_avx2/include/openssl/bio.h b/deps/openssl/config/archs/aix-gcc/asm_avx2/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/aix-gcc/asm_avx2/include/openssl/bio.h +++ b/deps/openssl/config/archs/aix-gcc/asm_avx2/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/aix-gcc/asm_avx2/include/openssl/crypto.h b/deps/openssl/config/archs/aix-gcc/asm_avx2/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/aix-gcc/asm_avx2/include/openssl/crypto.h +++ b/deps/openssl/config/archs/aix-gcc/asm_avx2/include/openssl/crypto.h @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/aix-gcc/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/aix-gcc/asm_avx2/include/openssl/opensslv.h index 46afce5296f..ee2b0c90bf6 100644 --- a/deps/openssl/config/archs/aix-gcc/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/aix-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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/aix-gcc/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/aix-gcc/asm_avx2/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/aix-gcc/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/aix-gcc/asm_avx2/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/aix-gcc/asm_avx2/include/progs.h b/deps/openssl/config/archs/aix-gcc/asm_avx2/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/aix-gcc/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/aix-gcc/asm_avx2/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/aix-gcc/no-asm/apps/progs.c b/deps/openssl/config/archs/aix-gcc/no-asm/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/aix-gcc/no-asm/apps/progs.c +++ b/deps/openssl/config/archs/aix-gcc/no-asm/apps/progs.c @@ -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 diff --git a/deps/openssl/config/archs/aix-gcc/no-asm/configdata.pm b/deps/openssl/config/archs/aix-gcc/no-asm/configdata.pm index eb19dd2f92b..b986a5db0cf 100644 --- a/deps/openssl/config/archs/aix-gcc/no-asm/configdata.pm +++ b/deps/openssl/config/archs/aix-gcc/no-asm/configdata.pm @@ -154,7 +154,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -205,10 +205,10 @@ 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" => "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", @@ -258,11 +258,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "14 Dec 2021", + "release_date" => "15 Mar 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "aix-gcc", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar -X32", @@ -3501,6 +3501,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" ], @@ -3600,6 +3603,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" ], @@ -5838,6 +5844,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" ], @@ -5937,6 +5946,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" ], @@ -9647,10 +9659,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" => [ @@ -12376,6 +12388,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" ], @@ -12475,6 +12490,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" ], @@ -14713,6 +14731,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" ], @@ -14812,6 +14833,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" ], @@ -16551,6 +16575,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", @@ -16584,6 +16609,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", @@ -19484,6 +19510,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", @@ -19517,6 +19544,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", @@ -27078,8 +27106,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); @@ -27106,7 +27134,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"; @@ -27123,8 +27151,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; _____ diff --git a/deps/openssl/config/archs/aix-gcc/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/aix-gcc/no-asm/crypto/buildinf.h index 283988e84e4..70493b1eb33 100644 --- a/deps/openssl/config/archs/aix-gcc/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/aix-gcc/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: aix-gcc" -#define DATE "built on: Tue Dec 14 22:48:00 2021 UTC" +#define DATE "built on: Wed Mar 16 04:50:48 2022 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/aix-gcc/no-asm/include/openssl/bio.h b/deps/openssl/config/archs/aix-gcc/no-asm/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/aix-gcc/no-asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/aix-gcc/no-asm/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/aix-gcc/no-asm/include/openssl/crypto.h b/deps/openssl/config/archs/aix-gcc/no-asm/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/aix-gcc/no-asm/include/openssl/crypto.h +++ b/deps/openssl/config/archs/aix-gcc/no-asm/include/openssl/crypto.h @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/aix-gcc/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/aix-gcc/no-asm/include/openssl/opensslv.h index 46afce5296f..ee2b0c90bf6 100644 --- a/deps/openssl/config/archs/aix-gcc/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/aix-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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/aix-gcc/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/aix-gcc/no-asm/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/aix-gcc/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/aix-gcc/no-asm/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/aix-gcc/no-asm/include/progs.h b/deps/openssl/config/archs/aix-gcc/no-asm/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/aix-gcc/no-asm/include/progs.h +++ b/deps/openssl/config/archs/aix-gcc/no-asm/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm/apps/progs.c b/deps/openssl/config/archs/aix64-gcc-as/asm/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm/apps/progs.c +++ b/deps/openssl/config/archs/aix64-gcc-as/asm/apps/progs.c @@ -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 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 4f1e1fcc643..23378c79fac 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.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,10 +206,10 @@ 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" => "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", @@ -258,11 +258,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "14 Dec 2021", + "release_date" => "15 Mar 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "aix64-gcc-as", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar -X64", @@ -3537,6 +3537,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" ], @@ -3636,6 +3639,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" ], @@ -5874,6 +5880,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" ], @@ -5973,6 +5982,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" ], @@ -7989,9 +8001,6 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -8009,7 +8018,10 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o" + "apps/lib/libtestutil-lib-opt.o", + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o" ], "products" => { "bin" => [ @@ -12455,6 +12467,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" ], @@ -12554,6 +12569,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" ], @@ -14792,6 +14810,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" ], @@ -14891,6 +14912,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" ], @@ -16630,6 +16654,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", @@ -16663,6 +16688,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", @@ -19563,6 +19589,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", @@ -19596,6 +19623,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", @@ -27326,8 +27354,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); @@ -27354,7 +27382,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"; @@ -27371,8 +27399,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; _____ 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 e89b880b627..e110bc29057 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: Tue Dec 14 22:48:18 2021 UTC" +#define DATE "built on: Wed Mar 16 04:51:00 2022 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/bio.h b/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/crypto.h b/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/crypto.h +++ b/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/ssl.h b/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm/include/progs.h b/deps/openssl/config/archs/aix64-gcc-as/asm/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm/include/progs.h +++ b/deps/openssl/config/archs/aix64-gcc-as/asm/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/apps/progs.c b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/apps/progs.c +++ b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/apps/progs.c @@ -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 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 8a5bfb9002f..26373a93f08 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.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,10 +206,10 @@ 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" => "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", @@ -258,11 +258,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "14 Dec 2021", + "release_date" => "15 Mar 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "aix64-gcc-as", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar -X64", @@ -3537,6 +3537,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" ], @@ -3636,6 +3639,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" ], @@ -5874,6 +5880,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" ], @@ -5973,6 +5982,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" ], @@ -7989,6 +8001,9 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -8006,10 +8021,7 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o", - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o" + "apps/lib/libtestutil-lib-opt.o" ], "products" => { "bin" => [ @@ -9726,10 +9738,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" => [ @@ -12455,6 +12467,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" ], @@ -12554,6 +12569,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" ], @@ -14792,6 +14810,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" ], @@ -14891,6 +14912,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" ], @@ -16630,6 +16654,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", @@ -16663,6 +16688,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", @@ -19563,6 +19589,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", @@ -19596,6 +19623,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", @@ -27326,8 +27354,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); @@ -27354,7 +27382,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"; @@ -27371,8 +27399,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; _____ 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 c9acee50358..e7e83ad5f79 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: Tue Dec 14 22:48:38 2021 UTC" +#define DATE "built on: Wed Mar 16 04:51:12 2022 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/bio.h b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/bio.h +++ b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/crypto.h b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/crypto.h +++ b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/progs.h b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/aix64-gcc-as/no-asm/apps/progs.c b/deps/openssl/config/archs/aix64-gcc-as/no-asm/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/no-asm/apps/progs.c +++ b/deps/openssl/config/archs/aix64-gcc-as/no-asm/apps/progs.c @@ -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 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 d87decd504b..b5ba0ae92de 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.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -205,10 +205,10 @@ 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" => "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", @@ -258,11 +258,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "14 Dec 2021", + "release_date" => "15 Mar 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "aix64-gcc-as", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar -X64", @@ -3503,6 +3503,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" ], @@ -3602,6 +3605,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" ], @@ -5840,6 +5846,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" ], @@ -5939,6 +5948,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" ], @@ -9649,10 +9661,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/libfips-lib-self_test_kats.o", + "providers/fips/fips-dso-fips_entry.o" ], "products" => { "dso" => [ @@ -12378,6 +12390,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" ], @@ -12477,6 +12492,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" ], @@ -14715,6 +14733,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" ], @@ -14814,6 +14835,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" ], @@ -16553,6 +16577,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", @@ -16586,6 +16611,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", @@ -19486,6 +19512,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", @@ -19519,6 +19546,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", @@ -27080,8 +27108,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); @@ -27108,7 +27136,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"; @@ -27125,8 +27153,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; _____ 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 a0eed31c4a7..291eb4728f2 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: Tue Dec 14 22:48:58 2021 UTC" +#define DATE "built on: Wed Mar 16 04:51:25 2022 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/bio.h b/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/crypto.h b/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/crypto.h +++ b/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/progs.h b/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/progs.h +++ b/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/apps/progs.c b/deps/openssl/config/archs/darwin-i386-cc/asm/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/apps/progs.c +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/apps/progs.c @@ -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 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 d4d10acbf01..eca35ef678f 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.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,10 +206,10 @@ 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" => "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", @@ -258,11 +258,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" => "darwin-i386-cc", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3558,6 +3558,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" ], @@ -3657,6 +3660,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" ], @@ -5895,6 +5901,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" ], @@ -5994,6 +6003,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" ], @@ -8002,9 +8014,6 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -8022,7 +8031,10 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o" + "apps/lib/libtestutil-lib-opt.o", + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o" ], "products" => { "bin" => [ @@ -12450,6 +12462,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" ], @@ -12549,6 +12564,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" ], @@ -14787,6 +14805,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" ], @@ -14886,6 +14907,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" ], @@ -16608,6 +16632,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", @@ -16641,6 +16666,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", @@ -19533,6 +19559,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", @@ -19566,6 +19593,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", @@ -27225,8 +27253,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); @@ -27253,7 +27281,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"; @@ -27270,8 +27298,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; _____ 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 98dc2b1e4c5..e8183e0ca06 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: Tue Dec 14 22:52:40 2021 UTC" +#define DATE "built on: Wed Mar 16 04:53:48 2022 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/bio.h b/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/crypto.h b/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/crypto.h +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/ssl.h b/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/include/progs.h b/deps/openssl/config/archs/darwin-i386-cc/asm/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/include/progs.h +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/apps/progs.c b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/apps/progs.c +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/apps/progs.c @@ -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 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 c2fda972489..bc45dbb6937 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.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,10 +206,10 @@ 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" => "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", @@ -258,11 +258,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" => "darwin-i386-cc", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3558,6 +3558,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" ], @@ -3657,6 +3660,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" ], @@ -5895,6 +5901,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" ], @@ -5994,6 +6003,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" ], @@ -9721,10 +9733,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" => [ @@ -12450,6 +12462,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" ], @@ -12549,6 +12564,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" ], @@ -14787,6 +14805,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" ], @@ -14886,6 +14907,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" ], @@ -16608,6 +16632,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", @@ -16641,6 +16666,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", @@ -19533,6 +19559,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", @@ -19566,6 +19593,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", @@ -27225,8 +27253,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); @@ -27253,7 +27281,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"; @@ -27270,8 +27298,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; _____ 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 9d6f96d9610..e1e9f9519ed 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: Tue Dec 14 22:53:00 2021 UTC" +#define DATE "built on: Wed Mar 16 04:54:01 2022 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/bio.h b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/bio.h +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/crypto.h b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/crypto.h +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/progs.h b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/darwin-i386-cc/no-asm/apps/progs.c b/deps/openssl/config/archs/darwin-i386-cc/no-asm/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/no-asm/apps/progs.c +++ b/deps/openssl/config/archs/darwin-i386-cc/no-asm/apps/progs.c @@ -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 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 dbed3b2890d..67d08ff0d8c 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 @@ -154,7 +154,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -205,10 +205,10 @@ 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" => "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", @@ -258,11 +258,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" => "darwin-i386-cc", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3501,6 +3501,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" ], @@ -3600,6 +3603,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" ], @@ -5838,6 +5844,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" ], @@ -5937,6 +5946,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" ], @@ -12367,6 +12379,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" ], @@ -12466,6 +12481,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" ], @@ -14704,6 +14722,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" ], @@ -14803,6 +14824,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" ], @@ -16525,6 +16549,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", @@ -16558,6 +16583,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", @@ -19450,6 +19476,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", @@ -19483,6 +19510,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", @@ -27041,8 +27069,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); @@ -27069,7 +27097,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"; @@ -27086,8 +27114,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; _____ 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 cc4f90dcb2b..f49070610f1 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: Tue Dec 14 22:53:20 2021 UTC" +#define DATE "built on: Wed Mar 16 04:54:14 2022 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/bio.h b/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/crypto.h b/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/crypto.h +++ b/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/progs.h b/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/progs.h +++ b/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm/apps/progs.c b/deps/openssl/config/archs/darwin64-arm64-cc/asm/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm/apps/progs.c +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm/apps/progs.c @@ -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 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 ce5de4cc76d..6a4d43ea078 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.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,10 +206,10 @@ 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" => "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", @@ -258,11 +258,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" => "darwin64-arm64-cc", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3530,6 +3530,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" ], @@ -3629,6 +3632,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" ], @@ -5867,6 +5873,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" ], @@ -5966,6 +5975,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" ], @@ -7974,6 +7986,9 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -7991,10 +8006,7 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o", - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o" + "apps/lib/libtestutil-lib-opt.o" ], "products" => { "bin" => [ @@ -12420,6 +12432,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" ], @@ -12519,6 +12534,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" ], @@ -14757,6 +14775,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" ], @@ -14856,6 +14877,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" ], @@ -16578,6 +16602,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", @@ -16611,6 +16636,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", @@ -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", @@ -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", @@ -27250,8 +27278,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); @@ -27278,7 +27306,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"; @@ -27295,8 +27323,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; _____ 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 d744f9bc72e..212130b01d2 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: Tue Dec 14 22:53:37 2021 UTC" +#define DATE "built on: Wed Mar 16 04:54:26 2022 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/bio.h b/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/crypto.h b/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/crypto.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/ssl.h b/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/progs.h b/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/progs.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/apps/progs.c b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/apps/progs.c +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/apps/progs.c @@ -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 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 5b3e6fb5860..94230e43af5 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.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,10 +206,10 @@ 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" => "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", @@ -258,11 +258,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" => "darwin64-arm64-cc", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3530,6 +3530,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" ], @@ -3629,6 +3632,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" ], @@ -5867,6 +5873,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" ], @@ -5966,6 +5975,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" ], @@ -12420,6 +12432,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" ], @@ -12519,6 +12534,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" ], @@ -14757,6 +14775,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" ], @@ -14856,6 +14877,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" ], @@ -16578,6 +16602,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", @@ -16611,6 +16636,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", @@ -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", @@ -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", @@ -27250,8 +27278,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); @@ -27278,7 +27306,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"; @@ -27295,8 +27323,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; _____ 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 b4d0d6c5329..65747e9b817 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: Tue Dec 14 22:53:57 2021 UTC" +#define DATE "built on: Wed Mar 16 04:54:38 2022 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/include/openssl/bio.h b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/bio.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/crypto.h b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/crypto.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/progs.h b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/apps/progs.c b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/apps/progs.c +++ b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/apps/progs.c @@ -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 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 eebfcf3c34a..786a6f813b4 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 @@ -154,7 +154,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -205,10 +205,10 @@ 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" => "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", @@ -258,11 +258,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" => "darwin64-arm64-cc", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3501,6 +3501,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" ], @@ -3600,6 +3603,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" ], @@ -5838,6 +5844,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" ], @@ -5937,6 +5946,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" ], @@ -9638,10 +9650,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" => [ @@ -12367,6 +12379,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" ], @@ -12466,6 +12481,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" ], @@ -14704,6 +14722,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" ], @@ -14803,6 +14824,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" ], @@ -16525,6 +16549,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", @@ -16558,6 +16583,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", @@ -19450,6 +19476,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", @@ -19483,6 +19510,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", @@ -27041,8 +27069,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); @@ -27069,7 +27097,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"; @@ -27086,8 +27114,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; _____ 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 6aa5ff9b70e..9bc4019bdce 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: Tue Dec 14 22:54:16 2021 UTC" +#define DATE "built on: Wed Mar 16 04:54:51 2022 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/bio.h b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/crypto.h b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/crypto.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/progs.h b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/progs.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/apps/progs.c b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/apps/progs.c +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/apps/progs.c @@ -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 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 f4e7fbcfb6f..d295cb943f2 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.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,10 +206,10 @@ 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" => "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", @@ -258,11 +258,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" => "darwin64-x86_64-cc", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3560,6 +3560,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" ], @@ -3659,6 +3662,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" ], @@ -5897,6 +5903,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" ], @@ -5996,6 +6005,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" ], @@ -9765,10 +9777,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/libfips-lib-self_test_kats.o", + "providers/fips/fips-dso-fips_entry.o" ], "products" => { "dso" => [ @@ -12494,6 +12506,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" ], @@ -12593,6 +12608,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" ], @@ -14831,6 +14849,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" ], @@ -14930,6 +14951,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" ], @@ -16652,6 +16676,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", @@ -16685,6 +16710,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", @@ -19577,6 +19603,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", @@ -19610,6 +19637,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", @@ -27393,8 +27421,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); @@ -27421,7 +27449,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"; @@ -27438,8 +27466,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; _____ 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 b736b7815e0..15b375f5905 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: Tue Dec 14 22:51:28 2021 UTC" +#define DATE "built on: Wed Mar 16 04:53:03 2022 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/bio.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/crypto.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/crypto.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/ssl.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/progs.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/progs.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/apps/progs.c b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/apps/progs.c +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/apps/progs.c @@ -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 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 8d80e2c4587..883f9def304 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.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,10 +206,10 @@ 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" => "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", @@ -258,11 +258,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" => "darwin64-x86_64-cc", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3560,6 +3560,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" ], @@ -3659,6 +3662,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" ], @@ -5897,6 +5903,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" ], @@ -5996,6 +6005,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" ], @@ -12494,6 +12506,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" ], @@ -12593,6 +12608,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" ], @@ -14831,6 +14849,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" ], @@ -14930,6 +14951,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" ], @@ -16652,6 +16676,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", @@ -16685,6 +16710,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", @@ -19577,6 +19603,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", @@ -19610,6 +19637,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", @@ -27393,8 +27421,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); @@ -27421,7 +27449,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"; @@ -27438,8 +27466,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; _____ 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 3ad2583c66d..f3a69ba20bc 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: Tue Dec 14 22:51:55 2021 UTC" +#define DATE "built on: Wed Mar 16 04:53:20 2022 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/bio.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/bio.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/crypto.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/crypto.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/progs.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/apps/progs.c b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/apps/progs.c +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/apps/progs.c @@ -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 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 2002ef5b7cf..5da755d1112 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 @@ -154,7 +154,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -205,10 +205,10 @@ 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" => "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", @@ -258,11 +258,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" => "darwin64-x86_64-cc", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3501,6 +3501,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" ], @@ -3600,6 +3603,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" ], @@ -5838,6 +5844,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" ], @@ -5937,6 +5946,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" ], @@ -9638,10 +9650,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/libfips-lib-self_test_kats.o", + "providers/fips/fips-dso-fips_entry.o" ], "products" => { "dso" => [ @@ -12367,6 +12379,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" ], @@ -12466,6 +12481,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" ], @@ -14704,6 +14722,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" ], @@ -14803,6 +14824,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" ], @@ -16525,6 +16549,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", @@ -16558,6 +16583,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", @@ -19450,6 +19476,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", @@ -19483,6 +19510,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", @@ -27041,8 +27069,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); @@ -27069,7 +27097,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"; @@ -27086,8 +27114,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; _____ 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 6d1cf3f755d..4d6ed145b93 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: Tue Dec 14 22:52:22 2021 UTC" +#define DATE "built on: Wed Mar 16 04:53:37 2022 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/bio.h b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/crypto.h b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/crypto.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/progs.h b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/progs.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/linux-aarch64/asm/apps/progs.c b/deps/openssl/config/archs/linux-aarch64/asm/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/apps/progs.c +++ b/deps/openssl/config/archs/linux-aarch64/asm/apps/progs.c @@ -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 diff --git a/deps/openssl/config/archs/linux-aarch64/asm/configdata.pm b/deps/openssl/config/archs/linux-aarch64/asm/configdata.pm index 7276e96a072..e8ce9e02237 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.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,10 +207,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-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" => "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", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "14 Dec 2021", + "release_date" => "15 Mar 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux-aarch64", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3537,6 +3537,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" ], @@ -3636,6 +3639,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" ], @@ -5874,6 +5880,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" ], @@ -5973,6 +5982,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" ], @@ -7989,9 +8001,6 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -8009,7 +8018,10 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o" + "apps/lib/libtestutil-lib-opt.o", + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o" ], "products" => { "bin" => [ @@ -9707,10 +9719,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/libfips-lib-self_test_kats.o", + "providers/fips/fips-dso-fips_entry.o" ], "products" => { "dso" => [ @@ -12436,6 +12448,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" ], @@ -12535,6 +12550,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" ], @@ -14773,6 +14791,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" ], @@ -14872,6 +14893,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" ], @@ -16611,6 +16635,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", @@ -16644,6 +16669,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", @@ -19607,6 +19633,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", @@ -19640,6 +19667,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", @@ -27294,8 +27322,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); @@ -27322,7 +27350,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"; @@ -27339,8 +27367,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; _____ 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 60835a694f1..ca7a6d0f3fb 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: Tue Dec 14 22:54:34 2021 UTC" +#define DATE "built on: Wed Mar 16 04:55:02 2022 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/bio.h b/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/crypto.h b/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/crypto.h +++ b/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/linux-aarch64/asm/include/progs.h b/deps/openssl/config/archs/linux-aarch64/asm/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/include/progs.h +++ b/deps/openssl/config/archs/linux-aarch64/asm/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/apps/progs.c b/deps/openssl/config/archs/linux-aarch64/asm_avx2/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/apps/progs.c +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/apps/progs.c @@ -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 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 e8b4803c758..9e61388a62e 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.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,10 +207,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-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" => "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", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "14 Dec 2021", + "release_date" => "15 Mar 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux-aarch64", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3537,6 +3537,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" ], @@ -3636,6 +3639,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" ], @@ -5874,6 +5880,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" ], @@ -5973,6 +5982,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" ], @@ -9707,10 +9719,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" => [ @@ -12436,6 +12448,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" ], @@ -12535,6 +12550,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" ], @@ -14773,6 +14791,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" ], @@ -14872,6 +14893,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" ], @@ -16611,6 +16635,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", @@ -16644,6 +16669,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", @@ -19607,6 +19633,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", @@ -19640,6 +19667,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", @@ -27294,8 +27322,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); @@ -27322,7 +27350,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"; @@ -27339,8 +27367,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; _____ 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 d54450225c1..c89830e0065 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: Tue Dec 14 22:54:54 2021 UTC" +#define DATE "built on: Wed Mar 16 04:55:15 2022 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/bio.h b/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/crypto.h b/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/crypto.h +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/progs.h b/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/apps/progs.c b/deps/openssl/config/archs/linux-aarch64/no-asm/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/linux-aarch64/no-asm/apps/progs.c +++ b/deps/openssl/config/archs/linux-aarch64/no-asm/apps/progs.c @@ -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 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 72044eb9c89..7bc4d111b6d 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.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,10 +206,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "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", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "14 Dec 2021", + "release_date" => "15 Mar 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux-aarch64", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3508,6 +3508,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" ], @@ -3607,6 +3610,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" ], @@ -5845,6 +5851,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" ], @@ -5944,6 +5953,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" ], @@ -7960,9 +7972,6 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -7980,7 +7989,10 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o" + "apps/lib/libtestutil-lib-opt.o", + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o" ], "products" => { "bin" => [ @@ -12383,6 +12395,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" ], @@ -12482,6 +12497,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" ], @@ -14720,6 +14738,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" ], @@ -14819,6 +14840,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" ], @@ -16558,6 +16582,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", @@ -16591,6 +16616,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", @@ -19491,6 +19517,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", @@ -19524,6 +19551,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", @@ -27085,8 +27113,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); @@ -27113,7 +27141,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"; @@ -27130,8 +27158,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; _____ 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 ead39fc50fa..8ae5b98082a 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: Tue Dec 14 22:55:13 2021 UTC" +#define DATE "built on: Wed Mar 16 04:55:27 2022 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/bio.h b/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/crypto.h b/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/crypto.h +++ b/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/include/progs.h b/deps/openssl/config/archs/linux-aarch64/no-asm/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/linux-aarch64/no-asm/include/progs.h +++ b/deps/openssl/config/archs/linux-aarch64/no-asm/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/linux-armv4/asm/apps/progs.c b/deps/openssl/config/archs/linux-armv4/asm/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/apps/progs.c +++ b/deps/openssl/config/archs/linux-armv4/asm/apps/progs.c @@ -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 diff --git a/deps/openssl/config/archs/linux-armv4/asm/configdata.pm b/deps/openssl/config/archs/linux-armv4/asm/configdata.pm index 16128bebb9f..9d660aba7ea 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.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,10 +207,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-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" => "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", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "14 Dec 2021", + "release_date" => "15 Mar 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux-armv4", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3546,6 +3546,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" ], @@ -3645,6 +3648,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" ], @@ -5883,6 +5889,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" ], @@ -5982,6 +5991,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" ], @@ -12448,6 +12460,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" ], @@ -12547,6 +12562,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" ], @@ -14785,6 +14803,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" ], @@ -14884,6 +14905,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" ], @@ -16623,6 +16647,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", @@ -16656,6 +16681,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", @@ -19646,6 +19672,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", @@ -19679,6 +19706,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", @@ -27345,8 +27373,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); @@ -27373,7 +27401,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"; @@ -27390,8 +27418,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; _____ 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 e163e1d9c97..b8614f3f292 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: Tue Dec 14 22:55:31 2021 UTC" +#define DATE "built on: Wed Mar 16 04:55:39 2022 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/bio.h b/deps/openssl/config/archs/linux-armv4/asm/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux-armv4/asm/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/linux-armv4/asm/include/openssl/crypto.h b/deps/openssl/config/archs/linux-armv4/asm/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/include/openssl/crypto.h +++ b/deps/openssl/config/archs/linux-armv4/asm/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/linux-armv4/asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux-armv4/asm/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-armv4/asm/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/linux-armv4/asm/include/progs.h b/deps/openssl/config/archs/linux-armv4/asm/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/include/progs.h +++ b/deps/openssl/config/archs/linux-armv4/asm/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/apps/progs.c b/deps/openssl/config/archs/linux-armv4/asm_avx2/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/apps/progs.c +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/apps/progs.c @@ -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 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 0c843ffcef0..04256389787 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.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,10 +207,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-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" => "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", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "14 Dec 2021", + "release_date" => "15 Mar 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux-armv4", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3546,6 +3546,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" ], @@ -3645,6 +3648,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" ], @@ -5883,6 +5889,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" ], @@ -5982,6 +5991,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" ], @@ -12448,6 +12460,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" ], @@ -12547,6 +12562,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" ], @@ -14785,6 +14803,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" ], @@ -14884,6 +14905,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" ], @@ -16623,6 +16647,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", @@ -16656,6 +16681,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", @@ -19646,6 +19672,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", @@ -19679,6 +19706,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", @@ -27345,8 +27373,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); @@ -27373,7 +27401,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"; @@ -27390,8 +27418,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; _____ 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 21963089a52..851bd2eac08 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: Tue Dec 14 22:55:51 2021 UTC" +#define DATE "built on: Wed Mar 16 04:55:52 2022 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/bio.h b/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/crypto.h b/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/crypto.h +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/include/progs.h b/deps/openssl/config/archs/linux-armv4/asm_avx2/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/linux-armv4/no-asm/apps/progs.c b/deps/openssl/config/archs/linux-armv4/no-asm/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/linux-armv4/no-asm/apps/progs.c +++ b/deps/openssl/config/archs/linux-armv4/no-asm/apps/progs.c @@ -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 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 06556bf41d2..7de53f5df7c 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.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,10 +206,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "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", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "14 Dec 2021", + "release_date" => "15 Mar 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux-armv4", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3508,6 +3508,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" ], @@ -3607,6 +3610,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" ], @@ -5845,6 +5851,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" ], @@ -5944,6 +5953,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" ], @@ -9654,10 +9666,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" => [ @@ -12383,6 +12395,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" ], @@ -12482,6 +12497,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" ], @@ -14720,6 +14738,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" ], @@ -14819,6 +14840,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" ], @@ -16558,6 +16582,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", @@ -16591,6 +16616,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", @@ -19491,6 +19517,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", @@ -19524,6 +19551,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", @@ -27085,8 +27113,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); @@ -27113,7 +27141,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"; @@ -27130,8 +27158,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; _____ 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 07835a23ff4..30115d52b7d 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: Tue Dec 14 22:56:11 2021 UTC" +#define DATE "built on: Wed Mar 16 04:56:05 2022 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/bio.h b/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/crypto.h b/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/crypto.h +++ b/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/linux-armv4/no-asm/include/progs.h b/deps/openssl/config/archs/linux-armv4/no-asm/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/linux-armv4/no-asm/include/progs.h +++ b/deps/openssl/config/archs/linux-armv4/no-asm/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/linux-elf/asm/apps/progs.c b/deps/openssl/config/archs/linux-elf/asm/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/linux-elf/asm/apps/progs.c +++ b/deps/openssl/config/archs/linux-elf/asm/apps/progs.c @@ -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 diff --git a/deps/openssl/config/archs/linux-elf/asm/configdata.pm b/deps/openssl/config/archs/linux-elf/asm/configdata.pm index ab1d9f7cfa1..070fcd7dd6a 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.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,10 +207,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-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" => "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", @@ -259,11 +259,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" => "linux-elf", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3564,6 +3564,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" ], @@ -3663,6 +3666,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" ], @@ -5901,6 +5907,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" ], @@ -6000,6 +6009,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" ], @@ -8016,9 +8028,6 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -8036,7 +8045,10 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o" + "apps/lib/libtestutil-lib-opt.o", + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o" ], "products" => { "bin" => [ @@ -9736,10 +9748,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" => [ @@ -12465,6 +12477,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" ], @@ -12564,6 +12579,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" ], @@ -14802,6 +14820,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" ], @@ -14901,6 +14922,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" ], @@ -16640,6 +16664,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", @@ -16673,6 +16698,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", @@ -19573,6 +19599,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", @@ -19606,6 +19633,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", @@ -27268,8 +27296,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); @@ -27296,7 +27324,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"; @@ -27313,8 +27341,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; _____ 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 f88f9606d4c..149a2ca65a4 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: Tue Dec 14 22:56:29 2021 UTC" +#define DATE "built on: Wed Mar 16 04:56:16 2022 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/bio.h b/deps/openssl/config/archs/linux-elf/asm/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/linux-elf/asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux-elf/asm/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/linux-elf/asm/include/openssl/crypto.h b/deps/openssl/config/archs/linux-elf/asm/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/linux-elf/asm/include/openssl/crypto.h +++ b/deps/openssl/config/archs/linux-elf/asm/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/linux-elf/asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux-elf/asm/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/linux-elf/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-elf/asm/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/linux-elf/asm/include/progs.h b/deps/openssl/config/archs/linux-elf/asm/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/linux-elf/asm/include/progs.h +++ b/deps/openssl/config/archs/linux-elf/asm/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/apps/progs.c b/deps/openssl/config/archs/linux-elf/asm_avx2/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/apps/progs.c +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/apps/progs.c @@ -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 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 f3738dc873e..0a88f730ec7 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.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,10 +207,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-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" => "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", @@ -259,11 +259,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" => "linux-elf", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3564,6 +3564,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" ], @@ -3663,6 +3666,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" ], @@ -5901,6 +5907,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" ], @@ -6000,6 +6009,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" ], @@ -8016,9 +8028,6 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -8036,7 +8045,10 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o" + "apps/lib/libtestutil-lib-opt.o", + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o" ], "products" => { "bin" => [ @@ -12465,6 +12477,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" ], @@ -12564,6 +12579,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" ], @@ -14802,6 +14820,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" ], @@ -14901,6 +14922,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" ], @@ -16640,6 +16664,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", @@ -16673,6 +16698,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", @@ -19573,6 +19599,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", @@ -19606,6 +19633,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", @@ -27268,8 +27296,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); @@ -27296,7 +27324,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"; @@ -27313,8 +27341,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; _____ 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 800a90735e7..2323a5f8560 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: Tue Dec 14 22:56:49 2021 UTC" +#define DATE "built on: Wed Mar 16 04:56:30 2022 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/bio.h b/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/crypto.h b/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/crypto.h +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/include/progs.h b/deps/openssl/config/archs/linux-elf/asm_avx2/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/linux-elf/no-asm/apps/progs.c b/deps/openssl/config/archs/linux-elf/no-asm/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/linux-elf/no-asm/apps/progs.c +++ b/deps/openssl/config/archs/linux-elf/no-asm/apps/progs.c @@ -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 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 ee55653d372..2133bdf1db9 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.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,10 +206,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "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", @@ -259,11 +259,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" => "linux-elf", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3507,6 +3507,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" ], @@ -3606,6 +3609,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" ], @@ -5844,6 +5850,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" ], @@ -5943,6 +5952,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" ], @@ -7959,9 +7971,6 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -7979,7 +7988,10 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o" + "apps/lib/libtestutil-lib-opt.o", + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o" ], "products" => { "bin" => [ @@ -9653,10 +9665,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" => [ @@ -12382,6 +12394,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" ], @@ -12481,6 +12496,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" ], @@ -14719,6 +14737,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" ], @@ -14818,6 +14839,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" ], @@ -16557,6 +16581,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", @@ -16590,6 +16615,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", @@ -19490,6 +19516,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", @@ -19523,6 +19550,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", @@ -27084,8 +27112,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); @@ -27112,7 +27140,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"; @@ -27129,8 +27157,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; _____ 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 9073acf4de1..511578f6773 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: Tue Dec 14 22:57:10 2021 UTC" +#define DATE "built on: Wed Mar 16 04:56:43 2022 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/bio.h b/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/crypto.h b/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/crypto.h +++ b/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/linux-elf/no-asm/include/progs.h b/deps/openssl/config/archs/linux-elf/no-asm/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/linux-elf/no-asm/include/progs.h +++ b/deps/openssl/config/archs/linux-elf/no-asm/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/linux-ppc/asm/apps/progs.c b/deps/openssl/config/archs/linux-ppc/asm/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/linux-ppc/asm/apps/progs.c +++ b/deps/openssl/config/archs/linux-ppc/asm/apps/progs.c @@ -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 diff --git a/deps/openssl/config/archs/linux-ppc/asm/configdata.pm b/deps/openssl/config/archs/linux-ppc/asm/configdata.pm index 3066ca4afb3..8bf0ffd9fd8 100644 --- a/deps/openssl/config/archs/linux-ppc/asm/configdata.pm +++ b/deps/openssl/config/archs/linux-ppc/asm/configdata.pm @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,10 +207,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-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" => "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", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "14 Dec 2021", + "release_date" => "15 Mar 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux-ppc", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3536,6 +3536,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" ], @@ -3635,6 +3638,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" ], @@ -5873,6 +5879,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" ], @@ -5972,6 +5981,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" ], @@ -9714,10 +9726,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" => [ @@ -12443,6 +12455,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" ], @@ -12542,6 +12557,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" ], @@ -14780,6 +14798,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" ], @@ -14879,6 +14900,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" ], @@ -16618,6 +16642,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", @@ -16651,6 +16676,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", @@ -19551,6 +19577,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", @@ -19584,6 +19611,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", @@ -27270,8 +27298,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); @@ -27298,7 +27326,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"; @@ -27315,8 +27343,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; _____ diff --git a/deps/openssl/config/archs/linux-ppc/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-ppc/asm/crypto/buildinf.h index c8de39e0396..6e88159ddcd 100644 --- a/deps/openssl/config/archs/linux-ppc/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-ppc/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-ppc" -#define DATE "built on: Tue Dec 14 22:59:54 2021 UTC" +#define DATE "built on: Wed Mar 16 04:57:41 2022 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-ppc/asm/include/openssl/bio.h b/deps/openssl/config/archs/linux-ppc/asm/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/linux-ppc/asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux-ppc/asm/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/linux-ppc/asm/include/openssl/crypto.h b/deps/openssl/config/archs/linux-ppc/asm/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/linux-ppc/asm/include/openssl/crypto.h +++ b/deps/openssl/config/archs/linux-ppc/asm/include/openssl/crypto.h @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/linux-ppc/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-ppc/asm/include/openssl/opensslv.h index 46afce5296f..ee2b0c90bf6 100644 --- a/deps/openssl/config/archs/linux-ppc/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-ppc/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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/linux-ppc/asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux-ppc/asm/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/linux-ppc/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-ppc/asm/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/linux-ppc/asm/include/progs.h b/deps/openssl/config/archs/linux-ppc/asm/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/linux-ppc/asm/include/progs.h +++ b/deps/openssl/config/archs/linux-ppc/asm/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/linux-ppc/asm_avx2/apps/progs.c b/deps/openssl/config/archs/linux-ppc/asm_avx2/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/linux-ppc/asm_avx2/apps/progs.c +++ b/deps/openssl/config/archs/linux-ppc/asm_avx2/apps/progs.c @@ -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 diff --git a/deps/openssl/config/archs/linux-ppc/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux-ppc/asm_avx2/configdata.pm index 2e221b458bf..637e6f5956a 100644 --- a/deps/openssl/config/archs/linux-ppc/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux-ppc/asm_avx2/configdata.pm @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,10 +207,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-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" => "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", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "14 Dec 2021", + "release_date" => "15 Mar 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux-ppc", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3536,6 +3536,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" ], @@ -3635,6 +3638,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" ], @@ -5873,6 +5879,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" ], @@ -5972,6 +5981,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" ], @@ -7988,6 +8000,9 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -8005,10 +8020,7 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o", - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o" + "apps/lib/libtestutil-lib-opt.o" ], "products" => { "bin" => [ @@ -9714,10 +9726,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" => [ @@ -12443,6 +12455,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" ], @@ -12542,6 +12557,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" ], @@ -14780,6 +14798,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" ], @@ -14879,6 +14900,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" ], @@ -16618,6 +16642,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", @@ -16651,6 +16676,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", @@ -19551,6 +19577,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", @@ -19584,6 +19611,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", @@ -27270,8 +27298,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); @@ -27298,7 +27326,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"; @@ -27315,8 +27343,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; _____ diff --git a/deps/openssl/config/archs/linux-ppc/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux-ppc/asm_avx2/crypto/buildinf.h index 6778eaba93d..b3d9a45781b 100644 --- a/deps/openssl/config/archs/linux-ppc/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-ppc/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-ppc" -#define DATE "built on: Tue Dec 14 23:00:13 2021 UTC" +#define DATE "built on: Wed Mar 16 04:57:54 2022 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-ppc/asm_avx2/include/openssl/bio.h b/deps/openssl/config/archs/linux-ppc/asm_avx2/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/linux-ppc/asm_avx2/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux-ppc/asm_avx2/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/linux-ppc/asm_avx2/include/openssl/crypto.h b/deps/openssl/config/archs/linux-ppc/asm_avx2/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/linux-ppc/asm_avx2/include/openssl/crypto.h +++ b/deps/openssl/config/archs/linux-ppc/asm_avx2/include/openssl/crypto.h @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/linux-ppc/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-ppc/asm_avx2/include/openssl/opensslv.h index 46afce5296f..ee2b0c90bf6 100644 --- a/deps/openssl/config/archs/linux-ppc/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-ppc/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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/linux-ppc/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/linux-ppc/asm_avx2/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/linux-ppc/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-ppc/asm_avx2/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/linux-ppc/asm_avx2/include/progs.h b/deps/openssl/config/archs/linux-ppc/asm_avx2/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/linux-ppc/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/linux-ppc/asm_avx2/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/linux-ppc/no-asm/apps/progs.c b/deps/openssl/config/archs/linux-ppc/no-asm/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/linux-ppc/no-asm/apps/progs.c +++ b/deps/openssl/config/archs/linux-ppc/no-asm/apps/progs.c @@ -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 diff --git a/deps/openssl/config/archs/linux-ppc/no-asm/configdata.pm b/deps/openssl/config/archs/linux-ppc/no-asm/configdata.pm index fbb699e78b1..365db061e04 100644 --- a/deps/openssl/config/archs/linux-ppc/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux-ppc/no-asm/configdata.pm @@ -157,7 +157,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,10 +206,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "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", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "14 Dec 2021", + "release_date" => "15 Mar 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux-ppc", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3508,6 +3508,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" ], @@ -3607,6 +3610,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" ], @@ -5845,6 +5851,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" ], @@ -5944,6 +5953,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" ], @@ -12383,6 +12395,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" ], @@ -12482,6 +12497,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" ], @@ -14720,6 +14738,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" ], @@ -14819,6 +14840,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" ], @@ -16558,6 +16582,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", @@ -16591,6 +16616,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", @@ -19491,6 +19517,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", @@ -19524,6 +19551,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", @@ -27085,8 +27113,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); @@ -27113,7 +27141,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"; @@ -27130,8 +27158,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; _____ diff --git a/deps/openssl/config/archs/linux-ppc/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-ppc/no-asm/crypto/buildinf.h index 24d53b153e2..f8ef695d236 100644 --- a/deps/openssl/config/archs/linux-ppc/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-ppc/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-ppc" -#define DATE "built on: Tue Dec 14 23:00:32 2021 UTC" +#define DATE "built on: Wed Mar 16 04:58:07 2022 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-ppc/no-asm/include/openssl/bio.h b/deps/openssl/config/archs/linux-ppc/no-asm/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/linux-ppc/no-asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux-ppc/no-asm/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/linux-ppc/no-asm/include/openssl/crypto.h b/deps/openssl/config/archs/linux-ppc/no-asm/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/linux-ppc/no-asm/include/openssl/crypto.h +++ b/deps/openssl/config/archs/linux-ppc/no-asm/include/openssl/crypto.h @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/linux-ppc/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-ppc/no-asm/include/openssl/opensslv.h index 46afce5296f..ee2b0c90bf6 100644 --- a/deps/openssl/config/archs/linux-ppc/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-ppc/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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/linux-ppc/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux-ppc/no-asm/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/linux-ppc/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-ppc/no-asm/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/linux-ppc/no-asm/include/progs.h b/deps/openssl/config/archs/linux-ppc/no-asm/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/linux-ppc/no-asm/include/progs.h +++ b/deps/openssl/config/archs/linux-ppc/no-asm/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/linux-ppc64/asm/apps/progs.c b/deps/openssl/config/archs/linux-ppc64/asm/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/linux-ppc64/asm/apps/progs.c +++ b/deps/openssl/config/archs/linux-ppc64/asm/apps/progs.c @@ -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 diff --git a/deps/openssl/config/archs/linux-ppc64/asm/configdata.pm b/deps/openssl/config/archs/linux-ppc64/asm/configdata.pm index 56ca0446934..fe52d34c32d 100644 --- a/deps/openssl/config/archs/linux-ppc64/asm/configdata.pm +++ b/deps/openssl/config/archs/linux-ppc64/asm/configdata.pm @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,10 +207,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-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" => "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", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "14 Dec 2021", + "release_date" => "15 Mar 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux-ppc64", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3543,6 +3543,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" ], @@ -3642,6 +3645,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" ], @@ -5880,6 +5886,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" ], @@ -5979,6 +5988,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" ], @@ -7995,9 +8007,6 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -8015,7 +8024,10 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o" + "apps/lib/libtestutil-lib-opt.o", + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o" ], "products" => { "bin" => [ @@ -9732,10 +9744,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/libfips-lib-self_test_kats.o", + "providers/fips/fips-dso-fips_entry.o" ], "products" => { "dso" => [ @@ -12461,6 +12473,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" ], @@ -12560,6 +12575,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" ], @@ -14798,6 +14816,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" ], @@ -14897,6 +14918,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" ], @@ -16636,6 +16660,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", @@ -16669,6 +16694,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", @@ -19569,6 +19595,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", @@ -19602,6 +19629,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", @@ -27332,8 +27360,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); @@ -27360,7 +27388,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"; @@ -27377,8 +27405,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; _____ diff --git a/deps/openssl/config/archs/linux-ppc64/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-ppc64/asm/crypto/buildinf.h index d18b9357f7c..7ce40af9601 100644 --- a/deps/openssl/config/archs/linux-ppc64/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-ppc64/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-ppc64" -#define DATE "built on: Tue Dec 14 23:00:50 2021 UTC" +#define DATE "built on: Wed Mar 16 04:58:18 2022 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-ppc64/asm/include/openssl/bio.h b/deps/openssl/config/archs/linux-ppc64/asm/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/linux-ppc64/asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux-ppc64/asm/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/linux-ppc64/asm/include/openssl/crypto.h b/deps/openssl/config/archs/linux-ppc64/asm/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/linux-ppc64/asm/include/openssl/crypto.h +++ b/deps/openssl/config/archs/linux-ppc64/asm/include/openssl/crypto.h @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/linux-ppc64/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-ppc64/asm/include/openssl/opensslv.h index 46afce5296f..ee2b0c90bf6 100644 --- a/deps/openssl/config/archs/linux-ppc64/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-ppc64/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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/linux-ppc64/asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux-ppc64/asm/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/linux-ppc64/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-ppc64/asm/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/linux-ppc64/asm/include/progs.h b/deps/openssl/config/archs/linux-ppc64/asm/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/linux-ppc64/asm/include/progs.h +++ b/deps/openssl/config/archs/linux-ppc64/asm/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/linux-ppc64/asm_avx2/apps/progs.c b/deps/openssl/config/archs/linux-ppc64/asm_avx2/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/linux-ppc64/asm_avx2/apps/progs.c +++ b/deps/openssl/config/archs/linux-ppc64/asm_avx2/apps/progs.c @@ -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 diff --git a/deps/openssl/config/archs/linux-ppc64/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux-ppc64/asm_avx2/configdata.pm index f76e725e7b9..9fce6bb1b54 100644 --- a/deps/openssl/config/archs/linux-ppc64/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux-ppc64/asm_avx2/configdata.pm @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,10 +207,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-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" => "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", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "14 Dec 2021", + "release_date" => "15 Mar 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux-ppc64", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3543,6 +3543,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" ], @@ -3642,6 +3645,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" ], @@ -5880,6 +5886,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" ], @@ -5979,6 +5988,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" ], @@ -9732,10 +9744,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/libfips-lib-self_test_kats.o", + "providers/fips/fips-dso-fips_entry.o" ], "products" => { "dso" => [ @@ -12461,6 +12473,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" ], @@ -12560,6 +12575,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" ], @@ -14798,6 +14816,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" ], @@ -14897,6 +14918,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" ], @@ -16636,6 +16660,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", @@ -16669,6 +16694,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", @@ -19569,6 +19595,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", @@ -19602,6 +19629,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", @@ -27332,8 +27360,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); @@ -27360,7 +27388,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"; @@ -27377,8 +27405,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; _____ diff --git a/deps/openssl/config/archs/linux-ppc64/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux-ppc64/asm_avx2/crypto/buildinf.h index 6b1d5c73801..7a6e11f192a 100644 --- a/deps/openssl/config/archs/linux-ppc64/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-ppc64/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-ppc64" -#define DATE "built on: Tue Dec 14 23:01:11 2021 UTC" +#define DATE "built on: Wed Mar 16 04:58:31 2022 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-ppc64/asm_avx2/include/openssl/bio.h b/deps/openssl/config/archs/linux-ppc64/asm_avx2/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/linux-ppc64/asm_avx2/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux-ppc64/asm_avx2/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/linux-ppc64/asm_avx2/include/openssl/crypto.h b/deps/openssl/config/archs/linux-ppc64/asm_avx2/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/linux-ppc64/asm_avx2/include/openssl/crypto.h +++ b/deps/openssl/config/archs/linux-ppc64/asm_avx2/include/openssl/crypto.h @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/linux-ppc64/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-ppc64/asm_avx2/include/openssl/opensslv.h index 46afce5296f..ee2b0c90bf6 100644 --- a/deps/openssl/config/archs/linux-ppc64/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-ppc64/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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/linux-ppc64/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/linux-ppc64/asm_avx2/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/linux-ppc64/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-ppc64/asm_avx2/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/linux-ppc64/asm_avx2/include/progs.h b/deps/openssl/config/archs/linux-ppc64/asm_avx2/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/linux-ppc64/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/linux-ppc64/asm_avx2/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/linux-ppc64/no-asm/apps/progs.c b/deps/openssl/config/archs/linux-ppc64/no-asm/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/linux-ppc64/no-asm/apps/progs.c +++ b/deps/openssl/config/archs/linux-ppc64/no-asm/apps/progs.c @@ -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 diff --git a/deps/openssl/config/archs/linux-ppc64/no-asm/configdata.pm b/deps/openssl/config/archs/linux-ppc64/no-asm/configdata.pm index e23a8e6abb4..a3aef089fde 100644 --- a/deps/openssl/config/archs/linux-ppc64/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux-ppc64/no-asm/configdata.pm @@ -157,7 +157,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,10 +206,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "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", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "14 Dec 2021", + "release_date" => "15 Mar 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux-ppc64", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3509,6 +3509,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" ], @@ -3608,6 +3611,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" ], @@ -5846,6 +5852,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" ], @@ -5945,6 +5954,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" ], @@ -9655,10 +9667,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/libfips-lib-self_test_kats.o", + "providers/fips/fips-dso-fips_entry.o" ], "products" => { "dso" => [ @@ -12384,6 +12396,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" ], @@ -12483,6 +12498,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" ], @@ -14721,6 +14739,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" ], @@ -14820,6 +14841,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" ], @@ -16559,6 +16583,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", @@ -16592,6 +16617,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", @@ -19492,6 +19518,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", @@ -19525,6 +19552,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", @@ -27086,8 +27114,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); @@ -27114,7 +27142,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"; @@ -27131,8 +27159,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; _____ diff --git a/deps/openssl/config/archs/linux-ppc64/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-ppc64/no-asm/crypto/buildinf.h index 5a859519f0e..7dab9ba4129 100644 --- a/deps/openssl/config/archs/linux-ppc64/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-ppc64/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-ppc64" -#define DATE "built on: Tue Dec 14 23:01:30 2021 UTC" +#define DATE "built on: Wed Mar 16 04:58:44 2022 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-ppc64/no-asm/include/openssl/bio.h b/deps/openssl/config/archs/linux-ppc64/no-asm/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/linux-ppc64/no-asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux-ppc64/no-asm/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/linux-ppc64/no-asm/include/openssl/crypto.h b/deps/openssl/config/archs/linux-ppc64/no-asm/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/linux-ppc64/no-asm/include/openssl/crypto.h +++ b/deps/openssl/config/archs/linux-ppc64/no-asm/include/openssl/crypto.h @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/linux-ppc64/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-ppc64/no-asm/include/openssl/opensslv.h index 46afce5296f..ee2b0c90bf6 100644 --- a/deps/openssl/config/archs/linux-ppc64/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-ppc64/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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/linux-ppc64/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux-ppc64/no-asm/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/linux-ppc64/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-ppc64/no-asm/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/linux-ppc64/no-asm/include/progs.h b/deps/openssl/config/archs/linux-ppc64/no-asm/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/linux-ppc64/no-asm/include/progs.h +++ b/deps/openssl/config/archs/linux-ppc64/no-asm/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/apps/progs.c b/deps/openssl/config/archs/linux-ppc64le/asm/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm/apps/progs.c +++ b/deps/openssl/config/archs/linux-ppc64le/asm/apps/progs.c @@ -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 diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/configdata.pm b/deps/openssl/config/archs/linux-ppc64le/asm/configdata.pm index f5278a47c89..193f2339c59 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.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,10 +207,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-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" => "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", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "14 Dec 2021", + "release_date" => "15 Mar 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux-ppc64le", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3542,6 +3542,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" ], @@ -3641,6 +3644,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" ], @@ -5879,6 +5885,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" ], @@ -5978,6 +5987,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" ], @@ -7994,6 +8006,9 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -8011,10 +8026,7 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o", - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o" + "apps/lib/libtestutil-lib-opt.o" ], "products" => { "bin" => [ @@ -12460,6 +12472,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" ], @@ -12559,6 +12574,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" ], @@ -14797,6 +14815,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" ], @@ -14896,6 +14917,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" ], @@ -16635,6 +16659,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", @@ -16668,6 +16693,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", @@ -19568,6 +19594,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", @@ -19601,6 +19628,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", @@ -27331,8 +27359,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); @@ -27359,7 +27387,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"; @@ -27376,8 +27404,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; _____ 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 409a0616a43..d059b3619a4 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: Tue Dec 14 23:01:48 2021 UTC" +#define DATE "built on: Wed Mar 16 04:58:56 2022 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/bio.h b/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/crypto.h b/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/crypto.h +++ b/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/include/progs.h b/deps/openssl/config/archs/linux-ppc64le/asm/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm/include/progs.h +++ b/deps/openssl/config/archs/linux-ppc64le/asm/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/apps/progs.c b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/apps/progs.c +++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/apps/progs.c @@ -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 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 aa62bb3f298..e4dea7b62de 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.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,10 +207,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-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" => "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", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "14 Dec 2021", + "release_date" => "15 Mar 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux-ppc64le", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3542,6 +3542,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" ], @@ -3641,6 +3644,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" ], @@ -5879,6 +5885,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" ], @@ -5978,6 +5987,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" ], @@ -9731,10 +9743,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" => [ @@ -12460,6 +12472,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" ], @@ -12559,6 +12574,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" ], @@ -14797,6 +14815,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" ], @@ -14896,6 +14917,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" ], @@ -16635,6 +16659,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", @@ -16668,6 +16693,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", @@ -19568,6 +19594,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", @@ -19601,6 +19628,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", @@ -27331,8 +27359,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); @@ -27359,7 +27387,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"; @@ -27376,8 +27404,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; _____ 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 f493e7d28bc..a28e1a3cf2d 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: Tue Dec 14 23:02:08 2021 UTC" +#define DATE "built on: Wed Mar 16 04:59:09 2022 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/bio.h b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/crypto.h b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/crypto.h +++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/progs.h b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/linux-ppc64le/no-asm/apps/progs.c b/deps/openssl/config/archs/linux-ppc64le/no-asm/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/linux-ppc64le/no-asm/apps/progs.c +++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/apps/progs.c @@ -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 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 8c040c4abf1..550387361da 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.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,10 +206,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "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", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "14 Dec 2021", + "release_date" => "15 Mar 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux-ppc64le", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3508,6 +3508,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" ], @@ -3607,6 +3610,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" ], @@ -5845,6 +5851,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" ], @@ -5944,6 +5953,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" ], @@ -9654,10 +9666,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/libfips-lib-self_test_kats.o", + "providers/fips/fips-dso-fips_entry.o" ], "products" => { "dso" => [ @@ -12383,6 +12395,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" ], @@ -12482,6 +12497,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" ], @@ -14720,6 +14738,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" ], @@ -14819,6 +14840,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" ], @@ -16558,6 +16582,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", @@ -16591,6 +16616,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", @@ -19491,6 +19517,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", @@ -19524,6 +19551,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", @@ -27085,8 +27113,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); @@ -27113,7 +27141,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"; @@ -27130,8 +27158,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; _____ 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 752b17e9c25..41d49425504 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: Tue Dec 14 23:02:28 2021 UTC" +#define DATE "built on: Wed Mar 16 04:59:22 2022 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/bio.h b/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/crypto.h b/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/crypto.h +++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/linux-ppc64le/no-asm/include/progs.h b/deps/openssl/config/archs/linux-ppc64le/no-asm/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/linux-ppc64le/no-asm/include/progs.h +++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/linux-x86_64/asm/apps/progs.c b/deps/openssl/config/archs/linux-x86_64/asm/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/apps/progs.c +++ b/deps/openssl/config/archs/linux-x86_64/asm/apps/progs.c @@ -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 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 f2ac3836f23..f481973fa3e 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.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,10 +207,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-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" => "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", @@ -259,11 +259,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" => "linux-x86_64", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3568,6 +3568,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" ], @@ -3667,6 +3670,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" ], @@ -5905,6 +5911,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" ], @@ -6004,6 +6013,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" ], @@ -8020,9 +8032,6 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -8040,7 +8049,10 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o" + "apps/lib/libtestutil-lib-opt.o", + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o" ], "products" => { "bin" => [ @@ -9782,10 +9794,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/libfips-lib-self_test_kats.o", + "providers/fips/fips-dso-fips_entry.o" ], "products" => { "dso" => [ @@ -12511,6 +12523,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" ], @@ -12610,6 +12625,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" ], @@ -14848,6 +14866,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" ], @@ -14947,6 +14968,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" ], @@ -16686,6 +16710,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", @@ -16719,6 +16744,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", @@ -19619,6 +19645,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", @@ -19652,6 +19679,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", @@ -27438,8 +27466,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); @@ -27466,7 +27494,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"; @@ -27483,8 +27511,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; _____ 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 3ecd3f1107a..26f0e294c81 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: Tue Dec 14 22:58:41 2021 UTC" +#define DATE "built on: Wed Mar 16 04:56:55 2022 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/bio.h b/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/crypto.h b/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/crypto.h +++ b/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/linux-x86_64/asm/include/progs.h b/deps/openssl/config/archs/linux-x86_64/asm/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/include/progs.h +++ b/deps/openssl/config/archs/linux-x86_64/asm/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/apps/progs.c b/deps/openssl/config/archs/linux-x86_64/asm_avx2/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/apps/progs.c +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/apps/progs.c @@ -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 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 880e11637cc..a02a9b61e14 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.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,10 +207,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-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" => "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", @@ -259,11 +259,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" => "linux-x86_64", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3568,6 +3568,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" ], @@ -3667,6 +3670,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" ], @@ -5905,6 +5911,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" ], @@ -6004,6 +6013,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" ], @@ -8020,6 +8032,9 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -8037,10 +8052,7 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o", - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o" + "apps/lib/libtestutil-lib-opt.o" ], "products" => { "bin" => [ @@ -12511,6 +12523,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" ], @@ -12610,6 +12625,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" ], @@ -14848,6 +14866,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" ], @@ -14947,6 +14968,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" ], @@ -16686,6 +16710,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", @@ -16719,6 +16744,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", @@ -19619,6 +19645,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", @@ -19652,6 +19679,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", @@ -27438,8 +27466,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); @@ -27466,7 +27494,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"; @@ -27483,8 +27511,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; _____ 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 6a1ecafeabe..c9f660b8af3 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: Tue Dec 14 22:59:08 2021 UTC" +#define DATE "built on: Wed Mar 16 04:57:13 2022 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/bio.h b/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/crypto.h b/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/crypto.h +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/progs.h b/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/linux-x86_64/no-asm/apps/progs.c b/deps/openssl/config/archs/linux-x86_64/no-asm/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/linux-x86_64/no-asm/apps/progs.c +++ b/deps/openssl/config/archs/linux-x86_64/no-asm/apps/progs.c @@ -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 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 ea3962eb5b5..0a546d5c0d4 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.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,10 +206,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "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", @@ -259,11 +259,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" => "linux-x86_64", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3509,6 +3509,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" ], @@ -3608,6 +3611,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" ], @@ -5846,6 +5852,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" ], @@ -5945,6 +5954,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" ], @@ -9655,10 +9667,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" => [ @@ -12384,6 +12396,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" ], @@ -12483,6 +12498,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" ], @@ -14721,6 +14739,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" ], @@ -14820,6 +14841,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" ], @@ -16559,6 +16583,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", @@ -16592,6 +16617,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", @@ -19492,6 +19518,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", @@ -19525,6 +19552,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", @@ -27086,8 +27114,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); @@ -27114,7 +27142,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"; @@ -27131,8 +27159,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; _____ 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 b0f788150ad..e39a2a50837 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: Tue Dec 14 22:59:36 2021 UTC" +#define DATE "built on: Wed Mar 16 04:57:30 2022 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/bio.h b/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/crypto.h b/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/crypto.h +++ b/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/linux-x86_64/no-asm/include/progs.h b/deps/openssl/config/archs/linux-x86_64/no-asm/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/linux-x86_64/no-asm/include/progs.h +++ b/deps/openssl/config/archs/linux-x86_64/no-asm/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/linux32-s390x/asm/apps/progs.c b/deps/openssl/config/archs/linux32-s390x/asm/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/apps/progs.c +++ b/deps/openssl/config/archs/linux32-s390x/asm/apps/progs.c @@ -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 diff --git a/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm b/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm index 859dd791585..15a15f57141 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.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,10 +207,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-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" => "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", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "14 Dec 2021", + "release_date" => "15 Mar 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux32-s390x", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3549,6 +3549,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" ], @@ -3648,6 +3651,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" ], @@ -5886,6 +5892,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" ], @@ -5985,6 +5994,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" ], @@ -12442,6 +12454,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" ], @@ -12541,6 +12556,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" ], @@ -14779,6 +14797,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" ], @@ -14878,6 +14899,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" ], @@ -16617,6 +16641,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", @@ -16650,6 +16675,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", @@ -19604,6 +19630,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", @@ -19637,6 +19664,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", @@ -27267,8 +27295,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); @@ -27295,7 +27323,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"; @@ -27312,8 +27340,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; _____ 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 be5cba632d6..b6d4dceac06 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: Tue Dec 14 23:02:46 2021 UTC" +#define DATE "built on: Wed Mar 16 04:59:33 2022 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/bio.h b/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/crypto.h b/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/crypto.h +++ b/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/linux32-s390x/asm/include/progs.h b/deps/openssl/config/archs/linux32-s390x/asm/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/include/progs.h +++ b/deps/openssl/config/archs/linux32-s390x/asm/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/apps/progs.c b/deps/openssl/config/archs/linux32-s390x/asm_avx2/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/apps/progs.c +++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/apps/progs.c @@ -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 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 9adbb38a2fc..dae41542d5b 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.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,10 +207,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-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" => "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", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "14 Dec 2021", + "release_date" => "15 Mar 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux32-s390x", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3549,6 +3549,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" ], @@ -3648,6 +3651,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" ], @@ -5886,6 +5892,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" ], @@ -5985,6 +5994,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" ], @@ -8001,6 +8013,9 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -8018,10 +8033,7 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o", - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o" + "apps/lib/libtestutil-lib-opt.o" ], "products" => { "bin" => [ @@ -12442,6 +12454,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" ], @@ -12541,6 +12556,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" ], @@ -14779,6 +14797,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" ], @@ -14878,6 +14899,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" ], @@ -16617,6 +16641,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", @@ -16650,6 +16675,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", @@ -19604,6 +19630,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", @@ -19637,6 +19664,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", @@ -27267,8 +27295,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); @@ -27295,7 +27323,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"; @@ -27312,8 +27340,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; _____ 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 b4fac65d925..f2a662185f4 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: Tue Dec 14 23:03:06 2021 UTC" +#define DATE "built on: Wed Mar 16 04:59:46 2022 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/bio.h b/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/crypto.h b/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/crypto.h +++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/progs.h b/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/linux32-s390x/no-asm/apps/progs.c b/deps/openssl/config/archs/linux32-s390x/no-asm/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/linux32-s390x/no-asm/apps/progs.c +++ b/deps/openssl/config/archs/linux32-s390x/no-asm/apps/progs.c @@ -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 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 75d0a625f18..c76e01eeba4 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.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,10 +206,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "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", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "14 Dec 2021", + "release_date" => "15 Mar 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux32-s390x", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3508,6 +3508,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" ], @@ -3607,6 +3610,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" ], @@ -5845,6 +5851,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" ], @@ -5944,6 +5953,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" ], @@ -9654,10 +9666,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" => [ @@ -12383,6 +12395,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" ], @@ -12482,6 +12497,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" ], @@ -14720,6 +14738,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" ], @@ -14819,6 +14840,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" ], @@ -16558,6 +16582,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", @@ -16591,6 +16616,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", @@ -19491,6 +19517,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", @@ -19524,6 +19551,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", @@ -27085,8 +27113,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); @@ -27113,7 +27141,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"; @@ -27130,8 +27158,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; _____ 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 a3144ccfb08..c392d8b8ea3 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: Tue Dec 14 23:03:25 2021 UTC" +#define DATE "built on: Wed Mar 16 04:59:59 2022 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/bio.h b/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/crypto.h b/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/crypto.h +++ b/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/linux32-s390x/no-asm/include/progs.h b/deps/openssl/config/archs/linux32-s390x/no-asm/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/linux32-s390x/no-asm/include/progs.h +++ b/deps/openssl/config/archs/linux32-s390x/no-asm/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/linux64-mips64/asm/apps/progs.c b/deps/openssl/config/archs/linux64-mips64/asm/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm/apps/progs.c +++ b/deps/openssl/config/archs/linux64-mips64/asm/apps/progs.c @@ -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 diff --git a/deps/openssl/config/archs/linux64-mips64/asm/configdata.pm b/deps/openssl/config/archs/linux64-mips64/asm/configdata.pm index 3a3794d8004..0f649d0f33f 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm/configdata.pm +++ b/deps/openssl/config/archs/linux64-mips64/asm/configdata.pm @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,10 +207,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-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" => "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", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "14 Dec 2021", + "release_date" => "15 Mar 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux64-mips64", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3530,6 +3530,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" ], @@ -3629,6 +3632,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" ], @@ -5867,6 +5873,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" ], @@ -5966,6 +5975,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" ], @@ -12415,6 +12427,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" ], @@ -12514,6 +12529,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" ], @@ -14752,6 +14770,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" ], @@ -14851,6 +14872,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" ], @@ -16590,6 +16614,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", @@ -16623,6 +16648,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", @@ -19568,6 +19594,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", @@ -19601,6 +19628,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", @@ -27199,8 +27227,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); @@ -27227,7 +27255,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"; @@ -27244,8 +27272,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; _____ 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 cdc99a9124b..118c8e7adc1 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: Tue Dec 14 23:04:41 2021 UTC" +#define DATE "built on: Wed Mar 16 05:00:48 2022 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/bio.h b/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/crypto.h b/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/crypto.h +++ b/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/linux64-mips64/asm/include/progs.h b/deps/openssl/config/archs/linux64-mips64/asm/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm/include/progs.h +++ b/deps/openssl/config/archs/linux64-mips64/asm/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/apps/progs.c b/deps/openssl/config/archs/linux64-mips64/asm_avx2/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/apps/progs.c +++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/apps/progs.c @@ -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 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 0ce49dd5698..2f909dc21e4 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/configdata.pm @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,10 +207,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-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" => "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", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "14 Dec 2021", + "release_date" => "15 Mar 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux64-mips64", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3530,6 +3530,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" ], @@ -3629,6 +3632,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" ], @@ -5867,6 +5873,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" ], @@ -5966,6 +5975,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" ], @@ -7982,9 +7994,6 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -8002,7 +8011,10 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o" + "apps/lib/libtestutil-lib-opt.o", + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o" ], "products" => { "bin" => [ @@ -12415,6 +12427,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" ], @@ -12514,6 +12529,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" ], @@ -14752,6 +14770,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" ], @@ -14851,6 +14872,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" ], @@ -16590,6 +16614,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", @@ -16623,6 +16648,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", @@ -19568,6 +19594,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", @@ -19601,6 +19628,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", @@ -27199,8 +27227,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); @@ -27227,7 +27255,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"; @@ -27244,8 +27272,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; _____ 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 4ab5d5da597..2d9d5456ad7 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: Tue Dec 14 23:04:59 2021 UTC" +#define DATE "built on: Wed Mar 16 05:01:00 2022 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/bio.h b/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/crypto.h b/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/crypto.h +++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/progs.h b/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/linux64-mips64/no-asm/apps/progs.c b/deps/openssl/config/archs/linux64-mips64/no-asm/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/linux64-mips64/no-asm/apps/progs.c +++ b/deps/openssl/config/archs/linux64-mips64/no-asm/apps/progs.c @@ -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 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 17b3316d862..31482741071 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.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,10 +206,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "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", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "14 Dec 2021", + "release_date" => "15 Mar 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux64-mips64", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3509,6 +3509,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" ], @@ -3608,6 +3611,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" ], @@ -5846,6 +5852,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" ], @@ -5945,6 +5954,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" ], @@ -7961,9 +7973,6 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -7981,7 +7990,10 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o" + "apps/lib/libtestutil-lib-opt.o", + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o" ], "products" => { "bin" => [ @@ -9655,10 +9667,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/libfips-lib-self_test_kats.o", + "providers/fips/fips-dso-fips_entry.o" ], "products" => { "dso" => [ @@ -12384,6 +12396,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" ], @@ -12483,6 +12498,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" ], @@ -14721,6 +14739,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" ], @@ -14820,6 +14841,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" ], @@ -16559,6 +16583,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", @@ -16592,6 +16617,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", @@ -19492,6 +19518,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", @@ -19525,6 +19552,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", @@ -27086,8 +27114,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); @@ -27114,7 +27142,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"; @@ -27131,8 +27159,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; _____ 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 daf88189ad5..ed4edf3ce12 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: Tue Dec 14 23:05:17 2021 UTC" +#define DATE "built on: Wed Mar 16 05:01:12 2022 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/bio.h b/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/crypto.h b/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/crypto.h +++ b/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/linux64-mips64/no-asm/include/progs.h b/deps/openssl/config/archs/linux64-mips64/no-asm/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/linux64-mips64/no-asm/include/progs.h +++ b/deps/openssl/config/archs/linux64-mips64/no-asm/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/linux64-riscv64/no-asm/apps/progs.c b/deps/openssl/config/archs/linux64-riscv64/no-asm/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/linux64-riscv64/no-asm/apps/progs.c +++ b/deps/openssl/config/archs/linux64-riscv64/no-asm/apps/progs.c @@ -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 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 4c0718cf01a..ab44c95e7bd 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.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,10 +206,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "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", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "14 Dec 2021", + "release_date" => "15 Mar 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux64-riscv64", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3507,6 +3507,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" ], @@ -3606,6 +3609,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" ], @@ -5844,6 +5850,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" ], @@ -5943,6 +5952,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" ], @@ -12382,6 +12394,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" ], @@ -12481,6 +12496,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" ], @@ -14719,6 +14737,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" ], @@ -14818,6 +14839,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" ], @@ -16557,6 +16581,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", @@ -16590,6 +16615,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", @@ -19490,6 +19516,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", @@ -19523,6 +19550,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", @@ -27084,8 +27112,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); @@ -27112,7 +27140,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"; @@ -27129,8 +27157,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; _____ 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 2f6c7424fa1..5bb168f0e35 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: Tue Dec 14 23:10:07 2021 UTC" +#define DATE "built on: Wed Mar 16 05:04:17 2022 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/bio.h b/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/crypto.h b/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/crypto.h +++ b/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/linux64-riscv64/no-asm/include/progs.h b/deps/openssl/config/archs/linux64-riscv64/no-asm/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/linux64-riscv64/no-asm/include/progs.h +++ b/deps/openssl/config/archs/linux64-riscv64/no-asm/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/linux64-s390x/asm/apps/progs.c b/deps/openssl/config/archs/linux64-s390x/asm/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/apps/progs.c +++ b/deps/openssl/config/archs/linux64-s390x/asm/apps/progs.c @@ -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 diff --git a/deps/openssl/config/archs/linux64-s390x/asm/configdata.pm b/deps/openssl/config/archs/linux64-s390x/asm/configdata.pm index a866f4f1924..87b704b5f93 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.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,10 +207,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-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" => "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", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "14 Dec 2021", + "release_date" => "15 Mar 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux64-s390x", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3550,6 +3550,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" ], @@ -3649,6 +3652,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" ], @@ -5887,6 +5893,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" ], @@ -5986,6 +5995,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" ], @@ -12454,6 +12466,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" ], @@ -12553,6 +12568,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" ], @@ -14791,6 +14809,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" ], @@ -14890,6 +14911,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" ], @@ -16629,6 +16653,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", @@ -16662,6 +16687,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", @@ -19616,6 +19642,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", @@ -19649,6 +19676,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", @@ -27279,8 +27307,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); @@ -27307,7 +27335,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"; @@ -27324,8 +27352,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; _____ 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 e80bab31ac9..b698dcd69c4 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: Tue Dec 14 23:03:43 2021 UTC" +#define DATE "built on: Wed Mar 16 05:00:11 2022 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/bio.h b/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/crypto.h b/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/crypto.h +++ b/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/linux64-s390x/asm/include/progs.h b/deps/openssl/config/archs/linux64-s390x/asm/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/include/progs.h +++ b/deps/openssl/config/archs/linux64-s390x/asm/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/apps/progs.c b/deps/openssl/config/archs/linux64-s390x/asm_avx2/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/apps/progs.c +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/apps/progs.c @@ -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 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 ecc92ca1025..78acf8a3fca 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.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,10 +207,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-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" => "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", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "14 Dec 2021", + "release_date" => "15 Mar 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux64-s390x", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3550,6 +3550,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" ], @@ -3649,6 +3652,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" ], @@ -5887,6 +5893,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" ], @@ -5986,6 +5995,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" ], @@ -9725,10 +9737,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/libfips-lib-self_test_kats.o", + "providers/fips/fips-dso-fips_entry.o" ], "products" => { "dso" => [ @@ -12454,6 +12466,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" ], @@ -12553,6 +12568,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" ], @@ -14791,6 +14809,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" ], @@ -14890,6 +14911,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" ], @@ -16629,6 +16653,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", @@ -16662,6 +16687,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", @@ -19616,6 +19642,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", @@ -19649,6 +19676,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", @@ -27279,8 +27307,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); @@ -27307,7 +27335,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"; @@ -27324,8 +27352,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; _____ 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 2d6f8e87492..5e7e8bcd521 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: Tue Dec 14 23:04:03 2021 UTC" +#define DATE "built on: Wed Mar 16 05:00:24 2022 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/bio.h b/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/crypto.h b/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/crypto.h +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/progs.h b/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/linux64-s390x/no-asm/apps/progs.c b/deps/openssl/config/archs/linux64-s390x/no-asm/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/linux64-s390x/no-asm/apps/progs.c +++ b/deps/openssl/config/archs/linux64-s390x/no-asm/apps/progs.c @@ -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 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 d6454785041..6a7a5cd1d33 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.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,10 +206,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "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", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "14 Dec 2021", + "release_date" => "15 Mar 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux64-s390x", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3509,6 +3509,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" ], @@ -3608,6 +3611,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" ], @@ -5846,6 +5852,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" ], @@ -5945,6 +5954,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" ], @@ -7961,6 +7973,9 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -7978,10 +7993,7 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o", - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o" + "apps/lib/libtestutil-lib-opt.o" ], "products" => { "bin" => [ @@ -9655,10 +9667,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" => [ @@ -12384,6 +12396,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" ], @@ -12483,6 +12498,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" ], @@ -14721,6 +14739,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" ], @@ -14820,6 +14841,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" ], @@ -16559,6 +16583,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", @@ -16592,6 +16617,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", @@ -19492,6 +19518,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", @@ -19525,6 +19552,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", @@ -27086,8 +27114,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); @@ -27114,7 +27142,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"; @@ -27131,8 +27159,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; _____ 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 2474d27098a..4db684b0c5f 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: Tue Dec 14 23:04:23 2021 UTC" +#define DATE "built on: Wed Mar 16 05:00:36 2022 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/bio.h b/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/crypto.h b/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/crypto.h +++ b/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/linux64-s390x/no-asm/include/progs.h b/deps/openssl/config/archs/linux64-s390x/no-asm/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/linux64-s390x/no-asm/include/progs.h +++ b/deps/openssl/config/archs/linux64-s390x/no-asm/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/apps/progs.c b/deps/openssl/config/archs/solaris-x86-gcc/asm/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/apps/progs.c +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/apps/progs.c @@ -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 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 9801c085eb3..b228be71637 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.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -204,10 +204,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-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" => "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", @@ -256,11 +256,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" => "solaris-x86-gcc", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3557,6 +3557,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" ], @@ -3656,6 +3659,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" ], @@ -5894,6 +5900,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" ], @@ -5993,6 +6002,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" ], @@ -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" ], @@ -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" ], @@ -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" ], @@ -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" ], @@ -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", @@ -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", @@ -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", @@ -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", @@ -27261,8 +27289,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); @@ -27289,7 +27317,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"; @@ -27306,8 +27334,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; _____ 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 6064952d7b3..5a695313903 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: Tue Dec 14 23:05:35 2021 UTC" +#define DATE "built on: Wed Mar 16 05:01:23 2022 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/bio.h b/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/crypto.h b/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/crypto.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/ssl.h b/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/include/progs.h b/deps/openssl/config/archs/solaris-x86-gcc/asm/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/include/progs.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/apps/progs.c b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/apps/progs.c +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/apps/progs.c @@ -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 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 4745df358ef..05cc7261058 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.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -204,10 +204,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-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" => "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", @@ -256,11 +256,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" => "solaris-x86-gcc", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3557,6 +3557,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" ], @@ -3656,6 +3659,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" ], @@ -5894,6 +5900,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" ], @@ -5993,6 +6002,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" ], @@ -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" ], @@ -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" ], @@ -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" ], @@ -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" ], @@ -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", @@ -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", @@ -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", @@ -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", @@ -27261,8 +27289,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); @@ -27289,7 +27317,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"; @@ -27306,8 +27334,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; _____ 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 523c4e23d9e..d99427b2e52 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: Tue Dec 14 23:05:55 2021 UTC" +#define DATE "built on: Wed Mar 16 05:01:37 2022 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/bio.h b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/bio.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/crypto.h b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/crypto.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/progs.h b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/apps/progs.c b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/apps/progs.c +++ b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/apps/progs.c @@ -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 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 aef644deaae..a819a1dc48e 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.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -203,10 +203,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "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", @@ -256,11 +256,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" => "solaris-x86-gcc", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3500,6 +3500,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" ], @@ -3599,6 +3602,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" ], @@ -5837,6 +5843,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" ], @@ -5936,6 +5945,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" ], @@ -12375,6 +12387,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" ], @@ -12474,6 +12489,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" ], @@ -14712,6 +14730,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" ], @@ -14811,6 +14832,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" ], @@ -16550,6 +16574,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", @@ -16583,6 +16608,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", @@ -19483,6 +19509,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", @@ -19516,6 +19543,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", @@ -27077,8 +27105,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); @@ -27105,7 +27133,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"; @@ -27122,8 +27150,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; _____ 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 bcab8ebdd7c..48a38aa4273 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: Tue Dec 14 23:06:16 2021 UTC" +#define DATE "built on: Wed Mar 16 05:01:51 2022 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/bio.h b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/crypto.h b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/crypto.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/progs.h b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/progs.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/apps/progs.c b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/apps/progs.c +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/apps/progs.c @@ -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 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 96ee1c24f81..432cc1a8cf2 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.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -204,10 +204,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-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" => "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", @@ -256,11 +256,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" => "solaris64-x86_64-gcc", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3560,6 +3560,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" ], @@ -3659,6 +3662,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" ], @@ -5897,6 +5903,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" ], @@ -5996,6 +6005,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" ], @@ -8012,6 +8024,9 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -8029,10 +8044,7 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o", - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o" + "apps/lib/libtestutil-lib-opt.o" ], "products" => { "bin" => [ @@ -12503,6 +12515,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" ], @@ -12602,6 +12617,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" ], @@ -14840,6 +14858,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" ], @@ -14939,6 +14960,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" ], @@ -16678,6 +16702,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", @@ -16711,6 +16736,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", @@ -19611,6 +19637,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", @@ -19644,6 +19671,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", @@ -27430,8 +27458,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); @@ -27458,7 +27486,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"; @@ -27475,8 +27503,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; _____ 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 57dfc8f08c5..3f1ca7d4b04 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: Tue Dec 14 23:06:34 2021 UTC" +#define DATE "built on: Wed Mar 16 05:02:02 2022 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/bio.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/crypto.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/crypto.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/ssl.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/progs.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/progs.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/apps/progs.c b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/apps/progs.c +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/apps/progs.c @@ -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 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 37692787c2e..bcc1c8c566a 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.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -204,10 +204,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-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" => "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", @@ -256,11 +256,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" => "solaris64-x86_64-gcc", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3560,6 +3560,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" ], @@ -3659,6 +3662,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" ], @@ -5897,6 +5903,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" ], @@ -5996,6 +6005,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" ], @@ -8012,9 +8024,6 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -8032,7 +8041,10 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o" + "apps/lib/libtestutil-lib-opt.o", + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o" ], "products" => { "bin" => [ @@ -12503,6 +12515,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" ], @@ -12602,6 +12617,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" ], @@ -14840,6 +14858,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" ], @@ -14939,6 +14960,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" ], @@ -16678,6 +16702,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", @@ -16711,6 +16736,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", @@ -19611,6 +19637,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", @@ -19644,6 +19671,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", @@ -27430,8 +27458,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); @@ -27458,7 +27486,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"; @@ -27475,8 +27503,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; _____ 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 98624292ad4..0defcf11a7c 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: Tue Dec 14 23:07:01 2021 UTC" +#define DATE "built on: Wed Mar 16 05:02:20 2022 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/bio.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/bio.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/crypto.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/crypto.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/progs.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/progs.h @@ -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 diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/apps/progs.c b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/apps/progs.c index a27be4f6397..f594c302c42 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/apps/progs.c +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/apps/progs.c @@ -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 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 a21dd87a084..d22d10b7a63 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.1+quic", + "full_version" => "3.0.2+quic", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -203,10 +203,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "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", @@ -256,11 +256,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" => "solaris64-x86_64-gcc", - "version" => "3.0.1" + "version" => "3.0.2" ); our %target = ( "AR" => "ar", @@ -3501,6 +3501,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" ], @@ -3600,6 +3603,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" ], @@ -5838,6 +5844,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" ], @@ -5937,6 +5946,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" ], @@ -12376,6 +12388,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" ], @@ -12475,6 +12490,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" ], @@ -14713,6 +14731,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" ], @@ -14812,6 +14833,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" ], @@ -16551,6 +16575,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", @@ -16584,6 +16609,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", @@ -19484,6 +19510,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", @@ -19517,6 +19544,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", @@ -27078,8 +27106,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); @@ -27106,7 +27134,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"; @@ -27123,8 +27151,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; _____ 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 249f0f7a323..c0f36a59db7 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: Tue Dec 14 23:07:28 2021 UTC" +#define DATE "built on: Wed Mar 16 05:02:37 2022 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/bio.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/bio.h index 29cd1512e1c..c348adae7a3 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/bio.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/bio.h @@ -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 @@ -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; diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/crypto.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/crypto.h index baf6938c7a7..00d2496c158 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/crypto.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/crypto.h @@ -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 @@ -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); 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 46afce5296f..ee2b0c90bf6 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 1 +# define OPENSSL_VERSION_PATCH 2 /* * 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.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 diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/ssl.h index 5999436eb5c..92aba6debb6 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/ssl.h @@ -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. * @@ -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 @@ -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); diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/progs.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/progs.h index 4e2d5cc35ea..07bb763afb1 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/progs.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/progs.h @@ -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 diff --git a/deps/openssl/config/asn1_asm.h b/deps/openssl/config/asn1_asm.h index 4d368244658..b60bb86cc9a 100644 --- a/deps/openssl/config/asn1_asm.h +++ b/deps/openssl/config/asn1_asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/asm/include/openssl/asn1.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/asm/include/openssl/asn1.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/asm/include/openssl/asn1.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/asn1_no-asm.h b/deps/openssl/config/asn1_no-asm.h index 24781238627..7e520876f1c 100644 --- a/deps/openssl/config/asn1_no-asm.h +++ b/deps/openssl/config/asn1_no-asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/no-asm/include/openssl/asn1.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/no-asm/include/openssl/asn1.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/no-asm/include/openssl/asn1.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/asn1t_asm.h b/deps/openssl/config/asn1t_asm.h index fbd767cb5b3..0d3e3bdc8f7 100644 --- a/deps/openssl/config/asn1t_asm.h +++ b/deps/openssl/config/asn1t_asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/asm/include/openssl/asn1t.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/asm/include/openssl/asn1t.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/asm/include/openssl/asn1t.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/asn1t_no-asm.h b/deps/openssl/config/asn1t_no-asm.h index 67c1791e3ca..d471b656a61 100644 --- a/deps/openssl/config/asn1t_no-asm.h +++ b/deps/openssl/config/asn1t_no-asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/no-asm/include/openssl/asn1t.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/no-asm/include/openssl/asn1t.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/no-asm/include/openssl/asn1t.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/bio_asm.h b/deps/openssl/config/bio_asm.h index 202e9eb2238..19b4764b1b3 100644 --- a/deps/openssl/config/bio_asm.h +++ b/deps/openssl/config/bio_asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/asm/include/openssl/bio.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/asm/include/openssl/bio.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/asm/include/openssl/bio.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/bio_no-asm.h b/deps/openssl/config/bio_no-asm.h index 9328869800f..7df408acc36 100644 --- a/deps/openssl/config/bio_no-asm.h +++ b/deps/openssl/config/bio_no-asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/no-asm/include/openssl/bio.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/no-asm/include/openssl/bio.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/no-asm/include/openssl/bio.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/bn_conf_asm.h b/deps/openssl/config/bn_conf_asm.h index f7a3cda1c73..85ecbacf3aa 100644 --- a/deps/openssl/config/bn_conf_asm.h +++ b/deps/openssl/config/bn_conf_asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/asm/include/crypto/bn_conf.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/asm/include/crypto/bn_conf.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/asm/include/crypto/bn_conf.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/bn_conf_no-asm.h b/deps/openssl/config/bn_conf_no-asm.h index 038b8db3633..06ab3d268cf 100644 --- a/deps/openssl/config/bn_conf_no-asm.h +++ b/deps/openssl/config/bn_conf_no-asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/no-asm/include/crypto/bn_conf.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/no-asm/include/crypto/bn_conf.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/no-asm/include/crypto/bn_conf.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/cmp_asm.h b/deps/openssl/config/cmp_asm.h index 160d3caae5d..e78ec14eb93 100644 --- a/deps/openssl/config/cmp_asm.h +++ b/deps/openssl/config/cmp_asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/asm/include/openssl/cmp.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/asm/include/openssl/cmp.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/asm/include/openssl/cmp.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/cmp_no-asm.h b/deps/openssl/config/cmp_no-asm.h index 1221649ef2c..2dd84b8deb0 100644 --- a/deps/openssl/config/cmp_no-asm.h +++ b/deps/openssl/config/cmp_no-asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/no-asm/include/openssl/cmp.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/no-asm/include/openssl/cmp.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/no-asm/include/openssl/cmp.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/cms_asm.h b/deps/openssl/config/cms_asm.h index 886b77ad5b4..8a23ad50090 100644 --- a/deps/openssl/config/cms_asm.h +++ b/deps/openssl/config/cms_asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/asm/include/openssl/cms.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/asm/include/openssl/cms.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/asm/include/openssl/cms.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/cms_no-asm.h b/deps/openssl/config/cms_no-asm.h index ac89ec8a4af..2507391663c 100644 --- a/deps/openssl/config/cms_no-asm.h +++ b/deps/openssl/config/cms_no-asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/no-asm/include/openssl/cms.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/no-asm/include/openssl/cms.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/no-asm/include/openssl/cms.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/conf_asm.h b/deps/openssl/config/conf_asm.h index 60a4d475b5e..1e85a17fd48 100644 --- a/deps/openssl/config/conf_asm.h +++ b/deps/openssl/config/conf_asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/asm/include/openssl/conf.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/asm/include/openssl/conf.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/asm/include/openssl/conf.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/conf_no-asm.h b/deps/openssl/config/conf_no-asm.h index 0bf0c97e623..483d49164b8 100644 --- a/deps/openssl/config/conf_no-asm.h +++ b/deps/openssl/config/conf_no-asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/no-asm/include/openssl/conf.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/no-asm/include/openssl/conf.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/no-asm/include/openssl/conf.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/configuration_asm.h b/deps/openssl/config/configuration_asm.h index badc4dabde8..dcc0a495a0a 100644 --- a/deps/openssl/config/configuration_asm.h +++ b/deps/openssl/config/configuration_asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/asm/include/openssl/configuration.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/asm/include/openssl/configuration.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/asm/include/openssl/configuration.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/configuration_no-asm.h b/deps/openssl/config/configuration_no-asm.h index ab505499247..0dc73e9e17f 100644 --- a/deps/openssl/config/configuration_no-asm.h +++ b/deps/openssl/config/configuration_no-asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/no-asm/include/openssl/configuration.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/no-asm/include/openssl/configuration.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/no-asm/include/openssl/configuration.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/crmf_asm.h b/deps/openssl/config/crmf_asm.h index 1378bd7988e..d98627f9ed9 100644 --- a/deps/openssl/config/crmf_asm.h +++ b/deps/openssl/config/crmf_asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/asm/include/openssl/crmf.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/asm/include/openssl/crmf.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/asm/include/openssl/crmf.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/crmf_no-asm.h b/deps/openssl/config/crmf_no-asm.h index 0a14cc86bb9..681a0719f42 100644 --- a/deps/openssl/config/crmf_no-asm.h +++ b/deps/openssl/config/crmf_no-asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/no-asm/include/openssl/crmf.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/no-asm/include/openssl/crmf.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/no-asm/include/openssl/crmf.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/crypto_asm.h b/deps/openssl/config/crypto_asm.h index 23643c9661f..337bd5f4ab0 100644 --- a/deps/openssl/config/crypto_asm.h +++ b/deps/openssl/config/crypto_asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/asm/include/openssl/crypto.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/asm/include/openssl/crypto.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/asm/include/openssl/crypto.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/crypto_no-asm.h b/deps/openssl/config/crypto_no-asm.h index 9b63cb3b0a1..72b2463a7bc 100644 --- a/deps/openssl/config/crypto_no-asm.h +++ b/deps/openssl/config/crypto_no-asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/no-asm/include/openssl/crypto.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/no-asm/include/openssl/crypto.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/no-asm/include/openssl/crypto.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/ct_asm.h b/deps/openssl/config/ct_asm.h index 01484b070e6..a5c5f33f326 100644 --- a/deps/openssl/config/ct_asm.h +++ b/deps/openssl/config/ct_asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/asm/include/openssl/ct.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/asm/include/openssl/ct.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/asm/include/openssl/ct.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/ct_no-asm.h b/deps/openssl/config/ct_no-asm.h index f4b0d8da49f..7260a895255 100644 --- a/deps/openssl/config/ct_no-asm.h +++ b/deps/openssl/config/ct_no-asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/no-asm/include/openssl/ct.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/no-asm/include/openssl/ct.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/no-asm/include/openssl/ct.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/dso_conf_asm.h b/deps/openssl/config/dso_conf_asm.h index 2406f4244a4..1c28bc1a65e 100644 --- a/deps/openssl/config/dso_conf_asm.h +++ b/deps/openssl/config/dso_conf_asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/asm/include/crypto/dso_conf.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/asm/include/crypto/dso_conf.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/asm/include/crypto/dso_conf.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/dso_conf_no-asm.h b/deps/openssl/config/dso_conf_no-asm.h index b14f3b6cf48..60c20cfdd2c 100644 --- a/deps/openssl/config/dso_conf_no-asm.h +++ b/deps/openssl/config/dso_conf_no-asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/no-asm/include/crypto/dso_conf.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/no-asm/include/crypto/dso_conf.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/no-asm/include/crypto/dso_conf.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/err_asm.h b/deps/openssl/config/err_asm.h index d03d4603d63..f5fbff643da 100644 --- a/deps/openssl/config/err_asm.h +++ b/deps/openssl/config/err_asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/asm/include/openssl/err.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/asm/include/openssl/err.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/asm/include/openssl/err.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/err_no-asm.h b/deps/openssl/config/err_no-asm.h index ea4ef7a0567..8138911eb07 100644 --- a/deps/openssl/config/err_no-asm.h +++ b/deps/openssl/config/err_no-asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/no-asm/include/openssl/err.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/no-asm/include/openssl/err.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/no-asm/include/openssl/err.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/ess_asm.h b/deps/openssl/config/ess_asm.h index 02f973e02d0..87716f58e32 100644 --- a/deps/openssl/config/ess_asm.h +++ b/deps/openssl/config/ess_asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/asm/include/openssl/ess.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/asm/include/openssl/ess.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/asm/include/openssl/ess.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/ess_no-asm.h b/deps/openssl/config/ess_no-asm.h index e906bafe8d0..a602e74f35f 100644 --- a/deps/openssl/config/ess_no-asm.h +++ b/deps/openssl/config/ess_no-asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/no-asm/include/openssl/ess.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/no-asm/include/openssl/ess.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/no-asm/include/openssl/ess.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/fipskey_asm.h b/deps/openssl/config/fipskey_asm.h index 9e4ddbd4955..09a60b9fd5c 100644 --- a/deps/openssl/config/fipskey_asm.h +++ b/deps/openssl/config/fipskey_asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/asm/include/openssl/fipskey.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/asm/include/openssl/fipskey.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/asm/include/openssl/fipskey.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/fipskey_no-asm.h b/deps/openssl/config/fipskey_no-asm.h index a760a02ba35..90abf594ccb 100644 --- a/deps/openssl/config/fipskey_no-asm.h +++ b/deps/openssl/config/fipskey_no-asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/no-asm/include/openssl/fipskey.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/no-asm/include/openssl/fipskey.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/no-asm/include/openssl/fipskey.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/lhash_asm.h b/deps/openssl/config/lhash_asm.h index 13025550437..03f9196efc3 100644 --- a/deps/openssl/config/lhash_asm.h +++ b/deps/openssl/config/lhash_asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/asm/include/openssl/lhash.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/asm/include/openssl/lhash.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/asm/include/openssl/lhash.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/lhash_no-asm.h b/deps/openssl/config/lhash_no-asm.h index 62953f76298..e77ddda7921 100644 --- a/deps/openssl/config/lhash_no-asm.h +++ b/deps/openssl/config/lhash_no-asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/no-asm/include/openssl/lhash.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/no-asm/include/openssl/lhash.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/no-asm/include/openssl/lhash.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/ocsp_asm.h b/deps/openssl/config/ocsp_asm.h index 4483fff2a42..1792d165b24 100644 --- a/deps/openssl/config/ocsp_asm.h +++ b/deps/openssl/config/ocsp_asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/asm/include/openssl/ocsp.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/asm/include/openssl/ocsp.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/asm/include/openssl/ocsp.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/ocsp_no-asm.h b/deps/openssl/config/ocsp_no-asm.h index 0bf55945219..c58549acf6c 100644 --- a/deps/openssl/config/ocsp_no-asm.h +++ b/deps/openssl/config/ocsp_no-asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/no-asm/include/openssl/ocsp.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/no-asm/include/openssl/ocsp.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/no-asm/include/openssl/ocsp.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/opensslv_asm.h b/deps/openssl/config/opensslv_asm.h index 29879561cb9..399352386df 100644 --- a/deps/openssl/config/opensslv_asm.h +++ b/deps/openssl/config/opensslv_asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/asm/include/openssl/opensslv.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/asm/include/openssl/opensslv.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/asm/include/openssl/opensslv.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/opensslv_no-asm.h b/deps/openssl/config/opensslv_no-asm.h index dee43fec483..3b8947a20da 100644 --- a/deps/openssl/config/opensslv_no-asm.h +++ b/deps/openssl/config/opensslv_no-asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/no-asm/include/openssl/opensslv.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/no-asm/include/openssl/opensslv.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/no-asm/include/openssl/opensslv.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/pkcs12_asm.h b/deps/openssl/config/pkcs12_asm.h index 54ad973bc2f..cdc424fc989 100644 --- a/deps/openssl/config/pkcs12_asm.h +++ b/deps/openssl/config/pkcs12_asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/asm/include/openssl/pkcs12.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/asm/include/openssl/pkcs12.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/asm/include/openssl/pkcs12.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/pkcs12_no-asm.h b/deps/openssl/config/pkcs12_no-asm.h index 359e4fb91cf..de7267319aa 100644 --- a/deps/openssl/config/pkcs12_no-asm.h +++ b/deps/openssl/config/pkcs12_no-asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/no-asm/include/openssl/pkcs12.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/no-asm/include/openssl/pkcs12.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/no-asm/include/openssl/pkcs12.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/pkcs7_asm.h b/deps/openssl/config/pkcs7_asm.h index b31241b99cd..691ae4f7753 100644 --- a/deps/openssl/config/pkcs7_asm.h +++ b/deps/openssl/config/pkcs7_asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/asm/include/openssl/pkcs7.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/asm/include/openssl/pkcs7.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/asm/include/openssl/pkcs7.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/pkcs7_no-asm.h b/deps/openssl/config/pkcs7_no-asm.h index 1f4cc511c9f..d86ceeecc93 100644 --- a/deps/openssl/config/pkcs7_no-asm.h +++ b/deps/openssl/config/pkcs7_no-asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/no-asm/include/openssl/pkcs7.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/no-asm/include/openssl/pkcs7.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/no-asm/include/openssl/pkcs7.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/safestack_asm.h b/deps/openssl/config/safestack_asm.h index dea445272c0..14567c7faaf 100644 --- a/deps/openssl/config/safestack_asm.h +++ b/deps/openssl/config/safestack_asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/asm/include/openssl/safestack.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/asm/include/openssl/safestack.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/asm/include/openssl/safestack.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/safestack_no-asm.h b/deps/openssl/config/safestack_no-asm.h index eb13776bffc..bd6e56db508 100644 --- a/deps/openssl/config/safestack_no-asm.h +++ b/deps/openssl/config/safestack_no-asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/no-asm/include/openssl/safestack.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/no-asm/include/openssl/safestack.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/no-asm/include/openssl/safestack.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/srp_asm.h b/deps/openssl/config/srp_asm.h index 2d7aa655573..a4f7946e0a2 100644 --- a/deps/openssl/config/srp_asm.h +++ b/deps/openssl/config/srp_asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/asm/include/openssl/srp.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/asm/include/openssl/srp.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/asm/include/openssl/srp.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/srp_no-asm.h b/deps/openssl/config/srp_no-asm.h index ffb42b9294f..0b7288041d5 100644 --- a/deps/openssl/config/srp_no-asm.h +++ b/deps/openssl/config/srp_no-asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/no-asm/include/openssl/srp.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/no-asm/include/openssl/srp.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/no-asm/include/openssl/srp.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/ssl_asm.h b/deps/openssl/config/ssl_asm.h index 2fb2e122d18..b634f4560cb 100644 --- a/deps/openssl/config/ssl_asm.h +++ b/deps/openssl/config/ssl_asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/asm/include/openssl/ssl.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/asm/include/openssl/ssl.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/asm/include/openssl/ssl.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/ssl_no-asm.h b/deps/openssl/config/ssl_no-asm.h index c64d4370cb2..c5919a5b202 100644 --- a/deps/openssl/config/ssl_no-asm.h +++ b/deps/openssl/config/ssl_no-asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/no-asm/include/openssl/ssl.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/no-asm/include/openssl/ssl.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/no-asm/include/openssl/ssl.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/ui_asm.h b/deps/openssl/config/ui_asm.h index 14b609002c4..887b308871c 100644 --- a/deps/openssl/config/ui_asm.h +++ b/deps/openssl/config/ui_asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/asm/include/openssl/ui.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/asm/include/openssl/ui.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/asm/include/openssl/ui.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/ui_no-asm.h b/deps/openssl/config/ui_no-asm.h index fd248b2b05e..8470484983f 100644 --- a/deps/openssl/config/ui_no-asm.h +++ b/deps/openssl/config/ui_no-asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/no-asm/include/openssl/ui.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/no-asm/include/openssl/ui.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/no-asm/include/openssl/ui.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/x509_asm.h b/deps/openssl/config/x509_asm.h index 2f5d611d465..45d6659c266 100644 --- a/deps/openssl/config/x509_asm.h +++ b/deps/openssl/config/x509_asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/asm/include/openssl/x509.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/asm/include/openssl/x509.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/asm/include/openssl/x509.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/x509_no-asm.h b/deps/openssl/config/x509_no-asm.h index 155f2993b38..5b8644d6466 100644 --- a/deps/openssl/config/x509_no-asm.h +++ b/deps/openssl/config/x509_no-asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/no-asm/include/openssl/x509.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/no-asm/include/openssl/x509.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/no-asm/include/openssl/x509.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/x509_vfy_asm.h b/deps/openssl/config/x509_vfy_asm.h index 7358b595023..34214226f04 100644 --- a/deps/openssl/config/x509_vfy_asm.h +++ b/deps/openssl/config/x509_vfy_asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/asm/include/openssl/x509_vfy.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/asm/include/openssl/x509_vfy.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/asm/include/openssl/x509_vfy.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/x509_vfy_no-asm.h b/deps/openssl/config/x509_vfy_no-asm.h index 7c742506238..8ec020a7f4b 100644 --- a/deps/openssl/config/x509_vfy_no-asm.h +++ b/deps/openssl/config/x509_vfy_no-asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/no-asm/include/openssl/x509_vfy.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/no-asm/include/openssl/x509_vfy.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/no-asm/include/openssl/x509_vfy.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/x509v3_asm.h b/deps/openssl/config/x509v3_asm.h index 40102307760..936ab62d7b7 100644 --- a/deps/openssl/config/x509v3_asm.h +++ b/deps/openssl/config/x509v3_asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/asm/include/openssl/x509v3.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/asm/include/openssl/x509v3.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/asm/include/openssl/x509v3.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) diff --git a/deps/openssl/config/x509v3_no-asm.h b/deps/openssl/config/x509v3_no-asm.h index ce9001ac203..2941402eac4 100644 --- a/deps/openssl/config/x509v3_no-asm.h +++ b/deps/openssl/config/x509v3_no-asm.h @@ -5,6 +5,8 @@ #if defined(OPENSSL_LINUX) && defined(__i386__) # include "./archs/linux-elf/no-asm/include/openssl/x509v3.h" +#elif defined(OPENSSL_LINUX) && defined(__ILP32__) +# include "./archs/linux-x32/no-asm/include/openssl/x509v3.h" #elif defined(OPENSSL_LINUX) && defined(__x86_64__) # include "./archs/linux-x86_64/no-asm/include/openssl/x509v3.h" #elif defined(OPENSSL_LINUX) && defined(__arm__) 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 00000000000..79400c6472a --- /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 00000000000..e7f2afa9872 --- /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 00000000000..cd9fc7cc706 --- /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 00000000000..6ff4f574949 --- /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 00000000000..dcece3cb4d6 --- /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 00000000000..7c8a6dc96fc --- /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 00000000000..33a00775c9f --- /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 00000000000..2712886cafc --- /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 00000000000..8ffad996047 --- /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 00000000000..4103852ecb2 --- /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 00000000000..6d0e701ebd3 --- /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 00000000000..7ebb8438713 --- /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 00000000000..bf482070474 --- /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 00000000000..64cc0162251 --- /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 00000000000..c012013d98d --- /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 00000000000..8d824f5cfe6 --- /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 00000000000..5b13afedf36 --- /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 00000000000..078cfba40fb --- /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 00000000000..2d7e2c08e99 --- /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 00000000000..b553f9d0f05 --- /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 00000000000..989eafb3302 --- /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 00000000000..9df42dad4c3 --- /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 00000000000..eb74ca98a97 --- /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 00000000000..f5edb766b4f --- /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 00000000000..ed28bd68cb2 --- /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 00000000000..9270a3ee097 --- /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 00000000000..5629ae9a3a9 --- /dev/null +++ b/deps/openssl/openssl/include/openssl/x509v3.h @@ -0,0 +1 @@ +#include "../../../config/x509v3.h" |