From 8e54c19a6e25a97db8aebc1cb3136fff6195e807 Mon Sep 17 00:00:00 2001 From: RafaelGSS Date: Mon, 9 May 2022 14:46:56 -0300 Subject: [PATCH] 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 Reviewed-By: Beth Griggs --- .../config/archs/BSD-x86/asm/configdata.pm | 73 +++++++++++++--- .../archs/BSD-x86/asm/crypto/buildinf.h | 2 +- .../BSD-x86/asm/include/openssl/crypto.h | 2 + .../BSD-x86/asm/include/openssl/opensslv.h | 10 +-- .../archs/BSD-x86/asm/include/openssl/ssl.h | 11 +++ .../archs/BSD-x86/asm/include/openssl/x509.h | 8 +- .../archs/BSD-x86/asm_avx2/configdata.pm | 81 +++++++++++++---- .../archs/BSD-x86/asm_avx2/crypto/buildinf.h | 2 +- .../BSD-x86/asm_avx2/include/openssl/crypto.h | 2 + .../asm_avx2/include/openssl/opensslv.h | 10 +-- .../BSD-x86/asm_avx2/include/openssl/ssl.h | 11 +++ .../BSD-x86/asm_avx2/include/openssl/x509.h | 8 +- .../config/archs/BSD-x86/no-asm/configdata.pm | 73 +++++++++++++--- .../archs/BSD-x86/no-asm/crypto/buildinf.h | 2 +- .../BSD-x86/no-asm/include/openssl/crypto.h | 2 + .../BSD-x86/no-asm/include/openssl/opensslv.h | 10 +-- .../BSD-x86/no-asm/include/openssl/ssl.h | 11 +++ .../BSD-x86/no-asm/include/openssl/x509.h | 8 +- .../config/archs/BSD-x86_64/asm/configdata.pm | 77 +++++++++++++--- .../archs/BSD-x86_64/asm/crypto/buildinf.h | 2 +- .../BSD-x86_64/asm/include/openssl/crypto.h | 2 + .../BSD-x86_64/asm/include/openssl/opensslv.h | 10 +-- .../BSD-x86_64/asm/include/openssl/ssl.h | 11 +++ .../BSD-x86_64/asm/include/openssl/x509.h | 8 +- .../archs/BSD-x86_64/asm_avx2/configdata.pm | 73 +++++++++++++--- .../BSD-x86_64/asm_avx2/crypto/buildinf.h | 2 +- .../asm_avx2/include/openssl/crypto.h | 2 + .../asm_avx2/include/openssl/opensslv.h | 10 +-- .../BSD-x86_64/asm_avx2/include/openssl/ssl.h | 11 +++ .../asm_avx2/include/openssl/x509.h | 8 +- .../archs/BSD-x86_64/no-asm/configdata.pm | 85 ++++++++++++++---- .../archs/BSD-x86_64/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/crypto.h | 2 + .../no-asm/include/openssl/opensslv.h | 10 +-- .../BSD-x86_64/no-asm/include/openssl/ssl.h | 11 +++ .../BSD-x86_64/no-asm/include/openssl/x509.h | 8 +- .../config/archs/VC-WIN32/asm/configdata.pm | 87 +++++++++++++++---- .../archs/VC-WIN32/asm/crypto/buildinf.h | 2 +- .../VC-WIN32/asm/include/openssl/crypto.h | 2 + .../VC-WIN32/asm/include/openssl/opensslv.h | 10 +-- .../archs/VC-WIN32/asm/include/openssl/ssl.h | 11 +++ .../archs/VC-WIN32/asm/include/openssl/x509.h | 8 +- .../archs/VC-WIN32/asm_avx2/configdata.pm | 75 +++++++++++++--- .../archs/VC-WIN32/asm_avx2/crypto/buildinf.h | 2 +- .../asm_avx2/include/openssl/crypto.h | 2 + .../asm_avx2/include/openssl/opensslv.h | 10 +-- .../VC-WIN32/asm_avx2/include/openssl/ssl.h | 11 +++ .../VC-WIN32/asm_avx2/include/openssl/x509.h | 8 +- .../archs/VC-WIN32/no-asm/configdata.pm | 87 +++++++++++++++---- .../archs/VC-WIN32/no-asm/crypto/buildinf.h | 2 +- .../VC-WIN32/no-asm/include/openssl/crypto.h | 2 + .../no-asm/include/openssl/opensslv.h | 10 +-- .../VC-WIN32/no-asm/include/openssl/ssl.h | 11 +++ .../VC-WIN32/no-asm/include/openssl/x509.h | 8 +- .../archs/VC-WIN64-ARM/no-asm/configdata.pm | 83 ++++++++++++++---- .../VC-WIN64-ARM/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/crypto.h | 2 + .../no-asm/include/openssl/opensslv.h | 10 +-- .../VC-WIN64-ARM/no-asm/include/openssl/ssl.h | 11 +++ .../no-asm/include/openssl/x509.h | 8 +- .../config/archs/VC-WIN64A/asm/configdata.pm | 87 +++++++++++++++---- .../archs/VC-WIN64A/asm/crypto/buildinf.h | 2 +- .../VC-WIN64A/asm/include/openssl/crypto.h | 2 + .../VC-WIN64A/asm/include/openssl/opensslv.h | 10 +-- .../archs/VC-WIN64A/asm/include/openssl/ssl.h | 11 +++ .../VC-WIN64A/asm/include/openssl/x509.h | 8 +- .../archs/VC-WIN64A/asm_avx2/configdata.pm | 87 +++++++++++++++---- .../VC-WIN64A/asm_avx2/crypto/buildinf.h | 2 +- .../asm_avx2/include/openssl/crypto.h | 2 + .../asm_avx2/include/openssl/opensslv.h | 10 +-- .../VC-WIN64A/asm_avx2/include/openssl/ssl.h | 11 +++ .../VC-WIN64A/asm_avx2/include/openssl/x509.h | 8 +- .../archs/VC-WIN64A/no-asm/configdata.pm | 83 ++++++++++++++---- .../archs/VC-WIN64A/no-asm/crypto/buildinf.h | 2 +- .../VC-WIN64A/no-asm/include/openssl/crypto.h | 2 + .../no-asm/include/openssl/opensslv.h | 10 +-- .../VC-WIN64A/no-asm/include/openssl/ssl.h | 11 +++ .../VC-WIN64A/no-asm/include/openssl/x509.h | 8 +- .../archs/aix64-gcc-as/asm/configdata.pm | 73 +++++++++++++--- .../archs/aix64-gcc-as/asm/crypto/buildinf.h | 2 +- .../aix64-gcc-as/asm/include/openssl/crypto.h | 2 + .../asm/include/openssl/opensslv.h | 10 +-- .../aix64-gcc-as/asm/include/openssl/ssl.h | 11 +++ .../aix64-gcc-as/asm/include/openssl/x509.h | 8 +- .../archs/aix64-gcc-as/asm_avx2/configdata.pm | 81 +++++++++++++---- .../aix64-gcc-as/asm_avx2/crypto/buildinf.h | 2 +- .../asm_avx2/include/openssl/crypto.h | 2 + .../asm_avx2/include/openssl/opensslv.h | 10 +-- .../asm_avx2/include/openssl/ssl.h | 11 +++ .../asm_avx2/include/openssl/x509.h | 8 +- .../archs/aix64-gcc-as/no-asm/configdata.pm | 77 +++++++++++++--- .../aix64-gcc-as/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/crypto.h | 2 + .../no-asm/include/openssl/opensslv.h | 10 +-- .../aix64-gcc-as/no-asm/include/openssl/ssl.h | 11 +++ .../no-asm/include/openssl/x509.h | 8 +- .../archs/darwin-i386-cc/asm/configdata.pm | 85 ++++++++++++++---- .../darwin-i386-cc/asm/crypto/buildinf.h | 2 +- .../asm/include/openssl/crypto.h | 2 + .../asm/include/openssl/opensslv.h | 10 +-- .../darwin-i386-cc/asm/include/openssl/ssl.h | 11 +++ .../darwin-i386-cc/asm/include/openssl/x509.h | 8 +- .../darwin-i386-cc/asm_avx2/configdata.pm | 85 ++++++++++++++---- .../darwin-i386-cc/asm_avx2/crypto/buildinf.h | 2 +- .../asm_avx2/include/openssl/crypto.h | 2 + .../asm_avx2/include/openssl/opensslv.h | 10 +-- .../asm_avx2/include/openssl/ssl.h | 11 +++ .../asm_avx2/include/openssl/x509.h | 8 +- .../archs/darwin-i386-cc/no-asm/configdata.pm | 73 +++++++++++++--- .../darwin-i386-cc/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/crypto.h | 2 + .../no-asm/include/openssl/opensslv.h | 10 +-- .../no-asm/include/openssl/ssl.h | 11 +++ .../no-asm/include/openssl/x509.h | 8 +- .../archs/darwin64-arm64-cc/asm/configdata.pm | 81 +++++++++++++---- .../darwin64-arm64-cc/asm/crypto/buildinf.h | 2 +- .../asm/include/openssl/crypto.h | 2 + .../asm/include/openssl/opensslv.h | 10 +-- .../asm/include/openssl/ssl.h | 11 +++ .../asm/include/openssl/x509.h | 8 +- .../darwin64-arm64-cc/asm_avx2/configdata.pm | 73 +++++++++++++--- .../asm_avx2/crypto/buildinf.h | 2 +- .../asm_avx2/include/openssl/crypto.h | 2 + .../asm_avx2/include/openssl/opensslv.h | 10 +-- .../asm_avx2/include/openssl/ssl.h | 11 +++ .../asm_avx2/include/openssl/x509.h | 8 +- .../darwin64-arm64-cc/no-asm/configdata.pm | 85 ++++++++++++++---- .../no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/crypto.h | 2 + .../no-asm/include/openssl/opensslv.h | 10 +-- .../no-asm/include/openssl/ssl.h | 11 +++ .../no-asm/include/openssl/x509.h | 8 +- .../darwin64-x86_64-cc/asm/configdata.pm | 77 +++++++++++++--- .../darwin64-x86_64-cc/asm/crypto/buildinf.h | 2 +- .../asm/include/openssl/crypto.h | 2 + .../asm/include/openssl/opensslv.h | 10 +-- .../asm/include/openssl/ssl.h | 11 +++ .../asm/include/openssl/x509.h | 8 +- .../darwin64-x86_64-cc/asm_avx2/configdata.pm | 85 ++++++++++++++---- .../asm_avx2/crypto/buildinf.h | 2 +- .../asm_avx2/include/openssl/crypto.h | 2 + .../asm_avx2/include/openssl/opensslv.h | 10 +-- .../asm_avx2/include/openssl/ssl.h | 11 +++ .../asm_avx2/include/openssl/x509.h | 8 +- .../darwin64-x86_64-cc/no-asm/configdata.pm | 81 +++++++++++++---- .../no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/crypto.h | 2 + .../no-asm/include/openssl/opensslv.h | 10 +-- .../no-asm/include/openssl/ssl.h | 11 +++ .../no-asm/include/openssl/x509.h | 8 +- .../archs/linux-aarch64/asm/configdata.pm | 73 +++++++++++++--- .../archs/linux-aarch64/asm/crypto/buildinf.h | 2 +- .../asm/include/openssl/crypto.h | 2 + .../asm/include/openssl/opensslv.h | 10 +-- .../linux-aarch64/asm/include/openssl/ssl.h | 11 +++ .../linux-aarch64/asm/include/openssl/x509.h | 8 +- .../linux-aarch64/asm_avx2/configdata.pm | 85 ++++++++++++++---- .../linux-aarch64/asm_avx2/crypto/buildinf.h | 2 +- .../asm_avx2/include/openssl/crypto.h | 2 + .../asm_avx2/include/openssl/opensslv.h | 10 +-- .../asm_avx2/include/openssl/ssl.h | 11 +++ .../asm_avx2/include/openssl/x509.h | 8 +- .../archs/linux-aarch64/no-asm/configdata.pm | 85 ++++++++++++++---- .../linux-aarch64/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/crypto.h | 2 + .../no-asm/include/openssl/opensslv.h | 10 +-- .../no-asm/include/openssl/ssl.h | 11 +++ .../no-asm/include/openssl/x509.h | 8 +- .../archs/linux-armv4/asm/configdata.pm | 77 +++++++++++++--- .../archs/linux-armv4/asm/crypto/buildinf.h | 2 +- .../linux-armv4/asm/include/openssl/crypto.h | 2 + .../asm/include/openssl/opensslv.h | 10 +-- .../linux-armv4/asm/include/openssl/ssl.h | 11 +++ .../linux-armv4/asm/include/openssl/x509.h | 8 +- .../archs/linux-armv4/asm_avx2/configdata.pm | 81 +++++++++++++---- .../linux-armv4/asm_avx2/crypto/buildinf.h | 2 +- .../asm_avx2/include/openssl/crypto.h | 2 + .../asm_avx2/include/openssl/opensslv.h | 10 +-- .../asm_avx2/include/openssl/ssl.h | 11 +++ .../asm_avx2/include/openssl/x509.h | 8 +- .../archs/linux-armv4/no-asm/configdata.pm | 73 +++++++++++++--- .../linux-armv4/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/crypto.h | 2 + .../no-asm/include/openssl/opensslv.h | 10 +-- .../linux-armv4/no-asm/include/openssl/ssl.h | 11 +++ .../linux-armv4/no-asm/include/openssl/x509.h | 8 +- .../config/archs/linux-elf/asm/configdata.pm | 81 +++++++++++++---- .../archs/linux-elf/asm/crypto/buildinf.h | 2 +- .../linux-elf/asm/include/openssl/crypto.h | 2 + .../linux-elf/asm/include/openssl/opensslv.h | 10 +-- .../archs/linux-elf/asm/include/openssl/ssl.h | 11 +++ .../linux-elf/asm/include/openssl/x509.h | 8 +- .../archs/linux-elf/asm_avx2/configdata.pm | 73 +++++++++++++--- .../linux-elf/asm_avx2/crypto/buildinf.h | 2 +- .../asm_avx2/include/openssl/crypto.h | 2 + .../asm_avx2/include/openssl/opensslv.h | 10 +-- .../linux-elf/asm_avx2/include/openssl/ssl.h | 11 +++ .../linux-elf/asm_avx2/include/openssl/x509.h | 8 +- .../archs/linux-elf/no-asm/configdata.pm | 73 +++++++++++++--- .../archs/linux-elf/no-asm/crypto/buildinf.h | 2 +- .../linux-elf/no-asm/include/openssl/crypto.h | 2 + .../no-asm/include/openssl/opensslv.h | 10 +-- .../linux-elf/no-asm/include/openssl/ssl.h | 11 +++ .../linux-elf/no-asm/include/openssl/x509.h | 8 +- .../archs/linux-ppc64le/asm/configdata.pm | 81 +++++++++++++---- .../archs/linux-ppc64le/asm/crypto/buildinf.h | 2 +- .../asm/include/openssl/crypto.h | 2 + .../asm/include/openssl/opensslv.h | 10 +-- .../linux-ppc64le/asm/include/openssl/ssl.h | 11 +++ .../linux-ppc64le/asm/include/openssl/x509.h | 8 +- .../linux-ppc64le/asm_avx2/configdata.pm | 85 ++++++++++++++---- .../linux-ppc64le/asm_avx2/crypto/buildinf.h | 2 +- .../asm_avx2/include/openssl/crypto.h | 2 + .../asm_avx2/include/openssl/opensslv.h | 10 +-- .../asm_avx2/include/openssl/ssl.h | 11 +++ .../asm_avx2/include/openssl/x509.h | 8 +- .../archs/linux-ppc64le/no-asm/configdata.pm | 73 +++++++++++++--- .../linux-ppc64le/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/crypto.h | 2 + .../no-asm/include/openssl/opensslv.h | 10 +-- .../no-asm/include/openssl/ssl.h | 11 +++ .../no-asm/include/openssl/x509.h | 8 +- .../archs/linux-x86_64/asm/configdata.pm | 85 ++++++++++++++---- .../archs/linux-x86_64/asm/crypto/buildinf.h | 2 +- .../linux-x86_64/asm/include/openssl/crypto.h | 2 + .../asm/include/openssl/opensslv.h | 10 +-- .../linux-x86_64/asm/include/openssl/ssl.h | 11 +++ .../linux-x86_64/asm/include/openssl/x509.h | 8 +- .../archs/linux-x86_64/asm_avx2/configdata.pm | 77 +++++++++++++--- .../linux-x86_64/asm_avx2/crypto/buildinf.h | 2 +- .../asm_avx2/include/openssl/crypto.h | 2 + .../asm_avx2/include/openssl/opensslv.h | 10 +-- .../asm_avx2/include/openssl/ssl.h | 11 +++ .../asm_avx2/include/openssl/x509.h | 8 +- .../archs/linux-x86_64/no-asm/configdata.pm | 81 +++++++++++++---- .../linux-x86_64/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/crypto.h | 2 + .../no-asm/include/openssl/opensslv.h | 10 +-- .../linux-x86_64/no-asm/include/openssl/ssl.h | 11 +++ .../no-asm/include/openssl/x509.h | 8 +- .../archs/linux32-s390x/asm/configdata.pm | 73 +++++++++++++--- .../archs/linux32-s390x/asm/crypto/buildinf.h | 2 +- .../asm/include/openssl/crypto.h | 2 + .../asm/include/openssl/opensslv.h | 10 +-- .../linux32-s390x/asm/include/openssl/ssl.h | 11 +++ .../linux32-s390x/asm/include/openssl/x509.h | 8 +- .../linux32-s390x/asm_avx2/configdata.pm | 85 ++++++++++++++---- .../linux32-s390x/asm_avx2/crypto/buildinf.h | 2 +- .../asm_avx2/include/openssl/crypto.h | 2 + .../asm_avx2/include/openssl/opensslv.h | 10 +-- .../asm_avx2/include/openssl/ssl.h | 11 +++ .../asm_avx2/include/openssl/x509.h | 8 +- .../archs/linux32-s390x/no-asm/configdata.pm | 73 +++++++++++++--- .../linux32-s390x/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/crypto.h | 2 + .../no-asm/include/openssl/opensslv.h | 10 +-- .../no-asm/include/openssl/ssl.h | 11 +++ .../no-asm/include/openssl/x509.h | 8 +- .../archs/linux64-mips64/asm/configdata.pm | 85 ++++++++++++++---- .../linux64-mips64/asm/crypto/buildinf.h | 2 +- .../asm/include/openssl/crypto.h | 2 + .../asm/include/openssl/opensslv.h | 10 +-- .../linux64-mips64/asm/include/openssl/ssl.h | 11 +++ .../linux64-mips64/asm/include/openssl/x509.h | 8 +- .../linux64-mips64/asm_avx2/configdata.pm | 73 +++++++++++++--- .../linux64-mips64/asm_avx2/crypto/buildinf.h | 2 +- .../asm_avx2/include/openssl/crypto.h | 2 + .../asm_avx2/include/openssl/opensslv.h | 10 +-- .../asm_avx2/include/openssl/ssl.h | 11 +++ .../asm_avx2/include/openssl/x509.h | 8 +- .../archs/linux64-mips64/no-asm/configdata.pm | 81 +++++++++++++---- .../linux64-mips64/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/crypto.h | 2 + .../no-asm/include/openssl/opensslv.h | 10 +-- .../no-asm/include/openssl/ssl.h | 11 +++ .../no-asm/include/openssl/x509.h | 8 +- .../linux64-riscv64/no-asm/configdata.pm | 81 +++++++++++++---- .../linux64-riscv64/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/crypto.h | 2 + .../no-asm/include/openssl/opensslv.h | 10 +-- .../no-asm/include/openssl/ssl.h | 11 +++ .../no-asm/include/openssl/x509.h | 8 +- .../archs/linux64-s390x/asm/configdata.pm | 85 ++++++++++++++---- .../archs/linux64-s390x/asm/crypto/buildinf.h | 2 +- .../asm/include/openssl/crypto.h | 2 + .../asm/include/openssl/opensslv.h | 10 +-- .../linux64-s390x/asm/include/openssl/ssl.h | 11 +++ .../linux64-s390x/asm/include/openssl/x509.h | 8 +- .../linux64-s390x/asm_avx2/configdata.pm | 73 +++++++++++++--- .../linux64-s390x/asm_avx2/crypto/buildinf.h | 2 +- .../asm_avx2/include/openssl/crypto.h | 2 + .../asm_avx2/include/openssl/opensslv.h | 10 +-- .../asm_avx2/include/openssl/ssl.h | 11 +++ .../asm_avx2/include/openssl/x509.h | 8 +- .../archs/linux64-s390x/no-asm/configdata.pm | 81 +++++++++++++---- .../linux64-s390x/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/crypto.h | 2 + .../no-asm/include/openssl/opensslv.h | 10 +-- .../no-asm/include/openssl/ssl.h | 11 +++ .../no-asm/include/openssl/x509.h | 8 +- .../archs/solaris-x86-gcc/asm/configdata.pm | 81 +++++++++++++---- .../solaris-x86-gcc/asm/crypto/buildinf.h | 2 +- .../asm/include/openssl/crypto.h | 2 + .../asm/include/openssl/opensslv.h | 10 +-- .../solaris-x86-gcc/asm/include/openssl/ssl.h | 11 +++ .../asm/include/openssl/x509.h | 8 +- .../solaris-x86-gcc/asm_avx2/configdata.pm | 77 +++++++++++++--- .../asm_avx2/crypto/buildinf.h | 2 +- .../asm_avx2/include/openssl/crypto.h | 2 + .../asm_avx2/include/openssl/opensslv.h | 10 +-- .../asm_avx2/include/openssl/ssl.h | 11 +++ .../asm_avx2/include/openssl/x509.h | 8 +- .../solaris-x86-gcc/no-asm/configdata.pm | 73 +++++++++++++--- .../solaris-x86-gcc/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/crypto.h | 2 + .../no-asm/include/openssl/opensslv.h | 10 +-- .../no-asm/include/openssl/ssl.h | 11 +++ .../no-asm/include/openssl/x509.h | 8 +- .../solaris64-x86_64-gcc/asm/configdata.pm | 77 +++++++++++++--- .../asm/crypto/buildinf.h | 2 +- .../asm/include/openssl/crypto.h | 2 + .../asm/include/openssl/opensslv.h | 10 +-- .../asm/include/openssl/ssl.h | 11 +++ .../asm/include/openssl/x509.h | 8 +- .../asm_avx2/configdata.pm | 73 +++++++++++++--- .../asm_avx2/crypto/buildinf.h | 2 +- .../asm_avx2/include/openssl/crypto.h | 2 + .../asm_avx2/include/openssl/opensslv.h | 10 +-- .../asm_avx2/include/openssl/ssl.h | 11 +++ .../asm_avx2/include/openssl/x509.h | 8 +- .../solaris64-x86_64-gcc/no-asm/configdata.pm | 85 ++++++++++++++---- .../no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/crypto.h | 2 + .../no-asm/include/openssl/opensslv.h | 10 +-- .../no-asm/include/openssl/ssl.h | 11 +++ .../no-asm/include/openssl/x509.h | 8 +- deps/openssl/openssl/include/crypto/bn_conf.h | 1 + .../openssl/openssl/include/crypto/dso_conf.h | 1 + deps/openssl/openssl/include/openssl/asn1.h | 1 + deps/openssl/openssl/include/openssl/asn1t.h | 1 + deps/openssl/openssl/include/openssl/bio.h | 1 + deps/openssl/openssl/include/openssl/cmp.h | 1 + deps/openssl/openssl/include/openssl/cms.h | 1 + deps/openssl/openssl/include/openssl/conf.h | 1 + .../openssl/include/openssl/configuration.h | 1 + deps/openssl/openssl/include/openssl/crmf.h | 1 + deps/openssl/openssl/include/openssl/crypto.h | 1 + deps/openssl/openssl/include/openssl/ct.h | 1 + deps/openssl/openssl/include/openssl/err.h | 1 + deps/openssl/openssl/include/openssl/ess.h | 1 + .../openssl/openssl/include/openssl/fipskey.h | 1 + deps/openssl/openssl/include/openssl/lhash.h | 1 + deps/openssl/openssl/include/openssl/ocsp.h | 1 + .../openssl/include/openssl/opensslv.h | 1 + deps/openssl/openssl/include/openssl/pkcs12.h | 1 + deps/openssl/openssl/include/openssl/pkcs7.h | 1 + .../openssl/include/openssl/safestack.h | 1 + deps/openssl/openssl/include/openssl/srp.h | 1 + deps/openssl/openssl/include/openssl/ssl.h | 1 + deps/openssl/openssl/include/openssl/ui.h | 1 + deps/openssl/openssl/include/openssl/x509.h | 1 + .../openssl/include/openssl/x509_vfy.h | 1 + deps/openssl/openssl/include/openssl/x509v3.h | 1 + 363 files changed, 4910 insertions(+), 1411 deletions(-) create mode 100644 deps/openssl/openssl/include/crypto/bn_conf.h create mode 100644 deps/openssl/openssl/include/crypto/dso_conf.h create mode 100644 deps/openssl/openssl/include/openssl/asn1.h create mode 100644 deps/openssl/openssl/include/openssl/asn1t.h create mode 100644 deps/openssl/openssl/include/openssl/bio.h create mode 100644 deps/openssl/openssl/include/openssl/cmp.h create mode 100644 deps/openssl/openssl/include/openssl/cms.h create mode 100644 deps/openssl/openssl/include/openssl/conf.h create mode 100644 deps/openssl/openssl/include/openssl/configuration.h create mode 100644 deps/openssl/openssl/include/openssl/crmf.h create mode 100644 deps/openssl/openssl/include/openssl/crypto.h create mode 100644 deps/openssl/openssl/include/openssl/ct.h create mode 100644 deps/openssl/openssl/include/openssl/err.h create mode 100644 deps/openssl/openssl/include/openssl/ess.h create mode 100644 deps/openssl/openssl/include/openssl/fipskey.h create mode 100644 deps/openssl/openssl/include/openssl/lhash.h create mode 100644 deps/openssl/openssl/include/openssl/ocsp.h create mode 100644 deps/openssl/openssl/include/openssl/opensslv.h create mode 100644 deps/openssl/openssl/include/openssl/pkcs12.h create mode 100644 deps/openssl/openssl/include/openssl/pkcs7.h create mode 100644 deps/openssl/openssl/include/openssl/safestack.h create mode 100644 deps/openssl/openssl/include/openssl/srp.h create mode 100644 deps/openssl/openssl/include/openssl/ssl.h create mode 100644 deps/openssl/openssl/include/openssl/ui.h create mode 100644 deps/openssl/openssl/include/openssl/x509.h create mode 100644 deps/openssl/openssl/include/openssl/x509_vfy.h create mode 100644 deps/openssl/openssl/include/openssl/x509v3.h diff --git a/deps/openssl/config/archs/BSD-x86/asm/configdata.pm b/deps/openssl/config/archs/BSD-x86/asm/configdata.pm index 37fc0c16c6fed2..c2b710d059546f 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -1243,6 +1243,9 @@ our %unified_info = ( "test/evp_libctx_test" => { "noinst" => "1" }, + "test/evp_pkey_ctx_new_from_name" => { + "noinst" => "1" + }, "test/evp_pkey_dparams_test" => { "noinst" => "1" }, @@ -1288,6 +1291,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2890,6 +2896,9 @@ our %unified_info = ( "doc/html/man3/OPENSSL_secure_malloc.html" => [ "doc/man3/OPENSSL_secure_malloc.pod" ], + "doc/html/man3/OPENSSL_strcasecmp.html" => [ + "doc/man3/OPENSSL_strcasecmp.pod" + ], "doc/html/man3/OSSL_CMP_CTX_new.html" => [ "doc/man3/OSSL_CMP_CTX_new.pod" ], @@ -5233,6 +5242,9 @@ our %unified_info = ( "doc/man/man3/OPENSSL_secure_malloc.3" => [ "doc/man3/OPENSSL_secure_malloc.pod" ], + "doc/man/man3/OPENSSL_strcasecmp.3" => [ + "doc/man3/OPENSSL_strcasecmp.pod" + ], "doc/man/man3/OSSL_CMP_CTX_new.3" => [ "doc/man3/OSSL_CMP_CTX_new.pod" ], @@ -7613,6 +7625,9 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/evp_pkey_ctx_new_from_name" => [ + "libcrypto" + ], "test/evp_pkey_dparams_test" => [ "libcrypto", "test/libtestutil.a" @@ -7677,6 +7692,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -10484,7 +10503,7 @@ our %unified_info = ( "crypto/chacha/chacha-c64xplus.S" => [ "crypto/chacha/asm/chacha-c64xplus.pl" ], - "crypto/chacha/chacha-ia64.S" => [ + "crypto/chacha/chacha-ia64.s" => [ "crypto/chacha/asm/chacha-ia64.pl" ], "crypto/chacha/chacha-ppc.s" => [ @@ -11804,6 +11823,9 @@ our %unified_info = ( "doc/html/man3/OPENSSL_secure_malloc.html" => [ "doc/man3/OPENSSL_secure_malloc.pod" ], + "doc/html/man3/OPENSSL_strcasecmp.html" => [ + "doc/man3/OPENSSL_strcasecmp.pod" + ], "doc/html/man3/OSSL_CMP_CTX_new.html" => [ "doc/man3/OSSL_CMP_CTX_new.pod" ], @@ -14147,6 +14169,9 @@ our %unified_info = ( "doc/man/man3/OPENSSL_secure_malloc.3" => [ "doc/man3/OPENSSL_secure_malloc.pod" ], + "doc/man/man3/OPENSSL_strcasecmp.3" => [ + "doc/man3/OPENSSL_strcasecmp.pod" + ], "doc/man/man3/OSSL_CMP_CTX_new.3" => [ "doc/man3/OSSL_CMP_CTX_new.pod" ], @@ -16435,6 +16460,7 @@ our %unified_info = ( "doc/html/man3/OPENSSL_malloc.html", "doc/html/man3/OPENSSL_s390xcap.html", "doc/html/man3/OPENSSL_secure_malloc.html", + "doc/html/man3/OPENSSL_strcasecmp.html", "doc/html/man3/OSSL_CMP_CTX_new.html", "doc/html/man3/OSSL_CMP_HDR_get0_transactionID.html", "doc/html/man3/OSSL_CMP_ITAV_set0.html", @@ -18500,6 +18526,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/evp_pkey_ctx_new_from_name" => [ + "include", + "apps/include" + ], "test/evp_pkey_dparams_test" => [ "include", "apps/include" @@ -18687,6 +18717,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19370,6 +19404,7 @@ our %unified_info = ( "doc/man/man3/OPENSSL_malloc.3", "doc/man/man3/OPENSSL_s390xcap.3", "doc/man/man3/OPENSSL_secure_malloc.3", + "doc/man/man3/OPENSSL_strcasecmp.3", "doc/man/man3/OSSL_CMP_CTX_new.3", "doc/man/man3/OSSL_CMP_HDR_get0_transactionID.3", "doc/man/man3/OSSL_CMP_ITAV_set0.3", @@ -19992,6 +20027,7 @@ our %unified_info = ( "test/evp_fetch_prov_test", "test/evp_kdf_test", "test/evp_libctx_test", + "test/evp_pkey_ctx_new_from_name", "test/evp_pkey_dparams_test", "test/evp_pkey_provided_test", "test/evp_test", @@ -20007,6 +20043,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26389,6 +26426,12 @@ our %unified_info = ( "test/evp_libctx_test-bin-evp_libctx_test.o" => [ "test/evp_libctx_test.c" ], + "test/evp_pkey_ctx_new_from_name" => [ + "test/evp_pkey_ctx_new_from_name-bin-evp_pkey_ctx_new_from_name.o" + ], + "test/evp_pkey_ctx_new_from_name-bin-evp_pkey_ctx_new_from_name.o" => [ + "test/evp_pkey_ctx_new_from_name.c" + ], "test/evp_pkey_dparams_test" => [ "test/evp_pkey_dparams_test-bin-evp_pkey_dparams_test.o" ], @@ -26578,6 +26621,12 @@ our %unified_info = ( "test/testutil/libtestutil-lib-tests.o", "test/testutil/libtestutil-lib-testutil_init.o" ], + "test/localetest" => [ + "test/localetest-bin-localetest.o" + ], + "test/localetest-bin-localetest.o" => [ + "test/localetest.c" + ], "test/mdc2_internal_test" => [ "test/mdc2_internal_test-bin-mdc2_internal_test.o" ], @@ -27290,8 +27339,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/rafaelgss/repos/os/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27318,7 +27367,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; + use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27335,8 +27384,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; +use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/util/perl'; +use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ 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 9abbf079b10ab1..006d25a76cf374 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: Thu May 5 17:00:46 2022 UTC" +#define DATE "built on: Mon May 9 17:35:57 2022 UTC" /* * Generate compiler_flags as an array of individual characters. This is a 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 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/BSD-x86/asm/include/openssl/opensslv.h index ee2b0c90bf6199..1b853bc9537feb 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 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/asm/include/openssl/ssl.h b/deps/openssl/config/archs/BSD-x86/asm/include/openssl/ssl.h index 92aba6debb6b00..0f1915755ae8a4 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 @@ -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/asm/include/openssl/x509.h b/deps/openssl/config/archs/BSD-x86/asm/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/include/openssl/x509.h +++ b/deps/openssl/config/archs/BSD-x86/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 adacc411b4cf7c..a679c239d5ee10 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -1243,6 +1243,9 @@ our %unified_info = ( "test/evp_libctx_test" => { "noinst" => "1" }, + "test/evp_pkey_ctx_new_from_name" => { + "noinst" => "1" + }, "test/evp_pkey_dparams_test" => { "noinst" => "1" }, @@ -1288,6 +1291,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2890,6 +2896,9 @@ our %unified_info = ( "doc/html/man3/OPENSSL_secure_malloc.html" => [ "doc/man3/OPENSSL_secure_malloc.pod" ], + "doc/html/man3/OPENSSL_strcasecmp.html" => [ + "doc/man3/OPENSSL_strcasecmp.pod" + ], "doc/html/man3/OSSL_CMP_CTX_new.html" => [ "doc/man3/OSSL_CMP_CTX_new.pod" ], @@ -5233,6 +5242,9 @@ our %unified_info = ( "doc/man/man3/OPENSSL_secure_malloc.3" => [ "doc/man3/OPENSSL_secure_malloc.pod" ], + "doc/man/man3/OPENSSL_strcasecmp.3" => [ + "doc/man3/OPENSSL_strcasecmp.pod" + ], "doc/man/man3/OSSL_CMP_CTX_new.3" => [ "doc/man3/OSSL_CMP_CTX_new.pod" ], @@ -7613,6 +7625,9 @@ our %unified_info = ( "libcrypto.a", "test/libtestutil.a" ], + "test/evp_pkey_ctx_new_from_name" => [ + "libcrypto" + ], "test/evp_pkey_dparams_test" => [ "libcrypto", "test/libtestutil.a" @@ -7677,6 +7692,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -8020,9 +8039,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 +8056,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" => [ @@ -10484,7 +10503,7 @@ our %unified_info = ( "crypto/chacha/chacha-c64xplus.S" => [ "crypto/chacha/asm/chacha-c64xplus.pl" ], - "crypto/chacha/chacha-ia64.S" => [ + "crypto/chacha/chacha-ia64.s" => [ "crypto/chacha/asm/chacha-ia64.pl" ], "crypto/chacha/chacha-ppc.s" => [ @@ -11804,6 +11823,9 @@ our %unified_info = ( "doc/html/man3/OPENSSL_secure_malloc.html" => [ "doc/man3/OPENSSL_secure_malloc.pod" ], + "doc/html/man3/OPENSSL_strcasecmp.html" => [ + "doc/man3/OPENSSL_strcasecmp.pod" + ], "doc/html/man3/OSSL_CMP_CTX_new.html" => [ "doc/man3/OSSL_CMP_CTX_new.pod" ], @@ -14147,6 +14169,9 @@ our %unified_info = ( "doc/man/man3/OPENSSL_secure_malloc.3" => [ "doc/man3/OPENSSL_secure_malloc.pod" ], + "doc/man/man3/OPENSSL_strcasecmp.3" => [ + "doc/man3/OPENSSL_strcasecmp.pod" + ], "doc/man/man3/OSSL_CMP_CTX_new.3" => [ "doc/man3/OSSL_CMP_CTX_new.pod" ], @@ -16435,6 +16460,7 @@ our %unified_info = ( "doc/html/man3/OPENSSL_malloc.html", "doc/html/man3/OPENSSL_s390xcap.html", "doc/html/man3/OPENSSL_secure_malloc.html", + "doc/html/man3/OPENSSL_strcasecmp.html", "doc/html/man3/OSSL_CMP_CTX_new.html", "doc/html/man3/OSSL_CMP_HDR_get0_transactionID.html", "doc/html/man3/OSSL_CMP_ITAV_set0.html", @@ -18500,6 +18526,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/evp_pkey_ctx_new_from_name" => [ + "include", + "apps/include" + ], "test/evp_pkey_dparams_test" => [ "include", "apps/include" @@ -18687,6 +18717,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19370,6 +19404,7 @@ our %unified_info = ( "doc/man/man3/OPENSSL_malloc.3", "doc/man/man3/OPENSSL_s390xcap.3", "doc/man/man3/OPENSSL_secure_malloc.3", + "doc/man/man3/OPENSSL_strcasecmp.3", "doc/man/man3/OSSL_CMP_CTX_new.3", "doc/man/man3/OSSL_CMP_HDR_get0_transactionID.3", "doc/man/man3/OSSL_CMP_ITAV_set0.3", @@ -19992,6 +20027,7 @@ our %unified_info = ( "test/evp_fetch_prov_test", "test/evp_kdf_test", "test/evp_libctx_test", + "test/evp_pkey_ctx_new_from_name", "test/evp_pkey_dparams_test", "test/evp_pkey_provided_test", "test/evp_test", @@ -20007,6 +20043,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26389,6 +26426,12 @@ our %unified_info = ( "test/evp_libctx_test-bin-evp_libctx_test.o" => [ "test/evp_libctx_test.c" ], + "test/evp_pkey_ctx_new_from_name" => [ + "test/evp_pkey_ctx_new_from_name-bin-evp_pkey_ctx_new_from_name.o" + ], + "test/evp_pkey_ctx_new_from_name-bin-evp_pkey_ctx_new_from_name.o" => [ + "test/evp_pkey_ctx_new_from_name.c" + ], "test/evp_pkey_dparams_test" => [ "test/evp_pkey_dparams_test-bin-evp_pkey_dparams_test.o" ], @@ -26578,6 +26621,12 @@ our %unified_info = ( "test/testutil/libtestutil-lib-tests.o", "test/testutil/libtestutil-lib-testutil_init.o" ], + "test/localetest" => [ + "test/localetest-bin-localetest.o" + ], + "test/localetest-bin-localetest.o" => [ + "test/localetest.c" + ], "test/mdc2_internal_test" => [ "test/mdc2_internal_test-bin-mdc2_internal_test.o" ], @@ -27290,8 +27339,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/rafaelgss/repos/os/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27318,7 +27367,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; + use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27335,8 +27384,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; +use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/util/perl'; +use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ 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 38ce5be66ce939..2ab9f757c95b5f 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: Thu May 5 17:01:03 2022 UTC" +#define DATE "built on: Mon May 9 17:36:06 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/crypto.h b/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/opensslv.h index ee2b0c90bf6199..1b853bc9537feb 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 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/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/ssl.h index 92aba6debb6b00..0f1915755ae8a4 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 @@ -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/asm_avx2/include/openssl/x509.h b/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/x509.h +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 aa96089f6737eb..8392d10f1740db 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 1c6b5c4d64ead1..5a28197731b6a0 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 00d2496c1580c0..3f40be6d8c61d5 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 ee2b0c90bf6199..1b853bc9537feb 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 92aba6debb6b00..0f1915755ae8a4 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 9f195a3d84742e..1f7755e5b69c75 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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 7478a5dbd73599..65211b6bf69050 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.2+quic", + "full_version" => "3.0.3+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" => "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_64", - "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" }, @@ -2893,6 +2899,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" ], @@ -5236,6 +5245,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" ], @@ -7616,6 +7628,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" @@ -7680,6 +7695,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -9786,10 +9805,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" => [ @@ -10529,7 +10548,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" => [ @@ -11849,6 +11868,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" ], @@ -14192,6 +14214,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" ], @@ -16480,6 +16505,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", @@ -18545,6 +18571,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" @@ -18732,6 +18762,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19415,6 +19449,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", @@ -20037,6 +20072,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", @@ -20052,6 +20088,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26558,6 +26595,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" ], @@ -26747,6 +26790,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" ], @@ -27459,8 +27508,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); @@ -27487,7 +27536,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"; @@ -27504,8 +27553,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_64/asm/crypto/buildinf.h b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h index 721f4b76b2c3d5..643a40dffe6678 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: Thu May 5 17:01:34 2022 UTC" +#define DATE "built on: Mon May 9 17:36:24 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/crypto.h b/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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_64/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/opensslv.h index ee2b0c90bf6199..1b853bc9537feb 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 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_64/asm/include/openssl/ssl.h b/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/ssl.h index 92aba6debb6b00..0f1915755ae8a4 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 @@ -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_64/asm/include/openssl/x509.h b/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/x509.h +++ b/deps/openssl/config/archs/BSD-x86_64/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 93bd456e91104e..1f7421b5bdc718 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.2+quic", + "full_version" => "3.0.3+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" => "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_64", - "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" }, @@ -2893,6 +2899,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" ], @@ -5236,6 +5245,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" ], @@ -7616,6 +7628,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" @@ -7680,6 +7695,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -10529,7 +10548,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" => [ @@ -11849,6 +11868,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" ], @@ -14192,6 +14214,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" ], @@ -16480,6 +16505,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", @@ -18545,6 +18571,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" @@ -18732,6 +18762,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19415,6 +19449,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", @@ -20037,6 +20072,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", @@ -20052,6 +20088,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26558,6 +26595,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" ], @@ -26747,6 +26790,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" ], @@ -27459,8 +27508,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); @@ -27487,7 +27536,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"; @@ -27504,8 +27553,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_64/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/buildinf.h index 08872c520aac33..91cdbea5e5b110 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: Thu May 5 17:01:55 2022 UTC" +#define DATE "built on: Mon May 9 17:36:36 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/crypto.h b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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_64/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/opensslv.h index ee2b0c90bf6199..1b853bc9537feb 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 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_64/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/ssl.h index 92aba6debb6b00..0f1915755ae8a4 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 @@ -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_64/asm_avx2/include/openssl/x509.h b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/x509.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 98aca7d24dc893..6725852abb8dda 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.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_64", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "ar", @@ -1245,6 +1245,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" }, @@ -1290,6 +1293,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2834,6 +2840,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" ], @@ -5177,6 +5186,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" ], @@ -7557,6 +7569,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" @@ -7621,6 +7636,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -7964,6 +7983,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", @@ -7981,10 +8003,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" => [ @@ -9659,10 +9678,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" => [ @@ -10402,7 +10421,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" => [ @@ -11722,6 +11741,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" ], @@ -14065,6 +14087,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" ], @@ -16353,6 +16378,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", @@ -18418,6 +18444,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" @@ -18605,6 +18635,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19288,6 +19322,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", @@ -19910,6 +19945,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", @@ -19925,6 +19961,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26203,6 +26240,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" ], @@ -26392,6 +26435,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" ], @@ -27107,8 +27156,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); @@ -27135,7 +27184,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"; @@ -27152,8 +27201,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_64/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/buildinf.h index 2ff534beb62fce..a1715733f9afdd 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: Thu May 5 17:02:15 2022 UTC" +#define DATE "built on: Mon May 9 17:36:48 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/crypto.h b/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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_64/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/opensslv.h index ee2b0c90bf6199..1b853bc9537feb 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 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_64/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/ssl.h index 92aba6debb6b00..0f1915755ae8a4 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 @@ -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_64/no-asm/include/openssl/x509.h b/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/x509.h +++ b/deps/openssl/config/archs/BSD-x86_64/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 diff --git a/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm b/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm index 526f5ffd707b02..1d7c2b5f30c22b 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -268,11 +268,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" => "VC-WIN32", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "lib", @@ -287,7 +287,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x5618fd731fb8)", + "RANLIB" => "CODE(0x561b475f03f0)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -1294,6 +1294,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" }, @@ -1339,6 +1342,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2938,6 +2944,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" ], @@ -5281,6 +5290,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" ], @@ -7667,6 +7679,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" @@ -7731,6 +7746,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -8074,9 +8093,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", @@ -8096,7 +8112,10 @@ 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/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" ], "products" => { "bin" => [ @@ -9796,10 +9815,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" => [ @@ -10542,7 +10561,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" => [ @@ -11862,6 +11881,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" ], @@ -14205,6 +14227,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" ], @@ -16501,6 +16526,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", @@ -18572,6 +18598,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" @@ -18759,6 +18789,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19442,6 +19476,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", @@ -20064,6 +20099,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", @@ -20079,6 +20115,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26467,6 +26504,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" ], @@ -26657,6 +26700,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" ], @@ -27369,8 +27418,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); @@ -27397,7 +27446,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"; @@ -27414,8 +27463,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/VC-WIN32/asm/crypto/buildinf.h b/deps/openssl/config/archs/VC-WIN32/asm/crypto/buildinf.h index 7a1e53beb9b52c..3b1e0d0910abed 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: Thu May 5 17:13:29 2022 UTC" +#define DATE "built on: Mon May 9 17:43:21 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/crypto.h b/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/crypto.h index 0aab81b3c437ab..668c52cfee1f15 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 @@ -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/VC-WIN32/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/opensslv.h index c1fac576fd3a90..4be2e056fa5410 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 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/VC-WIN32/asm/include/openssl/ssl.h b/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/ssl.h index fb02a445b2aca5..9712ae165a5759 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 @@ -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/VC-WIN32/asm/include/openssl/x509.h b/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/x509.h index ea8909a5495373..0f2353c821aa9b 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/x509.h +++ b/deps/openssl/config/archs/VC-WIN32/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 d56ef441598650..2af210991ca637 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -268,11 +268,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" => "VC-WIN32", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "lib", @@ -287,7 +287,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x55fac080bfe8)", + "RANLIB" => "CODE(0x5614f015f400)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -1294,6 +1294,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" }, @@ -1339,6 +1342,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2938,6 +2944,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" ], @@ -5281,6 +5290,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" ], @@ -7667,6 +7679,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" @@ -7731,6 +7746,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -10542,7 +10561,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" => [ @@ -11862,6 +11881,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" ], @@ -14205,6 +14227,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" ], @@ -16501,6 +16526,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", @@ -18572,6 +18598,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" @@ -18759,6 +18789,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19442,6 +19476,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", @@ -20064,6 +20099,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", @@ -20079,6 +20115,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26467,6 +26504,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" ], @@ -26657,6 +26700,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" ], @@ -27369,8 +27418,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); @@ -27397,7 +27446,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"; @@ -27414,8 +27463,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/VC-WIN32/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/buildinf.h index 625b475a946bf0..45b2f64322de10 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: Thu May 5 17:13:44 2022 UTC" +#define DATE "built on: Mon May 9 17:43:29 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/crypto.h b/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/crypto.h index 0aab81b3c437ab..668c52cfee1f15 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 @@ -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/VC-WIN32/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/opensslv.h index c1fac576fd3a90..4be2e056fa5410 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 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/VC-WIN32/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/ssl.h index fb02a445b2aca5..9712ae165a5759 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 @@ -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/VC-WIN32/asm_avx2/include/openssl/x509.h b/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/x509.h index ea8909a5495373..0f2353c821aa9b 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/x509.h +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 7b7c66f8e5e5da..8176528282fcf8 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -268,11 +268,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" => "VC-WIN32", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "lib", @@ -287,7 +287,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x5559d58191d8)", + "RANLIB" => "CODE(0x5574754114a0)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -1295,6 +1295,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" }, @@ -1340,6 +1343,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2881,6 +2887,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" ], @@ -5224,6 +5233,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" ], @@ -7610,6 +7622,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" @@ -7674,6 +7689,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -8017,9 +8036,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", @@ -8039,7 +8055,10 @@ 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/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" ], "products" => { "bin" => [ @@ -9713,10 +9732,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" => [ @@ -10459,7 +10478,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" => [ @@ -11779,6 +11798,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" ], @@ -14122,6 +14144,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" ], @@ -16418,6 +16443,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", @@ -18489,6 +18515,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" @@ -18676,6 +18706,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19359,6 +19393,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", @@ -19981,6 +20016,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", @@ -19996,6 +20032,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26280,6 +26317,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" ], @@ -26470,6 +26513,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" ], @@ -27185,8 +27234,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); @@ -27213,7 +27262,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"; @@ -27230,8 +27279,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/VC-WIN32/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/buildinf.h index 3522d0da5ace6f..73bc11076ad0be 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: Thu May 5 17:14:00 2022 UTC" +#define DATE "built on: Mon May 9 17:43:37 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/crypto.h b/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/crypto.h index 0aab81b3c437ab..668c52cfee1f15 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 @@ -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/VC-WIN32/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/opensslv.h index c1fac576fd3a90..4be2e056fa5410 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 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/VC-WIN32/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/ssl.h index fb02a445b2aca5..9712ae165a5759 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 @@ -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/VC-WIN32/no-asm/include/openssl/x509.h b/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/x509.h index ea8909a5495373..0f2353c821aa9b 100644 --- a/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/x509.h +++ b/deps/openssl/config/archs/VC-WIN32/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 0691f029efa6ab..e85f6d73cfc8d9 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -266,11 +266,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "15 Mar 2022", + "release_date" => "3 May 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "VC-WIN64-ARM", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "lib", @@ -283,7 +283,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x5594a6421188)", + "RANLIB" => "CODE(0x5595a95d84a0)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -1287,6 +1287,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" }, @@ -1332,6 +1335,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2873,6 +2879,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" ], @@ -5216,6 +5225,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" ], @@ -7602,6 +7614,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" @@ -7666,6 +7681,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -8009,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", @@ -8031,7 +8047,10 @@ 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/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" ], "products" => { "bin" => [ @@ -10451,7 +10470,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" => [ @@ -11771,6 +11790,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" ], @@ -14114,6 +14136,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" ], @@ -16410,6 +16435,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", @@ -18481,6 +18507,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" @@ -18668,6 +18698,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19351,6 +19385,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", @@ -19973,6 +20008,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", @@ -19988,6 +20024,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26272,6 +26309,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" ], @@ -26462,6 +26505,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" ], @@ -27177,8 +27226,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); @@ -27205,7 +27254,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"; @@ -27222,8 +27271,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/VC-WIN64-ARM/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/buildinf.h index 3c7444267cdd98..a01c2a630c9e4f 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: Thu May 5 17:14:13 2022 UTC" +#define DATE "built on: Mon May 9 17:43:44 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/crypto.h b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/crypto.h index 0aab81b3c437ab..668c52cfee1f15 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 @@ -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/VC-WIN64-ARM/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/opensslv.h index c1fac576fd3a90..4be2e056fa5410 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 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/VC-WIN64-ARM/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/ssl.h index fb02a445b2aca5..9712ae165a5759 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 @@ -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/VC-WIN64-ARM/no-asm/include/openssl/x509.h b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/x509.h index ea8909a5495373..0f2353c821aa9b 100644 --- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/x509.h +++ b/deps/openssl/config/archs/VC-WIN64-ARM/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm b/deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm index d23137c31e3f5e..e59d23135022cd 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -271,11 +271,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" => "VC-WIN64A", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "lib", @@ -290,7 +290,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x555c03778cd8)", + "RANLIB" => "CODE(0x5634200ce4c0)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -1298,6 +1298,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" }, @@ -1343,6 +1346,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2944,6 +2950,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" ], @@ -5287,6 +5296,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" ], @@ -7673,6 +7685,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" @@ -7737,6 +7752,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -8080,9 +8099,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", @@ -8102,7 +8118,10 @@ 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/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" ], "products" => { "bin" => [ @@ -9833,10 +9852,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" => [ @@ -10579,7 +10598,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" => [ @@ -11899,6 +11918,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" ], @@ -14242,6 +14264,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" ], @@ -16538,6 +16563,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", @@ -18609,6 +18635,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" @@ -18796,6 +18826,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19479,6 +19513,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", @@ -20101,6 +20136,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", @@ -20116,6 +20152,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26628,6 +26665,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" ], @@ -26818,6 +26861,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" ], @@ -27530,8 +27579,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); @@ -27558,7 +27607,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"; @@ -27575,8 +27624,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/VC-WIN64A/asm/crypto/buildinf.h b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/buildinf.h index e6fb54ada8bd73..d42b7b7b60eab9 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: Thu May 5 17:12:37 2022 UTC" +#define DATE "built on: Mon May 9 17:42:51 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/crypto.h b/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/crypto.h index 0aab81b3c437ab..668c52cfee1f15 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 @@ -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/VC-WIN64A/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/opensslv.h index c1fac576fd3a90..4be2e056fa5410 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 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/VC-WIN64A/asm/include/openssl/ssl.h b/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/ssl.h index fb02a445b2aca5..9712ae165a5759 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 @@ -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/VC-WIN64A/asm/include/openssl/x509.h b/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/x509.h index ea8909a5495373..0f2353c821aa9b 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/x509.h +++ b/deps/openssl/config/archs/VC-WIN64A/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 2d07c5b42ba7c4..c76a9ceb7f4da3 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -271,11 +271,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" => "VC-WIN64A", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "lib", @@ -290,7 +290,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x555fab219f08)", + "RANLIB" => "CODE(0x559446543400)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -1298,6 +1298,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" }, @@ -1343,6 +1346,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2944,6 +2950,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" ], @@ -5287,6 +5296,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" ], @@ -7673,6 +7685,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" @@ -7737,6 +7752,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -8080,9 +8099,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", @@ -8102,7 +8118,10 @@ 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/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" ], "products" => { "bin" => [ @@ -9833,10 +9852,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" => [ @@ -10579,7 +10598,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" => [ @@ -11899,6 +11918,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" ], @@ -14242,6 +14264,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" ], @@ -16538,6 +16563,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", @@ -18609,6 +18635,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" @@ -18796,6 +18826,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19479,6 +19513,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", @@ -20101,6 +20136,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", @@ -20116,6 +20152,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26628,6 +26665,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" ], @@ -26818,6 +26861,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" ], @@ -27530,8 +27579,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); @@ -27558,7 +27607,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"; @@ -27575,8 +27624,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/VC-WIN64A/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/buildinf.h index 6422efd0794b17..bf973082e24534 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: Thu May 5 17:12:56 2022 UTC" +#define DATE "built on: Mon May 9 17:43:02 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/crypto.h b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/crypto.h index 0aab81b3c437ab..668c52cfee1f15 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 @@ -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/VC-WIN64A/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/opensslv.h index c1fac576fd3a90..4be2e056fa5410 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 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/VC-WIN64A/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/ssl.h index fb02a445b2aca5..9712ae165a5759 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 @@ -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/VC-WIN64A/asm_avx2/include/openssl/x509.h b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/x509.h index ea8909a5495373..0f2353c821aa9b 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/x509.h +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 1f17e703764197..20487d739bb34e 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -271,11 +271,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" => "VC-WIN64A", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "lib", @@ -290,7 +290,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x55717b0b5458)", + "RANLIB" => "CODE(0x562934e5a4a0)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -1299,6 +1299,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" }, @@ -1344,6 +1347,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2885,6 +2891,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" ], @@ -5228,6 +5237,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" ], @@ -7614,6 +7626,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" @@ -7678,6 +7693,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -8021,6 +8040,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", @@ -8040,10 +8062,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" => [ @@ -10463,7 +10482,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" => [ @@ -11783,6 +11802,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" ], @@ -14126,6 +14148,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" ], @@ -16422,6 +16447,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", @@ -18493,6 +18519,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" @@ -18680,6 +18710,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19363,6 +19397,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", @@ -19985,6 +20020,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", @@ -20000,6 +20036,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26284,6 +26321,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" ], @@ -26474,6 +26517,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" ], @@ -27189,8 +27238,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); @@ -27217,7 +27266,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"; @@ -27234,8 +27283,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/VC-WIN64A/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/buildinf.h index 34a5485084654c..0b9c2e28bd860c 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: Thu May 5 17:13:15 2022 UTC" +#define DATE "built on: Mon May 9 17:43:13 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/crypto.h b/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/crypto.h index 0aab81b3c437ab..668c52cfee1f15 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 @@ -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/VC-WIN64A/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/opensslv.h index c1fac576fd3a90..4be2e056fa5410 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 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/VC-WIN64A/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/ssl.h index fb02a445b2aca5..9712ae165a5759 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 @@ -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/VC-WIN64A/no-asm/include/openssl/x509.h b/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/x509.h index ea8909a5495373..0f2353c821aa9b 100644 --- a/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/x509.h +++ b/deps/openssl/config/archs/VC-WIN64A/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 67af5261e15cfc..cb813c1bdb1edd 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -258,11 +258,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "15 Mar 2022", + "release_date" => "3 May 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "aix64-gcc-as", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "ar -X64", @@ -1319,6 +1319,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" }, @@ -1364,6 +1367,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2943,6 +2949,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" ], @@ -5286,6 +5295,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" ], @@ -7762,6 +7774,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" @@ -7826,6 +7841,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -10649,7 +10668,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" => [ @@ -11969,6 +11988,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" ], @@ -14312,6 +14334,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" ], @@ -16696,6 +16721,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", @@ -18833,6 +18859,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" @@ -19020,6 +19050,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19703,6 +19737,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", @@ -20349,6 +20384,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", @@ -20364,6 +20400,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26954,6 +26991,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" ], @@ -27143,6 +27186,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" ], @@ -27858,8 +27907,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); @@ -27886,7 +27935,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"; @@ -27903,8 +27952,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/aix64-gcc-as/asm/crypto/buildinf.h b/deps/openssl/config/archs/aix64-gcc-as/asm/crypto/buildinf.h index b988e1e821a639..569a2d814b41b9 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: Thu May 5 16:59:58 2022 UTC" +#define DATE "built on: Mon May 9 17:35:30 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/crypto.h b/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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/aix64-gcc-as/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/opensslv.h index ee2b0c90bf6199..1b853bc9537feb 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 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/aix64-gcc-as/asm/include/openssl/ssl.h b/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/ssl.h index 92aba6debb6b00..0f1915755ae8a4 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 @@ -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/aix64-gcc-as/asm/include/openssl/x509.h b/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/x509.h +++ b/deps/openssl/config/archs/aix64-gcc-as/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 0e2f2f807204cd..2060a21a815f0b 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -258,11 +258,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "15 Mar 2022", + "release_date" => "3 May 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "aix64-gcc-as", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "ar -X64", @@ -1247,6 +1247,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" }, @@ -1292,6 +1295,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2871,6 +2877,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" ], @@ -5214,6 +5223,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" ], @@ -7594,6 +7606,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" @@ -7658,6 +7673,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -8001,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", @@ -8021,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" => [ @@ -10481,7 +10500,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" => [ @@ -11801,6 +11820,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" ], @@ -14144,6 +14166,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" ], @@ -16432,6 +16457,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", @@ -18497,6 +18523,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" @@ -18684,6 +18714,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19367,6 +19401,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", @@ -19989,6 +20024,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", @@ -20004,6 +20040,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26450,6 +26487,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" ], @@ -26639,6 +26682,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" ], @@ -27354,8 +27403,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); @@ -27382,7 +27431,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"; @@ -27399,8 +27448,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/aix64-gcc-as/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/crypto/buildinf.h index e41c48f3db1f96..e6e0d447327b26 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: Thu May 5 17:00:15 2022 UTC" +#define DATE "built on: Mon May 9 17:35:39 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/crypto.h b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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/aix64-gcc-as/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/opensslv.h index ee2b0c90bf6199..1b853bc9537feb 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 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/aix64-gcc-as/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/ssl.h index 92aba6debb6b00..0f1915755ae8a4 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 @@ -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/aix64-gcc-as/asm_avx2/include/openssl/x509.h b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/x509.h +++ b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 5c8bd2e06560ba..a1a909caeae3d5 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -258,11 +258,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "15 Mar 2022", + "release_date" => "3 May 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "aix64-gcc-as", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "ar -X64", @@ -1248,6 +1248,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" }, @@ -1293,6 +1296,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2837,6 +2843,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" ], @@ -5180,6 +5189,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" ], @@ -7560,6 +7572,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" @@ -7624,6 +7639,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -9661,10 +9680,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" => [ @@ -10404,7 +10423,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" => [ @@ -11724,6 +11743,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" ], @@ -14067,6 +14089,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" ], @@ -16355,6 +16380,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", @@ -18420,6 +18446,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" @@ -18607,6 +18637,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19290,6 +19324,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", @@ -19912,6 +19947,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", @@ -19927,6 +19963,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26201,6 +26238,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" ], @@ -26390,6 +26433,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" ], @@ -27108,8 +27157,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); @@ -27136,7 +27185,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"; @@ -27153,8 +27202,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/aix64-gcc-as/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/aix64-gcc-as/no-asm/crypto/buildinf.h index 58083f4a5558c3..7a80efaff4e5dd 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: Thu May 5 17:00:32 2022 UTC" +#define DATE "built on: Mon May 9 17:35:48 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/crypto.h b/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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/aix64-gcc-as/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/opensslv.h index ee2b0c90bf6199..1b853bc9537feb 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 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/aix64-gcc-as/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/ssl.h index 92aba6debb6b00..0f1915755ae8a4 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 @@ -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/aix64-gcc-as/no-asm/include/openssl/x509.h b/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/x509.h +++ b/deps/openssl/config/archs/aix64-gcc-as/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 7c85397319ca6b..9eecb3776ecd18 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -258,11 +258,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" => "darwin-i386-cc", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "ar", @@ -1245,6 +1245,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" }, @@ -1290,6 +1293,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2892,6 +2898,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" ], @@ -5235,6 +5244,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" ], @@ -7607,6 +7619,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" @@ -7671,6 +7686,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -8014,9 +8033,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", @@ -8034,7 +8050,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" => [ @@ -9733,10 +9752,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" => [ @@ -10476,7 +10495,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" => [ @@ -11796,6 +11815,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" ], @@ -14139,6 +14161,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" ], @@ -16410,6 +16435,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", @@ -18467,6 +18493,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" @@ -18654,6 +18684,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19337,6 +19371,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", @@ -19959,6 +19994,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", @@ -19974,6 +20010,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26350,6 +26387,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" ], @@ -26539,6 +26582,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" ], @@ -27253,8 +27302,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); @@ -27281,7 +27330,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"; @@ -27298,8 +27347,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/darwin-i386-cc/asm/crypto/buildinf.h b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/buildinf.h index 1d4d4d1190cbe5..74c9ee23601bed 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: Thu May 5 17:03:21 2022 UTC" +#define DATE "built on: Mon May 9 17:37:27 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/crypto.h b/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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/darwin-i386-cc/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/opensslv.h index ee2b0c90bf6199..1b853bc9537feb 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 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/darwin-i386-cc/asm/include/openssl/ssl.h b/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/ssl.h index 92aba6debb6b00..0f1915755ae8a4 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 @@ -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/darwin-i386-cc/asm/include/openssl/x509.h b/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/x509.h +++ b/deps/openssl/config/archs/darwin-i386-cc/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 d19481d3937fb0..3947554d62d7df 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -258,11 +258,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" => "darwin-i386-cc", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "ar", @@ -1245,6 +1245,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" }, @@ -1290,6 +1293,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2892,6 +2898,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" ], @@ -5235,6 +5244,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" ], @@ -7607,6 +7619,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" @@ -7671,6 +7686,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -8014,6 +8033,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", @@ -8031,10 +8053,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" => [ @@ -9733,10 +9752,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" => [ @@ -10476,7 +10495,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" => [ @@ -11796,6 +11815,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" ], @@ -14139,6 +14161,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" ], @@ -16410,6 +16435,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", @@ -18467,6 +18493,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" @@ -18654,6 +18684,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19337,6 +19371,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", @@ -19959,6 +19994,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", @@ -19974,6 +20010,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26350,6 +26387,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" ], @@ -26539,6 +26582,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" ], @@ -27253,8 +27302,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); @@ -27281,7 +27330,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"; @@ -27298,8 +27347,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/darwin-i386-cc/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/buildinf.h index 150a0ddccad422..d68b7c1365f03d 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: Thu May 5 17:03:36 2022 UTC" +#define DATE "built on: Mon May 9 17:37:36 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/crypto.h b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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/darwin-i386-cc/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/opensslv.h index ee2b0c90bf6199..1b853bc9537feb 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 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/darwin-i386-cc/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/ssl.h index 92aba6debb6b00..0f1915755ae8a4 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 @@ -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/darwin-i386-cc/asm_avx2/include/openssl/x509.h b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/x509.h +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 2b20ffee3d7bf2..dd74a710a5cb43 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -258,11 +258,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" => "darwin-i386-cc", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "ar", @@ -1246,6 +1246,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" }, @@ -1291,6 +1294,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2835,6 +2841,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" ], @@ -5178,6 +5187,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" ], @@ -7550,6 +7562,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" @@ -7614,6 +7629,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -10393,7 +10412,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" => [ @@ -11713,6 +11732,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" ], @@ -14056,6 +14078,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" ], @@ -16327,6 +16352,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", @@ -18384,6 +18410,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" @@ -18571,6 +18601,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19254,6 +19288,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", @@ -19876,6 +19911,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", @@ -19891,6 +19927,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26163,6 +26200,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" ], @@ -26352,6 +26395,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" ], @@ -27069,8 +27118,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); @@ -27097,7 +27146,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"; @@ -27114,8 +27163,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/darwin-i386-cc/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/buildinf.h index 6808fe8ab26d36..38afb49d68fb7a 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: Thu May 5 17:03:52 2022 UTC" +#define DATE "built on: Mon May 9 17:37:45 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/crypto.h b/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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/darwin-i386-cc/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/opensslv.h index ee2b0c90bf6199..1b853bc9537feb 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 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/darwin-i386-cc/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/ssl.h index 92aba6debb6b00..0f1915755ae8a4 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 @@ -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/darwin-i386-cc/no-asm/include/openssl/x509.h b/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/x509.h +++ b/deps/openssl/config/archs/darwin-i386-cc/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 c6fc4d1f632325..7b2137c810ae7f 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -258,11 +258,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" => "darwin64-arm64-cc", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "ar", @@ -1245,6 +1245,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" }, @@ -1290,6 +1293,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2864,6 +2870,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" ], @@ -5207,6 +5216,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" ], @@ -7579,6 +7591,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" @@ -7643,6 +7658,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -7986,6 +8005,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", @@ -8003,10 +8025,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" => [ @@ -10446,7 +10465,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" => [ @@ -11766,6 +11785,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" ], @@ -14109,6 +14131,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" ], @@ -16380,6 +16405,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", @@ -18500,6 +18526,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/evp_pkey_ctx_new_from_name" => [ + "include", + "apps/include" + ], "test/evp_pkey_dparams_test" => [ "include", "apps/include" @@ -18687,6 +18717,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19370,6 +19404,7 @@ our %unified_info = ( "doc/man/man3/OPENSSL_malloc.3", "doc/man/man3/OPENSSL_s390xcap.3", "doc/man/man3/OPENSSL_secure_malloc.3", + "doc/man/man3/OPENSSL_strcasecmp.3", "doc/man/man3/OSSL_CMP_CTX_new.3", "doc/man/man3/OSSL_CMP_HDR_get0_transactionID.3", "doc/man/man3/OSSL_CMP_ITAV_set0.3", @@ -19992,6 +20027,7 @@ our %unified_info = ( "test/evp_fetch_prov_test", "test/evp_kdf_test", "test/evp_libctx_test", + "test/evp_pkey_ctx_new_from_name", "test/evp_pkey_dparams_test", "test/evp_pkey_provided_test", "test/evp_test", @@ -20007,6 +20043,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26375,6 +26412,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" ], @@ -26564,6 +26607,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" ], @@ -27278,8 +27327,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); @@ -27306,7 +27355,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"; @@ -27323,8 +27372,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/darwin64-arm64-cc/asm/crypto/buildinf.h b/deps/openssl/config/archs/darwin64-arm64-cc/asm/crypto/buildinf.h index ba0ae97fbb09c6..06850343108ba3 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: Thu May 5 17:04:06 2022 UTC" +#define DATE "built on: Mon May 9 17:37:53 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/crypto.h b/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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/darwin64-arm64-cc/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/opensslv.h index ee2b0c90bf6199..1b853bc9537feb 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 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/darwin64-arm64-cc/asm/include/openssl/ssl.h b/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/ssl.h index 92aba6debb6b00..0f1915755ae8a4 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 @@ -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/darwin64-arm64-cc/asm/include/openssl/x509.h b/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/x509.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 f9e522d4053e43..9515f877ab0a08 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -258,11 +258,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" => "darwin64-arm64-cc", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "ar", @@ -1245,6 +1245,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" }, @@ -1290,6 +1293,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2864,6 +2870,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" ], @@ -5207,6 +5216,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" ], @@ -7579,6 +7591,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" @@ -7643,6 +7658,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -10446,7 +10465,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" => [ @@ -11766,6 +11785,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" ], @@ -14109,6 +14131,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" ], @@ -16380,6 +16405,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", @@ -18500,6 +18526,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/evp_pkey_ctx_new_from_name" => [ + "include", + "apps/include" + ], "test/evp_pkey_dparams_test" => [ "include", "apps/include" @@ -18687,6 +18717,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19370,6 +19404,7 @@ our %unified_info = ( "doc/man/man3/OPENSSL_malloc.3", "doc/man/man3/OPENSSL_s390xcap.3", "doc/man/man3/OPENSSL_secure_malloc.3", + "doc/man/man3/OPENSSL_strcasecmp.3", "doc/man/man3/OSSL_CMP_CTX_new.3", "doc/man/man3/OSSL_CMP_HDR_get0_transactionID.3", "doc/man/man3/OSSL_CMP_ITAV_set0.3", @@ -19992,6 +20027,7 @@ our %unified_info = ( "test/evp_fetch_prov_test", "test/evp_kdf_test", "test/evp_libctx_test", + "test/evp_pkey_ctx_new_from_name", "test/evp_pkey_dparams_test", "test/evp_pkey_provided_test", "test/evp_test", @@ -20007,6 +20043,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26375,6 +26412,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" ], @@ -26564,6 +26607,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" ], @@ -27278,8 +27327,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); @@ -27306,7 +27355,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"; @@ -27323,8 +27372,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/darwin64-arm64-cc/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/crypto/buildinf.h index 0384f7333b76fc..69a043045b30e6 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: Thu May 5 17:04:21 2022 UTC" +#define DATE "built on: Mon May 9 17:38:02 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/crypto.h b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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/darwin64-arm64-cc/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/opensslv.h index ee2b0c90bf6199..1b853bc9537feb 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 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/darwin64-arm64-cc/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/ssl.h index 92aba6debb6b00..0f1915755ae8a4 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 @@ -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/darwin64-arm64-cc/asm_avx2/include/openssl/x509.h b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/x509.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 2218c56cac699a..dd8742a2c53914 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -258,11 +258,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" => "darwin64-arm64-cc", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "ar", @@ -1246,6 +1246,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" }, @@ -1291,6 +1294,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2835,6 +2841,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" ], @@ -5178,6 +5187,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" ], @@ -7550,6 +7562,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" @@ -7614,6 +7629,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -7957,6 +7976,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", @@ -7974,10 +7996,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" => [ @@ -9650,10 +9669,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" => [ @@ -10393,7 +10412,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" => [ @@ -11713,6 +11732,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" ], @@ -14056,6 +14078,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" ], @@ -16327,6 +16352,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", @@ -18384,6 +18410,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" @@ -18571,6 +18601,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19254,6 +19288,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", @@ -19876,6 +19911,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", @@ -19891,6 +19927,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26163,6 +26200,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" ], @@ -26352,6 +26395,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" ], @@ -27069,8 +27118,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); @@ -27097,7 +27146,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"; @@ -27114,8 +27163,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/darwin64-arm64-cc/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/crypto/buildinf.h index 12dcfde85d29c1..e006c20af3173e 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: Thu May 5 17:04:38 2022 UTC" +#define DATE "built on: Mon May 9 17:38:11 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/crypto.h b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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/darwin64-arm64-cc/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/opensslv.h index ee2b0c90bf6199..1b853bc9537feb 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 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/darwin64-arm64-cc/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/ssl.h index 92aba6debb6b00..0f1915755ae8a4 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 @@ -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/darwin64-arm64-cc/no-asm/include/openssl/x509.h b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/x509.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 d7a6fea7f97318..d489a703d2ccb0 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -258,11 +258,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" => "darwin64-x86_64-cc", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "ar", @@ -1245,6 +1245,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" }, @@ -1290,6 +1293,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2894,6 +2900,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" ], @@ -5237,6 +5246,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" ], @@ -7609,6 +7621,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" @@ -7673,6 +7688,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -9777,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" => [ @@ -10520,7 +10539,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" => [ @@ -11840,6 +11859,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" ], @@ -14183,6 +14205,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" ], @@ -16454,6 +16479,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", @@ -18511,6 +18537,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" @@ -18698,6 +18728,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19381,6 +19415,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", @@ -20003,6 +20038,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", @@ -20018,6 +20054,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26518,6 +26555,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" ], @@ -26707,6 +26750,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" ], @@ -27421,8 +27470,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); @@ -27449,7 +27498,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"; @@ -27466,8 +27515,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/darwin64-x86_64-cc/asm/crypto/buildinf.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/buildinf.h index 42fa792b83e07f..cce089437607f7 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: Thu May 5 17:02:29 2022 UTC" +#define DATE "built on: Mon May 9 17:36:56 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/crypto.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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/darwin64-x86_64-cc/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/opensslv.h index ee2b0c90bf6199..1b853bc9537feb 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 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/darwin64-x86_64-cc/asm/include/openssl/ssl.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/ssl.h index 92aba6debb6b00..0f1915755ae8a4 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 @@ -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/darwin64-x86_64-cc/asm/include/openssl/x509.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/x509.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 94db92a837645a..2ed2894565f789 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -258,11 +258,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" => "darwin64-x86_64-cc", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "ar", @@ -1245,6 +1245,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" }, @@ -1290,6 +1293,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2894,6 +2900,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" ], @@ -5237,6 +5246,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" ], @@ -7609,6 +7621,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" @@ -7673,6 +7688,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -8016,9 +8035,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 +8052,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" => [ @@ -9777,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/libfips-lib-self_test_kats.o", + "providers/fips/fips-dso-fips_entry.o" ], "products" => { "dso" => [ @@ -10520,7 +10539,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" => [ @@ -11840,6 +11859,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" ], @@ -14183,6 +14205,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" ], @@ -16454,6 +16479,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", @@ -18511,6 +18537,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" @@ -18698,6 +18728,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19381,6 +19415,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", @@ -20003,6 +20038,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", @@ -20018,6 +20054,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26518,6 +26555,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" ], @@ -26707,6 +26750,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" ], @@ -27421,8 +27470,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); @@ -27449,7 +27498,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"; @@ -27466,8 +27515,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/darwin64-x86_64-cc/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/buildinf.h index bf7ecb43cf4f13..c0e1c8b6fa012b 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: Thu May 5 17:02:48 2022 UTC" +#define DATE "built on: Mon May 9 17:37:08 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/crypto.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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/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 ee2b0c90bf6199..1b853bc9537feb 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 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/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 92aba6debb6b00..0f1915755ae8a4 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 @@ -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/darwin64-x86_64-cc/asm_avx2/include/openssl/x509.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/x509.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 9bb9d12a68bf19..79bc6dee0a8097 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -258,11 +258,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" => "darwin64-x86_64-cc", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "ar", @@ -1246,6 +1246,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" }, @@ -1291,6 +1294,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2835,6 +2841,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" ], @@ -5178,6 +5187,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" ], @@ -7550,6 +7562,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" @@ -7614,6 +7629,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -7957,6 +7976,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", @@ -7974,10 +7996,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" => [ @@ -10393,7 +10412,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" => [ @@ -11713,6 +11732,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" ], @@ -14056,6 +14078,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" ], @@ -16327,6 +16352,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", @@ -18384,6 +18410,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" @@ -18571,6 +18601,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19254,6 +19288,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", @@ -19876,6 +19911,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", @@ -19891,6 +19927,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26163,6 +26200,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" ], @@ -26352,6 +26395,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" ], @@ -27069,8 +27118,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); @@ -27097,7 +27146,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"; @@ -27114,8 +27163,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/darwin64-x86_64-cc/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/buildinf.h index c39c5a6dacc8a3..0119cc4add4318 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: Thu May 5 17:03:07 2022 UTC" +#define DATE "built on: Mon May 9 17:37:19 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/crypto.h b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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/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 ee2b0c90bf6199..1b853bc9537feb 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 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/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 92aba6debb6b00..0f1915755ae8a4 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 @@ -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/darwin64-x86_64-cc/no-asm/include/openssl/x509.h b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/x509.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 diff --git a/deps/openssl/config/archs/linux-aarch64/asm/configdata.pm b/deps/openssl/config/archs/linux-aarch64/asm/configdata.pm index ea815f0305c84a..d61e5214498e8e 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "15 Mar 2022", + "release_date" => "3 May 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux-aarch64", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "ar", @@ -1252,6 +1252,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" }, @@ -1297,6 +1300,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2871,6 +2877,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" ], @@ -5214,6 +5223,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" ], @@ -7594,6 +7606,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" @@ -7658,6 +7673,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -10462,7 +10481,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" => [ @@ -11782,6 +11801,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" ], @@ -14125,6 +14147,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" ], @@ -16413,6 +16438,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", @@ -18541,6 +18567,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" @@ -18728,6 +18758,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19411,6 +19445,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", @@ -20033,6 +20068,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", @@ -20048,6 +20084,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26418,6 +26455,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" ], @@ -26607,6 +26650,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" ], @@ -27322,8 +27371,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); @@ -27350,7 +27399,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"; @@ -27367,8 +27416,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/linux-aarch64/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-aarch64/asm/crypto/buildinf.h index 784cd9fb60b6a7..de37579ddcfc92 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: Thu May 5 17:04:52 2022 UTC" +#define DATE "built on: Mon May 9 17:38:18 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/crypto.h b/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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/linux-aarch64/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/opensslv.h index ee2b0c90bf6199..1b853bc9537feb 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 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/linux-aarch64/asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/ssl.h index 92aba6debb6b00..0f1915755ae8a4 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 @@ -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/linux-aarch64/asm/include/openssl/x509.h b/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/x509.h +++ b/deps/openssl/config/archs/linux-aarch64/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 52edba89c21c51..ee320ff0c395eb 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "15 Mar 2022", + "release_date" => "3 May 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux-aarch64", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "ar", @@ -1252,6 +1252,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" }, @@ -1297,6 +1300,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2871,6 +2877,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" ], @@ -5214,6 +5223,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" ], @@ -7594,6 +7606,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" @@ -7658,6 +7673,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -8001,6 +8020,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 +8040,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" => [ @@ -9719,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" => [ @@ -10462,7 +10481,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" => [ @@ -11782,6 +11801,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" ], @@ -14125,6 +14147,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" ], @@ -16413,6 +16438,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", @@ -18541,6 +18567,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" @@ -18728,6 +18758,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19411,6 +19445,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", @@ -20033,6 +20068,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", @@ -20048,6 +20084,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26418,6 +26455,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" ], @@ -26607,6 +26650,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" ], @@ -27322,8 +27371,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); @@ -27350,7 +27399,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"; @@ -27367,8 +27416,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/linux-aarch64/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/buildinf.h index 30300afc83ee6c..2ace57310dae4b 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: Thu May 5 17:05:08 2022 UTC" +#define DATE "built on: Mon May 9 17:38:27 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/crypto.h b/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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/linux-aarch64/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/opensslv.h index ee2b0c90bf6199..1b853bc9537feb 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 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/linux-aarch64/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/ssl.h index 92aba6debb6b00..0f1915755ae8a4 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 @@ -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/linux-aarch64/asm_avx2/include/openssl/x509.h b/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/x509.h +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 78214a27c83ef8..df785e141d6819 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "15 Mar 2022", + "release_date" => "3 May 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux-aarch64", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "ar", @@ -1253,6 +1253,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" }, @@ -1298,6 +1301,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2842,6 +2848,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" ], @@ -5185,6 +5194,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" ], @@ -7565,6 +7577,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" @@ -7629,6 +7644,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -7972,9 +7991,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", @@ -7992,7 +8008,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" => [ @@ -9666,10 +9685,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" => [ @@ -10409,7 +10428,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" => [ @@ -11729,6 +11748,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" ], @@ -14072,6 +14094,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" ], @@ -16360,6 +16385,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", @@ -18425,6 +18451,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" @@ -18612,6 +18642,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19295,6 +19329,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", @@ -19917,6 +19952,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", @@ -19932,6 +19968,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26206,6 +26243,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" ], @@ -26395,6 +26438,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" ], @@ -27113,8 +27162,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); @@ -27141,7 +27190,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"; @@ -27158,8 +27207,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/linux-aarch64/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/buildinf.h index 35ef6b6706108b..0cff041c931970 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: Thu May 5 17:05:23 2022 UTC" +#define DATE "built on: Mon May 9 17:38:36 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/crypto.h b/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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/linux-aarch64/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/opensslv.h index ee2b0c90bf6199..1b853bc9537feb 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 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/linux-aarch64/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/ssl.h index 92aba6debb6b00..0f1915755ae8a4 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 @@ -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/linux-aarch64/no-asm/include/openssl/x509.h b/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/x509.h +++ b/deps/openssl/config/archs/linux-aarch64/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 diff --git a/deps/openssl/config/archs/linux-armv4/asm/configdata.pm b/deps/openssl/config/archs/linux-armv4/asm/configdata.pm index c9a974ab209705..016c9a4811ad8b 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "15 Mar 2022", + "release_date" => "3 May 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux-armv4", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "ar", @@ -1252,6 +1252,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" }, @@ -1297,6 +1300,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2880,6 +2886,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" ], @@ -5223,6 +5232,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" ], @@ -7603,6 +7615,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" @@ -7667,6 +7682,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -9731,10 +9750,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" => [ @@ -10474,7 +10493,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" => [ @@ -11794,6 +11813,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" ], @@ -14137,6 +14159,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" ], @@ -16425,6 +16450,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", @@ -18580,6 +18606,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" @@ -18767,6 +18797,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19450,6 +19484,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", @@ -20072,6 +20107,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", @@ -20087,6 +20123,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26469,6 +26506,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" ], @@ -26658,6 +26701,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" ], @@ -27373,8 +27422,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); @@ -27401,7 +27450,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"; @@ -27418,8 +27467,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/linux-armv4/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-armv4/asm/crypto/buildinf.h index 1ba4fe37788c96..5445868bfcd517 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: Thu May 5 17:05:37 2022 UTC" +#define DATE "built on: Mon May 9 17:38:44 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/crypto.h b/deps/openssl/config/archs/linux-armv4/asm/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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/linux-armv4/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-armv4/asm/include/openssl/opensslv.h index ee2b0c90bf6199..1b853bc9537feb 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 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/linux-armv4/asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux-armv4/asm/include/openssl/ssl.h index 92aba6debb6b00..0f1915755ae8a4 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 @@ -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/linux-armv4/asm/include/openssl/x509.h b/deps/openssl/config/archs/linux-armv4/asm/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/include/openssl/x509.h +++ b/deps/openssl/config/archs/linux-armv4/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 8b3799437226f7..84205ecef91ac1 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "15 Mar 2022", + "release_date" => "3 May 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux-armv4", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "ar", @@ -1252,6 +1252,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" }, @@ -1297,6 +1300,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2880,6 +2886,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" ], @@ -5223,6 +5232,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" ], @@ -7603,6 +7615,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" @@ -7667,6 +7682,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -8010,6 +8029,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", @@ -8027,10 +8049,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" => [ @@ -10474,7 +10493,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" => [ @@ -11794,6 +11813,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" ], @@ -14137,6 +14159,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" ], @@ -16425,6 +16450,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", @@ -18580,6 +18606,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" @@ -18767,6 +18797,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19450,6 +19484,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", @@ -20072,6 +20107,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", @@ -20087,6 +20123,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26469,6 +26506,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" ], @@ -26658,6 +26701,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" ], @@ -27373,8 +27422,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); @@ -27401,7 +27450,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"; @@ -27418,8 +27467,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/linux-armv4/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/buildinf.h index a4e264b9b340cb..7f6f2374eba650 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: Thu May 5 17:05:52 2022 UTC" +#define DATE "built on: Mon May 9 17:38:53 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/crypto.h b/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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/linux-armv4/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/opensslv.h index ee2b0c90bf6199..1b853bc9537feb 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 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/linux-armv4/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/ssl.h index 92aba6debb6b00..0f1915755ae8a4 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 @@ -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/linux-armv4/asm_avx2/include/openssl/x509.h b/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/x509.h +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 85a964b0d90a07..660f2b5812add2 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "15 Mar 2022", + "release_date" => "3 May 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux-armv4", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "ar", @@ -1253,6 +1253,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" }, @@ -1298,6 +1301,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2842,6 +2848,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" ], @@ -5185,6 +5194,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" ], @@ -7565,6 +7577,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" @@ -7629,6 +7644,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -10409,7 +10428,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" => [ @@ -11729,6 +11748,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" ], @@ -14072,6 +14094,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" ], @@ -16360,6 +16385,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", @@ -18425,6 +18451,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" @@ -18612,6 +18642,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19295,6 +19329,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", @@ -19917,6 +19952,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", @@ -19932,6 +19968,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26206,6 +26243,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" ], @@ -26395,6 +26438,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" ], @@ -27113,8 +27162,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); @@ -27141,7 +27190,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"; @@ -27158,8 +27207,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/linux-armv4/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-armv4/no-asm/crypto/buildinf.h index 4f448798c6294d..592b00b2777827 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: Thu May 5 17:06:08 2022 UTC" +#define DATE "built on: Mon May 9 17:39:02 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/crypto.h b/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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/linux-armv4/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/opensslv.h index ee2b0c90bf6199..1b853bc9537feb 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 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/linux-armv4/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/ssl.h index 92aba6debb6b00..0f1915755ae8a4 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 @@ -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/linux-armv4/no-asm/include/openssl/x509.h b/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/x509.h +++ b/deps/openssl/config/archs/linux-armv4/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 diff --git a/deps/openssl/config/archs/linux-elf/asm/configdata.pm b/deps/openssl/config/archs/linux-elf/asm/configdata.pm index 9af6916b659dac..55f714da160240 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -259,11 +259,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" => "linux-elf", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "ar", @@ -1251,6 +1251,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" }, @@ -1296,6 +1299,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2898,6 +2904,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" ], @@ -5241,6 +5250,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" ], @@ -7621,6 +7633,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" @@ -7685,6 +7700,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -8028,9 +8047,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", @@ -8048,7 +8064,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" => [ @@ -10491,7 +10510,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" => [ @@ -11811,6 +11830,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" ], @@ -14154,6 +14176,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" ], @@ -16442,6 +16467,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", @@ -18507,6 +18533,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" @@ -18694,6 +18724,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19377,6 +19411,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", @@ -19999,6 +20034,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", @@ -20014,6 +20050,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26392,6 +26429,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" ], @@ -26581,6 +26624,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" ], @@ -27296,8 +27345,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); @@ -27324,7 +27373,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"; @@ -27341,8 +27390,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/linux-elf/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-elf/asm/crypto/buildinf.h index 142e2f3351a7bb..05abbbccb19078 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: Thu May 5 17:06:22 2022 UTC" +#define DATE "built on: Mon May 9 17:39:10 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/crypto.h b/deps/openssl/config/archs/linux-elf/asm/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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/linux-elf/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-elf/asm/include/openssl/opensslv.h index ee2b0c90bf6199..1b853bc9537feb 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 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/linux-elf/asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux-elf/asm/include/openssl/ssl.h index 92aba6debb6b00..0f1915755ae8a4 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 @@ -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/linux-elf/asm/include/openssl/x509.h b/deps/openssl/config/archs/linux-elf/asm/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/linux-elf/asm/include/openssl/x509.h +++ b/deps/openssl/config/archs/linux-elf/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 4282d3fbbdb5ef..5822bf6671af8f 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -259,11 +259,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" => "linux-elf", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "ar", @@ -1251,6 +1251,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" }, @@ -1296,6 +1299,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2898,6 +2904,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" ], @@ -5241,6 +5250,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" ], @@ -7621,6 +7633,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" @@ -7685,6 +7700,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -10491,7 +10510,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" => [ @@ -11811,6 +11830,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" ], @@ -14154,6 +14176,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" ], @@ -16442,6 +16467,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", @@ -18507,6 +18533,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" @@ -18694,6 +18724,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19377,6 +19411,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", @@ -19999,6 +20034,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", @@ -20014,6 +20050,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26392,6 +26429,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" ], @@ -26581,6 +26624,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" ], @@ -27296,8 +27345,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); @@ -27324,7 +27373,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"; @@ -27341,8 +27390,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/linux-elf/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/buildinf.h index a88ff515261880..fc13e900422c7e 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: Thu May 5 17:06:37 2022 UTC" +#define DATE "built on: Mon May 9 17:39:20 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/crypto.h b/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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/linux-elf/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/opensslv.h index ee2b0c90bf6199..1b853bc9537feb 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 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/linux-elf/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/ssl.h index 92aba6debb6b00..0f1915755ae8a4 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 @@ -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/linux-elf/asm_avx2/include/openssl/x509.h b/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/x509.h +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 fad4f061b50429..bb73031f3754d1 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -259,11 +259,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" => "linux-elf", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "ar", @@ -1252,6 +1252,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" }, @@ -1297,6 +1300,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2841,6 +2847,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" ], @@ -5184,6 +5193,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" ], @@ -7564,6 +7576,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" @@ -7628,6 +7643,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -10408,7 +10427,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" => [ @@ -11728,6 +11747,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" ], @@ -14071,6 +14093,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" ], @@ -16359,6 +16384,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", @@ -18424,6 +18450,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" @@ -18611,6 +18641,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19294,6 +19328,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", @@ -19916,6 +19951,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", @@ -19931,6 +19967,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26205,6 +26242,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" ], @@ -26394,6 +26437,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" ], @@ -27112,8 +27161,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); @@ -27140,7 +27189,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"; @@ -27157,8 +27206,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/linux-elf/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-elf/no-asm/crypto/buildinf.h index d69fc95c5bdfa2..7c5e4cd773d53a 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: Thu May 5 17:06:53 2022 UTC" +#define DATE "built on: Mon May 9 17:39:29 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/crypto.h b/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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/linux-elf/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/opensslv.h index ee2b0c90bf6199..1b853bc9537feb 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 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/linux-elf/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/ssl.h index 92aba6debb6b00..0f1915755ae8a4 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 @@ -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/linux-elf/no-asm/include/openssl/x509.h b/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/x509.h +++ b/deps/openssl/config/archs/linux-elf/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/configdata.pm b/deps/openssl/config/archs/linux-ppc64le/asm/configdata.pm index 96cb7c95099b81..286847cce656bc 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "15 Mar 2022", + "release_date" => "3 May 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux-ppc64le", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "ar", @@ -1252,6 +1252,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" }, @@ -1297,6 +1300,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2876,6 +2882,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" ], @@ -5219,6 +5228,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" ], @@ -7599,6 +7611,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" @@ -7663,6 +7678,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -8006,9 +8025,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", @@ -8026,7 +8042,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" => [ @@ -10486,7 +10505,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" => [ @@ -11806,6 +11825,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" ], @@ -14149,6 +14171,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" ], @@ -16437,6 +16462,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", @@ -18502,6 +18528,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" @@ -18689,6 +18719,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19372,6 +19406,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", @@ -19994,6 +20029,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", @@ -20009,6 +20045,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26455,6 +26492,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" ], @@ -26644,6 +26687,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" ], @@ -27359,8 +27408,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); @@ -27387,7 +27436,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"; @@ -27404,8 +27453,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/linux-ppc64le/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-ppc64le/asm/crypto/buildinf.h index 82bbc45372c1ef..57d79622c58f6b 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: Thu May 5 17:08:01 2022 UTC" +#define DATE "built on: Mon May 9 17:40: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/include/openssl/crypto.h b/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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/linux-ppc64le/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/opensslv.h index ee2b0c90bf6199..1b853bc9537feb 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 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/linux-ppc64le/asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/ssl.h index 92aba6debb6b00..0f1915755ae8a4 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 @@ -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/linux-ppc64le/asm/include/openssl/x509.h b/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/x509.h +++ b/deps/openssl/config/archs/linux-ppc64le/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 8aed9446a1c2fa..282bbfb026572f 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "15 Mar 2022", + "release_date" => "3 May 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux-ppc64le", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "ar", @@ -1252,6 +1252,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" }, @@ -1297,6 +1300,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2876,6 +2882,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" ], @@ -5219,6 +5228,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" ], @@ -7599,6 +7611,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" @@ -7663,6 +7678,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -8006,9 +8025,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", @@ -8026,7 +8042,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" => [ @@ -9743,10 +9762,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" => [ @@ -10486,7 +10505,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" => [ @@ -11806,6 +11825,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" ], @@ -14149,6 +14171,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" ], @@ -16437,6 +16462,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", @@ -18502,6 +18528,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" @@ -18689,6 +18719,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19372,6 +19406,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", @@ -19994,6 +20029,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", @@ -20009,6 +20045,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26455,6 +26492,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" ], @@ -26644,6 +26687,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" ], @@ -27359,8 +27408,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); @@ -27387,7 +27436,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"; @@ -27404,8 +27453,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/linux-ppc64le/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/crypto/buildinf.h index d4d33120d4fbb4..5c349555c85d8c 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: Thu May 5 17:08:17 2022 UTC" +#define DATE "built on: Mon May 9 17:40:18 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/crypto.h b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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/linux-ppc64le/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/opensslv.h index ee2b0c90bf6199..1b853bc9537feb 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 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/linux-ppc64le/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/ssl.h index 92aba6debb6b00..0f1915755ae8a4 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 @@ -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/linux-ppc64le/asm_avx2/include/openssl/x509.h b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/x509.h +++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 3d5d56499970fe..7420b140b553fa 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "15 Mar 2022", + "release_date" => "3 May 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux-ppc64le", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "ar", @@ -1253,6 +1253,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" }, @@ -1298,6 +1301,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2842,6 +2848,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" ], @@ -5185,6 +5194,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" ], @@ -7565,6 +7577,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" @@ -7629,6 +7644,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -10409,7 +10428,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" => [ @@ -11729,6 +11748,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" ], @@ -14072,6 +14094,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" ], @@ -16360,6 +16385,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", @@ -18425,6 +18451,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" @@ -18612,6 +18642,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19295,6 +19329,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", @@ -19917,6 +19952,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", @@ -19932,6 +19968,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26206,6 +26243,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" ], @@ -26395,6 +26438,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" ], @@ -27113,8 +27162,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); @@ -27141,7 +27190,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"; @@ -27158,8 +27207,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/linux-ppc64le/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/buildinf.h index 71c3a1139c8926..4039a12c289523 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: Thu May 5 17:08:33 2022 UTC" +#define DATE "built on: Mon May 9 17:40:27 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/crypto.h b/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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/linux-ppc64le/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/opensslv.h index ee2b0c90bf6199..1b853bc9537feb 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 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/linux-ppc64le/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/ssl.h index 92aba6debb6b00..0f1915755ae8a4 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 @@ -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/linux-ppc64le/no-asm/include/openssl/x509.h b/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/x509.h +++ b/deps/openssl/config/archs/linux-ppc64le/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 d455b9ec34a237..d896f1ffe63983 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -259,11 +259,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" => "linux-x86_64", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "ar", @@ -1253,6 +1253,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" }, @@ -1298,6 +1301,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2902,6 +2908,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" ], @@ -5245,6 +5254,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" ], @@ -7625,6 +7637,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" @@ -7689,6 +7704,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -8032,6 +8051,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", @@ -8049,10 +8071,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" => [ @@ -9794,10 +9813,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" => [ @@ -10537,7 +10556,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" => [ @@ -11857,6 +11876,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" ], @@ -14200,6 +14222,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" ], @@ -16488,6 +16513,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", @@ -18553,6 +18579,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" @@ -18740,6 +18770,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19423,6 +19457,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", @@ -20045,6 +20080,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", @@ -20060,6 +20096,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26562,6 +26599,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" ], @@ -26751,6 +26794,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" ], @@ -27466,8 +27515,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); @@ -27494,7 +27543,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"; @@ -27511,8 +27560,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/linux-x86_64/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-x86_64/asm/crypto/buildinf.h index 1d61743a740904..3c8b57b900d485 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: Thu May 5 17:07:07 2022 UTC" +#define DATE "built on: Mon May 9 17:39:37 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/crypto.h b/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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/linux-x86_64/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/opensslv.h index ee2b0c90bf6199..1b853bc9537feb 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 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/linux-x86_64/asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/ssl.h index 92aba6debb6b00..0f1915755ae8a4 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 @@ -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/linux-x86_64/asm/include/openssl/x509.h b/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/x509.h +++ b/deps/openssl/config/archs/linux-x86_64/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 ee491cdac2a94d..cae04f2271dd47 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -259,11 +259,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" => "linux-x86_64", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "ar", @@ -1253,6 +1253,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" }, @@ -1298,6 +1301,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2902,6 +2908,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" ], @@ -5245,6 +5254,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" ], @@ -7625,6 +7637,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" @@ -7689,6 +7704,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -9794,10 +9813,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" => [ @@ -10537,7 +10556,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" => [ @@ -11857,6 +11876,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" ], @@ -14200,6 +14222,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" ], @@ -16488,6 +16513,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", @@ -18553,6 +18579,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" @@ -18740,6 +18770,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19423,6 +19457,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", @@ -20045,6 +20080,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", @@ -20060,6 +20096,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26562,6 +26599,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" ], @@ -26751,6 +26794,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" ], @@ -27466,8 +27515,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); @@ -27494,7 +27543,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"; @@ -27511,8 +27560,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/linux-x86_64/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/buildinf.h index 42692b84372595..11bf439cc0a1cc 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: Thu May 5 17:07:27 2022 UTC" +#define DATE "built on: Mon May 9 17:39:49 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/crypto.h b/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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/linux-x86_64/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/opensslv.h index ee2b0c90bf6199..1b853bc9537feb 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 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/linux-x86_64/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/ssl.h index 92aba6debb6b00..0f1915755ae8a4 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 @@ -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/linux-x86_64/asm_avx2/include/openssl/x509.h b/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/x509.h +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 824a35736f5b0f..af6e13f273b0d8 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -259,11 +259,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" => "linux-x86_64", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "ar", @@ -1254,6 +1254,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" }, @@ -1299,6 +1302,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2843,6 +2849,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" ], @@ -5186,6 +5195,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" ], @@ -7566,6 +7578,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" @@ -7630,6 +7645,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -7973,6 +7992,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", @@ -7990,10 +8012,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" => [ @@ -10410,7 +10429,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" => [ @@ -11730,6 +11749,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" ], @@ -14073,6 +14095,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" ], @@ -16361,6 +16386,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", @@ -18426,6 +18452,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" @@ -18613,6 +18643,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19296,6 +19330,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", @@ -19918,6 +19953,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", @@ -19933,6 +19969,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26207,6 +26244,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" ], @@ -26396,6 +26439,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" ], @@ -27114,8 +27163,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); @@ -27142,7 +27191,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"; @@ -27159,8 +27208,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/linux-x86_64/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/buildinf.h index 6d67218900ec1c..62d633d3d6d099 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: Thu May 5 17:07:46 2022 UTC" +#define DATE "built on: Mon May 9 17:40:01 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/crypto.h b/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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/linux-x86_64/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/opensslv.h index ee2b0c90bf6199..1b853bc9537feb 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 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/linux-x86_64/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/ssl.h index 92aba6debb6b00..0f1915755ae8a4 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 @@ -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/linux-x86_64/no-asm/include/openssl/x509.h b/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/x509.h +++ b/deps/openssl/config/archs/linux-x86_64/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 diff --git a/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm b/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm index 33840f8d707042..80d4faa1896220 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "15 Mar 2022", + "release_date" => "3 May 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux32-s390x", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "ar", @@ -1252,6 +1252,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" }, @@ -1297,6 +1300,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2883,6 +2889,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" ], @@ -5226,6 +5235,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" ], @@ -7606,6 +7618,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" @@ -7670,6 +7685,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -10468,7 +10487,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" => [ @@ -11788,6 +11807,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" ], @@ -14131,6 +14153,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" ], @@ -16419,6 +16444,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", @@ -18538,6 +18564,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" @@ -18725,6 +18755,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19408,6 +19442,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", @@ -20030,6 +20065,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", @@ -20045,6 +20081,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26391,6 +26428,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" ], @@ -26580,6 +26623,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" ], @@ -27295,8 +27344,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); @@ -27323,7 +27372,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"; @@ -27340,8 +27389,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/linux32-s390x/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux32-s390x/asm/crypto/buildinf.h index 4e01a8a6c246de..fe2f9a93591e4b 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: Thu May 5 17:08:47 2022 UTC" +#define DATE "built on: Mon May 9 17:40:35 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/crypto.h b/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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/linux32-s390x/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/opensslv.h index ee2b0c90bf6199..1b853bc9537feb 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 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/linux32-s390x/asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/ssl.h index 92aba6debb6b00..0f1915755ae8a4 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 @@ -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/linux32-s390x/asm/include/openssl/x509.h b/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/x509.h +++ b/deps/openssl/config/archs/linux32-s390x/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 8b952ef8550b70..d00612ad3ec5f1 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "15 Mar 2022", + "release_date" => "3 May 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux32-s390x", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "ar", @@ -1252,6 +1252,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" }, @@ -1297,6 +1300,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2883,6 +2889,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" ], @@ -5226,6 +5235,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" ], @@ -7606,6 +7618,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" @@ -7670,6 +7685,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -8013,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", @@ -8033,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" => [ @@ -9725,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/fips-dso-fips_entry.o" + "providers/fips/libfips-lib-self_test_kats.o" ], "products" => { "dso" => [ @@ -10468,7 +10487,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" => [ @@ -11788,6 +11807,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" ], @@ -14131,6 +14153,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" ], @@ -16419,6 +16444,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", @@ -18538,6 +18564,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" @@ -18725,6 +18755,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19408,6 +19442,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", @@ -20030,6 +20065,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", @@ -20045,6 +20081,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26391,6 +26428,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" ], @@ -26580,6 +26623,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" ], @@ -27295,8 +27344,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); @@ -27323,7 +27372,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"; @@ -27340,8 +27389,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/linux32-s390x/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/buildinf.h index 610c83cfaf90e5..d2b12ad2a11d6a 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: Thu May 5 17:09:03 2022 UTC" +#define DATE "built on: Mon May 9 17:40:44 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/crypto.h b/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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/linux32-s390x/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/opensslv.h index ee2b0c90bf6199..1b853bc9537feb 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 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/linux32-s390x/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/ssl.h index 92aba6debb6b00..0f1915755ae8a4 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 @@ -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/linux32-s390x/asm_avx2/include/openssl/x509.h b/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/x509.h +++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 ba204fc67acfb2..fed1c91e187173 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "15 Mar 2022", + "release_date" => "3 May 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux32-s390x", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "ar", @@ -1253,6 +1253,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" }, @@ -1298,6 +1301,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2842,6 +2848,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" ], @@ -5185,6 +5194,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" ], @@ -7565,6 +7577,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" @@ -7629,6 +7644,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -10409,7 +10428,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" => [ @@ -11729,6 +11748,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" ], @@ -14072,6 +14094,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" ], @@ -16360,6 +16385,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", @@ -18425,6 +18451,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" @@ -18612,6 +18642,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19295,6 +19329,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", @@ -19917,6 +19952,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", @@ -19932,6 +19968,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26206,6 +26243,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" ], @@ -26395,6 +26438,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" ], @@ -27113,8 +27162,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); @@ -27141,7 +27190,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"; @@ -27158,8 +27207,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/linux32-s390x/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/buildinf.h index 2b0e13b136c5d9..cad0e622d1e52c 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: Thu May 5 17:09:18 2022 UTC" +#define DATE "built on: Mon May 9 17:40:53 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/crypto.h b/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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/linux32-s390x/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/opensslv.h index ee2b0c90bf6199..1b853bc9537feb 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 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/linux32-s390x/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/ssl.h index 92aba6debb6b00..0f1915755ae8a4 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 @@ -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/linux32-s390x/no-asm/include/openssl/x509.h b/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/x509.h +++ b/deps/openssl/config/archs/linux32-s390x/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 diff --git a/deps/openssl/config/archs/linux64-mips64/asm/configdata.pm b/deps/openssl/config/archs/linux64-mips64/asm/configdata.pm index c1087582ab951e..9ebf75a1043ec2 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "15 Mar 2022", + "release_date" => "3 May 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux64-mips64", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "ar", @@ -1253,6 +1253,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" }, @@ -1298,6 +1301,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2864,6 +2870,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" ], @@ -5207,6 +5216,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" ], @@ -7587,6 +7599,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" @@ -7651,6 +7666,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -7994,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", @@ -8011,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" => [ @@ -9698,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" => [ @@ -10441,7 +10460,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" => [ @@ -11761,6 +11780,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" ], @@ -14104,6 +14126,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" ], @@ -16392,6 +16417,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", @@ -18502,6 +18528,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" @@ -18689,6 +18719,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19372,6 +19406,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", @@ -19994,6 +20029,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", @@ -20009,6 +20045,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26323,6 +26360,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" ], @@ -26512,6 +26555,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" ], @@ -27227,8 +27276,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); @@ -27255,7 +27304,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"; @@ -27272,8 +27321,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/linux64-mips64/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux64-mips64/asm/crypto/buildinf.h index ebbe0c1f435325..8f5276ac18b54f 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: Thu May 5 17:10:16 2022 UTC" +#define DATE "built on: Mon May 9 17:41:27 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/crypto.h b/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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/linux64-mips64/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/opensslv.h index ee2b0c90bf6199..1b853bc9537feb 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 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/linux64-mips64/asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/ssl.h index 92aba6debb6b00..0f1915755ae8a4 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 @@ -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/linux64-mips64/asm/include/openssl/x509.h b/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/x509.h +++ b/deps/openssl/config/archs/linux64-mips64/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 cecba70f6d23b4..020bc310d1a689 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "15 Mar 2022", + "release_date" => "3 May 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux64-mips64", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "ar", @@ -1253,6 +1253,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" }, @@ -1298,6 +1301,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2864,6 +2870,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" ], @@ -5207,6 +5216,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" ], @@ -7587,6 +7599,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" @@ -7651,6 +7666,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -10441,7 +10460,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" => [ @@ -11761,6 +11780,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" ], @@ -14104,6 +14126,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" ], @@ -16392,6 +16417,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", @@ -18502,6 +18528,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" @@ -18689,6 +18719,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19372,6 +19406,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", @@ -19994,6 +20029,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", @@ -20009,6 +20045,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26323,6 +26360,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" ], @@ -26512,6 +26555,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" ], @@ -27227,8 +27276,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); @@ -27255,7 +27304,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"; @@ -27272,8 +27321,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/linux64-mips64/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux64-mips64/asm_avx2/crypto/buildinf.h index 798b6b93edd181..5e236ae89919be 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: Thu May 5 17:10:30 2022 UTC" +#define DATE "built on: Mon May 9 17:41:35 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/crypto.h b/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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/linux64-mips64/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/opensslv.h index ee2b0c90bf6199..1b853bc9537feb 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 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/linux64-mips64/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/ssl.h index 92aba6debb6b00..0f1915755ae8a4 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 @@ -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/linux64-mips64/asm_avx2/include/openssl/x509.h b/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/x509.h +++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 67b686643e0d88..735a59b448256a 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "15 Mar 2022", + "release_date" => "3 May 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux64-mips64", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "ar", @@ -1254,6 +1254,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" }, @@ -1299,6 +1302,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2843,6 +2849,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" ], @@ -5186,6 +5195,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" ], @@ -7566,6 +7578,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" @@ -7630,6 +7645,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -7973,6 +7992,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", @@ -7990,10 +8012,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" => [ @@ -10410,7 +10429,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" => [ @@ -11730,6 +11749,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" ], @@ -14073,6 +14095,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" ], @@ -16361,6 +16386,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", @@ -18426,6 +18452,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" @@ -18613,6 +18643,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19296,6 +19330,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", @@ -19918,6 +19953,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", @@ -19933,6 +19969,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26207,6 +26244,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" ], @@ -26396,6 +26439,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" ], @@ -27114,8 +27163,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); @@ -27142,7 +27191,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"; @@ -27159,8 +27208,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/linux64-mips64/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux64-mips64/no-asm/crypto/buildinf.h index 0ed4965accff25..694853fc956380 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: Thu May 5 17:10:44 2022 UTC" +#define DATE "built on: Mon May 9 17:41:43 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/crypto.h b/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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/linux64-mips64/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/opensslv.h index ee2b0c90bf6199..1b853bc9537feb 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 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/linux64-mips64/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/ssl.h index 92aba6debb6b00..0f1915755ae8a4 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 @@ -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/linux64-mips64/no-asm/include/openssl/x509.h b/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/x509.h +++ b/deps/openssl/config/archs/linux64-mips64/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 dc3363b627a68c..5ff41cc62f0be4 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "15 Mar 2022", + "release_date" => "3 May 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux64-riscv64", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "ar", @@ -1252,6 +1252,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" }, @@ -1297,6 +1300,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2841,6 +2847,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" ], @@ -5184,6 +5193,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" ], @@ -7564,6 +7576,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" @@ -7628,6 +7643,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -7971,6 +7990,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", @@ -7988,10 +8010,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" => [ @@ -10408,7 +10427,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" => [ @@ -11728,6 +11747,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" ], @@ -14071,6 +14093,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" ], @@ -16359,6 +16384,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", @@ -18424,6 +18450,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" @@ -18611,6 +18641,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19294,6 +19328,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", @@ -19916,6 +19951,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", @@ -19931,6 +19967,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26205,6 +26242,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" ], @@ -26394,6 +26437,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" ], @@ -27112,8 +27161,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); @@ -27140,7 +27189,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"; @@ -27157,8 +27206,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/linux64-riscv64/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux64-riscv64/no-asm/crypto/buildinf.h index 141d283a7dac04..1eedcc718d3b2d 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: Thu May 5 17:14:27 2022 UTC" +#define DATE "built on: Mon May 9 17:43:51 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/crypto.h b/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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/linux64-riscv64/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/opensslv.h index ee2b0c90bf6199..1b853bc9537feb 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 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/linux64-riscv64/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/ssl.h index 92aba6debb6b00..0f1915755ae8a4 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 @@ -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/linux64-riscv64/no-asm/include/openssl/x509.h b/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/x509.h +++ b/deps/openssl/config/archs/linux64-riscv64/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 diff --git a/deps/openssl/config/archs/linux64-s390x/asm/configdata.pm b/deps/openssl/config/archs/linux64-s390x/asm/configdata.pm index a0adbe30169bcb..84b02a2950a8cb 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "15 Mar 2022", + "release_date" => "3 May 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux64-s390x", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "ar", @@ -1253,6 +1253,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" }, @@ -1298,6 +1301,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2884,6 +2890,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" ], @@ -5227,6 +5236,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" ], @@ -7607,6 +7619,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" @@ -7671,6 +7686,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -8014,9 +8033,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", @@ -8034,7 +8050,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" => [ @@ -9737,10 +9756,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" => [ @@ -10480,7 +10499,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" => [ @@ -11800,6 +11819,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" ], @@ -14143,6 +14165,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" ], @@ -16431,6 +16456,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", @@ -18550,6 +18576,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" @@ -18737,6 +18767,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19420,6 +19454,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", @@ -20042,6 +20077,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", @@ -20057,6 +20093,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26403,6 +26440,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" ], @@ -26592,6 +26635,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" ], @@ -27307,8 +27356,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); @@ -27335,7 +27384,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"; @@ -27352,8 +27401,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/linux64-s390x/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux64-s390x/asm/crypto/buildinf.h index 26e22e874f84c4..5f22a6ba06a47e 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: Thu May 5 17:09:32 2022 UTC" +#define DATE "built on: Mon May 9 17:41:01 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/crypto.h b/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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/linux64-s390x/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/opensslv.h index ee2b0c90bf6199..1b853bc9537feb 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 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/linux64-s390x/asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/ssl.h index 92aba6debb6b00..0f1915755ae8a4 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 @@ -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/linux64-s390x/asm/include/openssl/x509.h b/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/x509.h +++ b/deps/openssl/config/archs/linux64-s390x/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 b074e70e3476cb..3eac8fdad3c7b8 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "15 Mar 2022", + "release_date" => "3 May 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux64-s390x", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "ar", @@ -1253,6 +1253,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" }, @@ -1298,6 +1301,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2884,6 +2890,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" ], @@ -5227,6 +5236,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" ], @@ -7607,6 +7619,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" @@ -7671,6 +7686,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -10480,7 +10499,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" => [ @@ -11800,6 +11819,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" ], @@ -14143,6 +14165,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" ], @@ -16431,6 +16456,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", @@ -18550,6 +18576,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" @@ -18737,6 +18767,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19420,6 +19454,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", @@ -20042,6 +20077,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", @@ -20057,6 +20093,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26403,6 +26440,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" ], @@ -26592,6 +26635,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" ], @@ -27307,8 +27356,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); @@ -27335,7 +27384,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"; @@ -27352,8 +27401,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/linux64-s390x/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/buildinf.h index 43f011458a1387..39794b93c2ec93 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: Thu May 5 17:09:47 2022 UTC" +#define DATE "built on: Mon May 9 17:41:10 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/crypto.h b/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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/linux64-s390x/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/opensslv.h index ee2b0c90bf6199..1b853bc9537feb 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 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/linux64-s390x/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/ssl.h index 92aba6debb6b00..0f1915755ae8a4 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 @@ -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/linux64-s390x/asm_avx2/include/openssl/x509.h b/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/x509.h +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 1f1e4501c52695..5658725ee32bd6 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "15 Mar 2022", + "release_date" => "3 May 2022", "shlib_version" => "81.3", "sourcedir" => ".", "target" => "linux64-s390x", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "ar", @@ -1254,6 +1254,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" }, @@ -1299,6 +1302,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2843,6 +2849,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" ], @@ -5186,6 +5195,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" ], @@ -7566,6 +7578,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" @@ -7630,6 +7645,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -7973,6 +7992,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", @@ -7990,10 +8012,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" => [ @@ -10410,7 +10429,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" => [ @@ -11730,6 +11749,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" ], @@ -14073,6 +14095,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" ], @@ -16361,6 +16386,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", @@ -18426,6 +18452,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" @@ -18613,6 +18643,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19296,6 +19330,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", @@ -19918,6 +19953,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", @@ -19933,6 +19969,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26207,6 +26244,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" ], @@ -26396,6 +26439,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" ], @@ -27114,8 +27163,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); @@ -27142,7 +27191,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"; @@ -27159,8 +27208,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/linux64-s390x/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/buildinf.h index 48a6e81989f556..d526ada05f133f 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: Thu May 5 17:10:02 2022 UTC" +#define DATE "built on: Mon May 9 17:41:19 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/crypto.h b/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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/linux64-s390x/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/opensslv.h index ee2b0c90bf6199..1b853bc9537feb 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 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/linux64-s390x/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/ssl.h index 92aba6debb6b00..0f1915755ae8a4 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 @@ -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/linux64-s390x/no-asm/include/openssl/x509.h b/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/x509.h +++ b/deps/openssl/config/archs/linux64-s390x/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 d6fa51177fa03e..50522132951c94 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -256,11 +256,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" => "solaris-x86-gcc", - "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" }, @@ -2891,6 +2897,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" ], @@ -5234,6 +5243,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" ], @@ -7614,6 +7626,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" @@ -7678,6 +7693,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -8021,9 +8040,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", @@ -8041,7 +8057,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" => [ @@ -10484,7 +10503,7 @@ our %unified_info = ( "crypto/chacha/chacha-c64xplus.S" => [ "crypto/chacha/asm/chacha-c64xplus.pl" ], - "crypto/chacha/chacha-ia64.S" => [ + "crypto/chacha/chacha-ia64.s" => [ "crypto/chacha/asm/chacha-ia64.pl" ], "crypto/chacha/chacha-ppc.s" => [ @@ -11804,6 +11823,9 @@ our %unified_info = ( "doc/html/man3/OPENSSL_secure_malloc.html" => [ "doc/man3/OPENSSL_secure_malloc.pod" ], + "doc/html/man3/OPENSSL_strcasecmp.html" => [ + "doc/man3/OPENSSL_strcasecmp.pod" + ], "doc/html/man3/OSSL_CMP_CTX_new.html" => [ "doc/man3/OSSL_CMP_CTX_new.pod" ], @@ -14147,6 +14169,9 @@ our %unified_info = ( "doc/man/man3/OPENSSL_secure_malloc.3" => [ "doc/man3/OPENSSL_secure_malloc.pod" ], + "doc/man/man3/OPENSSL_strcasecmp.3" => [ + "doc/man3/OPENSSL_strcasecmp.pod" + ], "doc/man/man3/OSSL_CMP_CTX_new.3" => [ "doc/man3/OSSL_CMP_CTX_new.pod" ], @@ -16435,6 +16460,7 @@ our %unified_info = ( "doc/html/man3/OPENSSL_malloc.html", "doc/html/man3/OPENSSL_s390xcap.html", "doc/html/man3/OPENSSL_secure_malloc.html", + "doc/html/man3/OPENSSL_strcasecmp.html", "doc/html/man3/OSSL_CMP_CTX_new.html", "doc/html/man3/OSSL_CMP_HDR_get0_transactionID.html", "doc/html/man3/OSSL_CMP_ITAV_set0.html", @@ -18500,6 +18526,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/evp_pkey_ctx_new_from_name" => [ + "include", + "apps/include" + ], "test/evp_pkey_dparams_test" => [ "include", "apps/include" @@ -18687,6 +18717,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19370,6 +19404,7 @@ our %unified_info = ( "doc/man/man3/OPENSSL_malloc.3", "doc/man/man3/OPENSSL_s390xcap.3", "doc/man/man3/OPENSSL_secure_malloc.3", + "doc/man/man3/OPENSSL_strcasecmp.3", "doc/man/man3/OSSL_CMP_CTX_new.3", "doc/man/man3/OSSL_CMP_HDR_get0_transactionID.3", "doc/man/man3/OSSL_CMP_ITAV_set0.3", @@ -19992,6 +20027,7 @@ our %unified_info = ( "test/evp_fetch_prov_test", "test/evp_kdf_test", "test/evp_libctx_test", + "test/evp_pkey_ctx_new_from_name", "test/evp_pkey_dparams_test", "test/evp_pkey_provided_test", "test/evp_test", @@ -20007,6 +20043,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26385,6 +26422,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" ], @@ -26574,6 +26617,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" ], @@ -27289,8 +27338,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); @@ -27317,7 +27366,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"; @@ -27334,8 +27383,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/solaris-x86-gcc/asm/crypto/buildinf.h b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/buildinf.h index 50fd6b7c172da1..13cd5d6f42e379 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: Thu May 5 17:10:58 2022 UTC" +#define DATE "built on: Mon May 9 17:41: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/asm/include/openssl/crypto.h b/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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/solaris-x86-gcc/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/opensslv.h index ee2b0c90bf6199..1b853bc9537feb 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 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/solaris-x86-gcc/asm/include/openssl/ssl.h b/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/ssl.h index 92aba6debb6b00..0f1915755ae8a4 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 @@ -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/solaris-x86-gcc/asm/include/openssl/x509.h b/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/x509.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 35851e95d46dda..f549adf0c9ac15 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -256,11 +256,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" => "solaris-x86-gcc", - "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" }, @@ -2891,6 +2897,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" ], @@ -5234,6 +5243,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" ], @@ -7614,6 +7626,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" @@ -7678,6 +7693,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -9741,10 +9760,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" => [ @@ -10484,7 +10503,7 @@ our %unified_info = ( "crypto/chacha/chacha-c64xplus.S" => [ "crypto/chacha/asm/chacha-c64xplus.pl" ], - "crypto/chacha/chacha-ia64.S" => [ + "crypto/chacha/chacha-ia64.s" => [ "crypto/chacha/asm/chacha-ia64.pl" ], "crypto/chacha/chacha-ppc.s" => [ @@ -11804,6 +11823,9 @@ our %unified_info = ( "doc/html/man3/OPENSSL_secure_malloc.html" => [ "doc/man3/OPENSSL_secure_malloc.pod" ], + "doc/html/man3/OPENSSL_strcasecmp.html" => [ + "doc/man3/OPENSSL_strcasecmp.pod" + ], "doc/html/man3/OSSL_CMP_CTX_new.html" => [ "doc/man3/OSSL_CMP_CTX_new.pod" ], @@ -14147,6 +14169,9 @@ our %unified_info = ( "doc/man/man3/OPENSSL_secure_malloc.3" => [ "doc/man3/OPENSSL_secure_malloc.pod" ], + "doc/man/man3/OPENSSL_strcasecmp.3" => [ + "doc/man3/OPENSSL_strcasecmp.pod" + ], "doc/man/man3/OSSL_CMP_CTX_new.3" => [ "doc/man3/OSSL_CMP_CTX_new.pod" ], @@ -16435,6 +16460,7 @@ our %unified_info = ( "doc/html/man3/OPENSSL_malloc.html", "doc/html/man3/OPENSSL_s390xcap.html", "doc/html/man3/OPENSSL_secure_malloc.html", + "doc/html/man3/OPENSSL_strcasecmp.html", "doc/html/man3/OSSL_CMP_CTX_new.html", "doc/html/man3/OSSL_CMP_HDR_get0_transactionID.html", "doc/html/man3/OSSL_CMP_ITAV_set0.html", @@ -18500,6 +18526,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/evp_pkey_ctx_new_from_name" => [ + "include", + "apps/include" + ], "test/evp_pkey_dparams_test" => [ "include", "apps/include" @@ -18687,6 +18717,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19370,6 +19404,7 @@ our %unified_info = ( "doc/man/man3/OPENSSL_malloc.3", "doc/man/man3/OPENSSL_s390xcap.3", "doc/man/man3/OPENSSL_secure_malloc.3", + "doc/man/man3/OPENSSL_strcasecmp.3", "doc/man/man3/OSSL_CMP_CTX_new.3", "doc/man/man3/OSSL_CMP_HDR_get0_transactionID.3", "doc/man/man3/OSSL_CMP_ITAV_set0.3", @@ -19992,6 +20027,7 @@ our %unified_info = ( "test/evp_fetch_prov_test", "test/evp_kdf_test", "test/evp_libctx_test", + "test/evp_pkey_ctx_new_from_name", "test/evp_pkey_dparams_test", "test/evp_pkey_provided_test", "test/evp_test", @@ -20007,6 +20043,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26385,6 +26422,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" ], @@ -26574,6 +26617,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" ], @@ -27289,8 +27338,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); @@ -27317,7 +27366,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"; @@ -27334,8 +27383,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/solaris-x86-gcc/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/buildinf.h index 067ad8a1f0e364..0c627f45452d73 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: Thu May 5 17:11:14 2022 UTC" +#define DATE "built on: Mon May 9 17:42:01 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/crypto.h b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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/solaris-x86-gcc/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/opensslv.h index ee2b0c90bf6199..1b853bc9537feb 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 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/solaris-x86-gcc/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/ssl.h index 92aba6debb6b00..0f1915755ae8a4 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 @@ -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/solaris-x86-gcc/asm_avx2/include/openssl/x509.h b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/x509.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 cd15624e3956ad..3e7587fee532b4 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -256,11 +256,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" => "solaris-x86-gcc", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "ar", @@ -1245,6 +1245,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" }, @@ -1290,6 +1293,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2834,6 +2840,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" ], @@ -5177,6 +5186,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" ], @@ -7557,6 +7569,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" @@ -7621,6 +7636,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", @@ -26198,6 +26235,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" ], @@ -26387,6 +26430,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" ], @@ -27105,8 +27154,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); @@ -27133,7 +27182,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"; @@ -27150,8 +27199,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/solaris-x86-gcc/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/crypto/buildinf.h index eb58dd9e81440f..015944e9f620a8 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: Thu May 5 17:11:29 2022 UTC" +#define DATE "built on: Mon May 9 17:42:10 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/crypto.h b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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/solaris-x86-gcc/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/opensslv.h index ee2b0c90bf6199..1b853bc9537feb 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 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/solaris-x86-gcc/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/ssl.h index 92aba6debb6b00..0f1915755ae8a4 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 @@ -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/solaris-x86-gcc/no-asm/include/openssl/x509.h b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/x509.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 44628dcf46538e..e7bd5fcea8ec9c 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -256,11 +256,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" => "solaris64-x86_64-gcc", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "ar", @@ -1245,6 +1245,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" }, @@ -1290,6 +1293,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2894,6 +2900,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" ], @@ -5237,6 +5246,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" ], @@ -7617,6 +7629,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" @@ -7681,6 +7696,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -9786,10 +9805,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" => [ @@ -10529,7 +10548,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" => [ @@ -11849,6 +11868,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" ], @@ -14192,6 +14214,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" ], @@ -16480,6 +16505,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", @@ -18545,6 +18571,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" @@ -18732,6 +18762,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19415,6 +19449,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", @@ -20037,6 +20072,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", @@ -20052,6 +20088,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26554,6 +26591,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" ], @@ -26743,6 +26786,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" ], @@ -27458,8 +27507,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); @@ -27486,7 +27535,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"; @@ -27503,8 +27552,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/solaris64-x86_64-gcc/asm/crypto/buildinf.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/buildinf.h index 3c7bdc428ba27f..783e35edc90cbf 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: Thu May 5 17:11:43 2022 UTC" +#define DATE "built on: Mon May 9 17:42:18 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/crypto.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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/solaris64-x86_64-gcc/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/opensslv.h index ee2b0c90bf6199..1b853bc9537feb 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 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/solaris64-x86_64-gcc/asm/include/openssl/ssl.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/ssl.h index 92aba6debb6b00..0f1915755ae8a4 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 @@ -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/solaris64-x86_64-gcc/asm/include/openssl/x509.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/x509.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 5482970e0ba5fc..c66b6d922ca6d5 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -256,11 +256,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" => "solaris64-x86_64-gcc", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "ar", @@ -1245,6 +1245,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" }, @@ -1290,6 +1293,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2894,6 +2900,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" ], @@ -5237,6 +5246,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" ], @@ -7617,6 +7629,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" @@ -7681,6 +7696,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -10529,7 +10548,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" => [ @@ -11849,6 +11868,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" ], @@ -14192,6 +14214,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" ], @@ -16480,6 +16505,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", @@ -18545,6 +18571,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" @@ -18732,6 +18762,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19415,6 +19449,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", @@ -20037,6 +20072,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", @@ -20052,6 +20088,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26554,6 +26591,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" ], @@ -26743,6 +26786,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" ], @@ -27458,8 +27507,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); @@ -27486,7 +27535,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"; @@ -27503,8 +27552,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/solaris64-x86_64-gcc/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/buildinf.h index b23b979e8393c6..3fe77726da57f3 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: Thu May 5 17:12:03 2022 UTC" +#define DATE "built on: Mon May 9 17:42:30 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/crypto.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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/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 ee2b0c90bf6199..1b853bc9537feb 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 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/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 92aba6debb6b00..0f1915755ae8a4 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 @@ -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/solaris64-x86_64-gcc/asm_avx2/include/openssl/x509.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/x509.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 0e3bfe2b97a2b4..bb25464a653800 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.2+quic", + "full_version" => "3.0.3+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" => "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", @@ -256,11 +256,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" => "solaris64-x86_64-gcc", - "version" => "3.0.2" + "version" => "3.0.3" ); our %target = ( "AR" => "ar", @@ -1246,6 +1246,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" }, @@ -1291,6 +1294,9 @@ our %unified_info = ( "test/lhash_test" => { "noinst" => "1" }, + "test/localetest" => { + "noinst" => "1" + }, "test/mdc2_internal_test" => { "noinst" => "1" }, @@ -2835,6 +2841,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" ], @@ -5178,6 +5187,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" ], @@ -7558,6 +7570,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" @@ -7622,6 +7637,10 @@ our %unified_info = ( "test/libtestutil.a" => [ "libcrypto" ], + "test/localetest" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/mdc2_internal_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -7965,6 +7984,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", @@ -7982,10 +8004,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" => [ @@ -9659,10 +9678,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" => [ @@ -10402,7 +10421,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" => [ @@ -11722,6 +11741,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" ], @@ -14065,6 +14087,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" ], @@ -16353,6 +16378,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", @@ -18418,6 +18444,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" @@ -18605,6 +18635,10 @@ our %unified_info = ( "apps/include", "." ], + "test/localetest" => [ + "include", + "apps/include" + ], "test/mdc2_internal_test" => [ ".", "include", @@ -19288,6 +19322,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", @@ -19910,6 +19945,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", @@ -19925,6 +19961,7 @@ our %unified_info = ( "test/igetest", "test/keymgmt_internal_test", "test/lhash_test", + "test/localetest", "test/mdc2_internal_test", "test/mdc2test", "test/memleaktest", @@ -26199,6 +26236,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" ], @@ -26388,6 +26431,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/solaris64-x86_64-gcc/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/crypto/buildinf.h index 7ee71dceb42661..6996194025d5e3 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: Thu May 5 17:12:23 2022 UTC" +#define DATE "built on: Mon May 9 17:42:42 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/crypto.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/crypto.h index 00d2496c1580c0..3f40be6d8c61d5 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 @@ -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/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 ee2b0c90bf6199..1b853bc9537feb 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 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/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 92aba6debb6b00..0f1915755ae8a4 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 @@ -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/solaris64-x86_64-gcc/no-asm/include/openssl/x509.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/x509.h index 9f195a3d84742e..1f7755e5b69c75 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/x509.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/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 /* OCSP_REQ_CTX_nbio_d2i */ +# include /* 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 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 00000000000000..79400c6472a49c --- /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 00000000000000..e7f2afa9872320 --- /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 00000000000000..cd9fc7cc706c37 --- /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 00000000000000..6ff4f574949bbd --- /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 00000000000000..dcece3cb4d6ebf --- /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 00000000000000..7c8a6dc96fc360 --- /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 00000000000000..33a00775c9fa76 --- /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 00000000000000..2712886cafcd78 --- /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 00000000000000..8ffad996047c5e --- /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 00000000000000..4103852ecb21c2 --- /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 00000000000000..6d0e701ebd3c19 --- /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 00000000000000..7ebb84387135be --- /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 00000000000000..bf482070474781 --- /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 00000000000000..64cc016225119f --- /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 00000000000000..c012013d98d4e8 --- /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 00000000000000..8d824f5cfe6274 --- /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 00000000000000..5b13afedf36bb6 --- /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 00000000000000..078cfba40fbe73 --- /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 00000000000000..2d7e2c08e99175 --- /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 00000000000000..b553f9d0f053b0 --- /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 00000000000000..989eafb33023b9 --- /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 00000000000000..9df42dad4c3127 --- /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 00000000000000..eb74ca98a9759a --- /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 00000000000000..f5edb766b4fc6c --- /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 00000000000000..ed28bd68cb2474 --- /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 00000000000000..9270a3ee09750a --- /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 00000000000000..5629ae9a3a90af --- /dev/null +++ b/deps/openssl/openssl/include/openssl/x509v3.h @@ -0,0 +1 @@ +#include "../../../config/x509v3.h"