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/openssl/config/archs/BSD-x86/asm | |
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/openssl/config/archs/BSD-x86/asm')
8 files changed, 57 insertions, 24 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 |