diff options
author | RafaelGSS <rafael.nunu@hotmail.com> | 2022-05-09 20:46:56 +0300 |
---|---|---|
committer | Beth Griggs <bgriggs@redhat.com> | 2022-05-16 13:12:13 +0300 |
commit | 8e54c19a6e25a97db8aebc1cb3136fff6195e807 (patch) | |
tree | 7047b8b3c554bf2d61035efae5ceb379e4cd5946 /deps/openssl/config/archs/BSD-x86/no-asm | |
parent | 6365bf808ef310494127f558bcb3949c1d6cf56d (diff) |
deps: update archs files for quictls/openssl-3.0.3+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/43022
Refs: https://mta.openssl.org/pipermail/openssl-announce/2022-May/000223.html
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Beth Griggs <bgriggs@redhat.com>
Diffstat (limited to 'deps/openssl/config/archs/BSD-x86/no-asm')
6 files changed, 84 insertions, 22 deletions
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 aa96089f673..8392d10f174 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.2+quic", + "full_version" => "3.0.3+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" => "2", - "perl_archname" => "x86_64-linux-thread-multi", + "patch" => "3", + "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.1", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -255,11 +255,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "15 Mar 2022", + "release_date" => "3 May 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "BSD-x86", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "ar", @@ -1244,6 +1244,9 @@ our %unified_info = ( "test/evp_libctx_test" => { "noinst" => "1" }, + "test/evp_pkey_ctx_new_from_name" => { + "noinst" => "1" + }, "test/evp_pkey_dparams_test" => { "noinst" => "1" }, @@ -1289,6 +1292,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2833,6 +2839,9 @@ our %unified_info = ( "doc/html/man3/OPENSSL_secure_malloc.html" => [ "doc/man3/OPENSSL_secure_malloc.pod" ], + "doc/html/man3/OPENSSL_strcasecmp.html" => [ + "doc/man3/OPENSSL_strcasecmp.pod" + ], "doc/html/man3/OSSL_CMP_CTX_new.html" => [ "doc/man3/OSSL_CMP_CTX_new.pod" ], @@ -5176,6 +5185,9 @@ our %unified_info = ( "doc/man/man3/OPENSSL_secure_malloc.3" => [ "doc/man3/OPENSSL_secure_malloc.pod" ], + "doc/man/man3/OPENSSL_strcasecmp.3" => [ + "doc/man3/OPENSSL_strcasecmp.pod" + ], "doc/man/man3/OSSL_CMP_CTX_new.3" => [ "doc/man3/OSSL_CMP_CTX_new.pod" ], @@ -7556,6 +7568,9 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/evp_pkey_ctx_new_from_name" => [ + "libcrypto" + ], "test/evp_pkey_dparams_test" => [ "libcrypto", "test/libtestutil.a" @@ -7620,6 +7635,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -10401,7 +10420,7 @@ our %unified_info = ( "crypto/chacha/chacha-c64xplus.S" => [ "crypto/chacha/asm/chacha-c64xplus.pl" ], - "crypto/chacha/chacha-ia64.S" => [ + "crypto/chacha/chacha-ia64.s" => [ "crypto/chacha/asm/chacha-ia64.pl" ], "crypto/chacha/chacha-ppc.s" => [ @@ -11721,6 +11740,9 @@ our %unified_info = ( "doc/html/man3/OPENSSL_secure_malloc.html" => [ "doc/man3/OPENSSL_secure_malloc.pod" ], + "doc/html/man3/OPENSSL_strcasecmp.html" => [ + "doc/man3/OPENSSL_strcasecmp.pod" + ], "doc/html/man3/OSSL_CMP_CTX_new.html" => [ "doc/man3/OSSL_CMP_CTX_new.pod" ], @@ -14064,6 +14086,9 @@ our %unified_info = ( "doc/man/man3/OPENSSL_secure_malloc.3" => [ "doc/man3/OPENSSL_secure_malloc.pod" ], + "doc/man/man3/OPENSSL_strcasecmp.3" => [ + "doc/man3/OPENSSL_strcasecmp.pod" + ], "doc/man/man3/OSSL_CMP_CTX_new.3" => [ "doc/man3/OSSL_CMP_CTX_new.pod" ], @@ -16352,6 +16377,7 @@ our %unified_info = ( "doc/html/man3/OPENSSL_malloc.html", "doc/html/man3/OPENSSL_s390xcap.html", "doc/html/man3/OPENSSL_secure_malloc.html", + "doc/html/man3/OPENSSL_strcasecmp.html", "doc/html/man3/OSSL_CMP_CTX_new.html", "doc/html/man3/OSSL_CMP_HDR_get0_transactionID.html", "doc/html/man3/OSSL_CMP_ITAV_set0.html", @@ -18417,6 +18443,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/evp_pkey_ctx_new_from_name" => [ + "include", + "apps/include" + ], "test/evp_pkey_dparams_test" => [ "include", "apps/include" @@ -18604,6 +18634,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19287,6 +19321,7 @@ our %unified_info = ( "doc/man/man3/OPENSSL_malloc.3", "doc/man/man3/OPENSSL_s390xcap.3", "doc/man/man3/OPENSSL_secure_malloc.3", + "doc/man/man3/OPENSSL_strcasecmp.3", "doc/man/man3/OSSL_CMP_CTX_new.3", "doc/man/man3/OSSL_CMP_HDR_get0_transactionID.3", "doc/man/man3/OSSL_CMP_ITAV_set0.3", @@ -19909,6 +19944,7 @@ our %unified_info = ( "test/evp_fetch_prov_test", "test/evp_kdf_test", "test/evp_libctx_test", + "test/evp_pkey_ctx_new_from_name", "test/evp_pkey_dparams_test", "test/evp_pkey_provided_test", "test/evp_test", @@ -19924,6 +19960,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26202,6 +26239,12 @@ our %unified_info = ( "test/evp_libctx_test-bin-evp_libctx_test.o" => [ "test/evp_libctx_test.c" ], + "test/evp_pkey_ctx_new_from_name" => [ + "test/evp_pkey_ctx_new_from_name-bin-evp_pkey_ctx_new_from_name.o" + ], + "test/evp_pkey_ctx_new_from_name-bin-evp_pkey_ctx_new_from_name.o" => [ + "test/evp_pkey_ctx_new_from_name.c" + ], "test/evp_pkey_dparams_test" => [ "test/evp_pkey_dparams_test-bin-evp_pkey_dparams_test.o" ], @@ -26391,6 +26434,12 @@ our %unified_info = ( "test/testutil/libtestutil-lib-tests.o", "test/testutil/libtestutil-lib-testutil_init.o" ], + "test/localetest" => [ + "test/localetest-bin-localetest.o" + ], + "test/localetest-bin-localetest.o" => [ + "test/localetest.c" + ], "test/mdc2_internal_test" => [ "test/mdc2_internal_test-bin-mdc2_internal_test.o" ], @@ -27106,8 +27155,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/rafaelgss/repos/os/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27134,7 +27183,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; + use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27151,8 +27200,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; +use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/util/perl'; +use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ 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 1c6b5c4d64e..5a28197731b 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: Thu May 5 17:01:20 2022 UTC" +#define DATE "built on: Mon May 9 17:36:16 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/crypto.h b/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/crypto.h index 00d2496c158..3f40be6d8c6 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 @@ -132,6 +132,8 @@ int OPENSSL_hexstr2buf_ex(unsigned char *buf, size_t buf_n, size_t *buflen, const char *str, const char sep); unsigned char *OPENSSL_hexstr2buf(const char *str, long *buflen); int OPENSSL_hexchar2int(unsigned char c); +int OPENSSL_strcasecmp(const char *s1, const char *s2); +int OPENSSL_strncasecmp(const char *s1, const char *s2, size_t n); # define OPENSSL_MALLOC_MAX_NELEMS(type) (((1U<<(sizeof(int)*8-1))-1)/sizeof(type)) 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 ee2b0c90bf6..1b853bc9537 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 2 +# define OPENSSL_VERSION_PATCH 3 /* * 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.2" -# define OPENSSL_FULL_VERSION_STR "3.0.2+quic" +# define OPENSSL_VERSION_STR "3.0.3" +# define OPENSSL_FULL_VERSION_STR "3.0.3+quic" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "15 Mar 2022" +# define OPENSSL_RELEASE_DATE "3 May 2022" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.2+quic 15 Mar 2022" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.3+quic 3 May 2022" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE 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 92aba6debb6..0f1915755ae 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 @@ -1381,6 +1381,8 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION) # define SSL_CTRL_GET_TMP_KEY 133 # define SSL_CTRL_GET_NEGOTIATED_GROUP 134 # define SSL_CTRL_SET_RETRY_VERIFY 136 +# define SSL_CTRL_GET_VERIFY_CERT_STORE 137 +# define SSL_CTRL_GET_CHAIN_CERT_STORE 138 # define SSL_CERT_SET_FIRST 1 # define SSL_CERT_SET_NEXT 2 # define SSL_CERT_SET_SERVER 3 @@ -1442,10 +1444,14 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION) SSL_CTX_ctrl(ctx,SSL_CTRL_SET_VERIFY_CERT_STORE,0,(char *)(st)) # define SSL_CTX_set1_verify_cert_store(ctx,st) \ SSL_CTX_ctrl(ctx,SSL_CTRL_SET_VERIFY_CERT_STORE,1,(char *)(st)) +# define SSL_CTX_get0_verify_cert_store(ctx,st) \ + SSL_CTX_ctrl(ctx,SSL_CTRL_GET_VERIFY_CERT_STORE,0,(char *)(st)) # define SSL_CTX_set0_chain_cert_store(ctx,st) \ SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CHAIN_CERT_STORE,0,(char *)(st)) # define SSL_CTX_set1_chain_cert_store(ctx,st) \ SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CHAIN_CERT_STORE,1,(char *)(st)) +# define SSL_CTX_get0_chain_cert_store(ctx,st) \ + SSL_CTX_ctrl(ctx,SSL_CTRL_GET_CHAIN_CERT_STORE,0,(char *)(st)) # define SSL_set0_chain(s,sk) \ SSL_ctrl(s,SSL_CTRL_CHAIN,0,(char *)(sk)) # define SSL_set1_chain(s,sk) \ @@ -1468,10 +1474,15 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION) SSL_ctrl(s,SSL_CTRL_SET_VERIFY_CERT_STORE,0,(char *)(st)) # define SSL_set1_verify_cert_store(s,st) \ SSL_ctrl(s,SSL_CTRL_SET_VERIFY_CERT_STORE,1,(char *)(st)) +#define SSL_get0_verify_cert_store(s,st) \ + SSL_ctrl(s,SSL_CTRL_GET_VERIFY_CERT_STORE,0,(char *)(st)) # define SSL_set0_chain_cert_store(s,st) \ SSL_ctrl(s,SSL_CTRL_SET_CHAIN_CERT_STORE,0,(char *)(st)) # define SSL_set1_chain_cert_store(s,st) \ SSL_ctrl(s,SSL_CTRL_SET_CHAIN_CERT_STORE,1,(char *)(st)) +#define SSL_get0_chain_cert_store(s,st) \ + SSL_ctrl(s,SSL_CTRL_GET_CHAIN_CERT_STORE,0,(char *)(st)) + # define SSL_get1_groups(s, glist) \ SSL_ctrl(s,SSL_CTRL_GET_GROUPS,0,(int*)(glist)) # define SSL_CTX_set1_groups(ctx, glist, glistlen) \ diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/x509.h b/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/x509.h index 9f195a3d847..1f7755e5b69 100644 --- a/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/x509.h +++ b/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/x509.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/x509.h.in * - * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved * * Licensed under the Apache License 2.0 (the "License"). You may not use @@ -552,11 +552,11 @@ int X509_NAME_digest(const X509_NAME *data, const EVP_MD *type, X509 *X509_load_http(const char *url, BIO *bio, BIO *rbio, int timeout); X509_CRL *X509_CRL_load_http(const char *url, BIO *bio, BIO *rbio, int timeout); # ifndef OPENSSL_NO_DEPRECATED_3_0 -# include <openssl/ocsp.h> /* OCSP_REQ_CTX_nbio_d2i */ +# include <openssl/http.h> /* OSSL_HTTP_REQ_CTX_nbio_d2i */ # define X509_http_nbio(rctx, pcert) \ - OCSP_REQ_CTX_nbio_d2i(rctx, pcert, ASN1_ITEM_rptr(X509)) + OSSL_HTTP_REQ_CTX_nbio_d2i(rctx, pcert, ASN1_ITEM_rptr(X509)) # define X509_CRL_http_nbio(rctx, pcrl) \ - OCSP_REQ_CTX_nbio_d2i(rctx, pcrl, ASN1_ITEM_rptr(X509_CRL)) + OSSL_HTTP_REQ_CTX_nbio_d2i(rctx, pcrl, ASN1_ITEM_rptr(X509_CRL)) # endif # ifndef OPENSSL_NO_STDIO |