From 5e910fc8a947d342e7352b79317ce2c61bf3f24b Mon Sep 17 00:00:00 2001 From: Tim Perry Date: Thu, 12 Mar 2026 18:18:22 +0100 Subject: [PATCH 1/4] deps: update OpenSSL build config to support compression --- deps/openssl/config/Makefile | 10 ++++++++-- deps/openssl/config/generate_gypi.pl | 17 +++++++++++++++++ deps/openssl/config/openssl.gypi.tmpl | 18 +++++++++++++++++- deps/openssl/openssl.gyp | 5 +++++ deps/openssl/openssl.gypi | 3 --- .../openssl-client-cert-engine/binding.gyp | 6 ++---- test/addons/openssl-key-engine/binding.gyp | 6 ++---- test/addons/openssl-test-engine/binding.gyp | 6 +----- 8 files changed, 52 insertions(+), 19 deletions(-) diff --git a/deps/openssl/config/Makefile b/deps/openssl/config/Makefile index 8fbc201ec44001..14336b843cf7d5 100644 --- a/deps/openssl/config/Makefile +++ b/deps/openssl/config/Makefile @@ -21,11 +21,17 @@ CC = gcc FAKE_GCC = ../config/fake_gcc.pl CONFIGURE = ./Configure -# no-comp: against CRIME attack # no-shared: openssl-cli needs static link # no-afalgeng: old Linux kernel < 4.0 does not support it # enable-ssl-trace: cause the optional SSL_trace API to be built -COPTS = no-comp no-shared no-afalgeng enable-ssl-trace enable-fips +# zlib/brotli/zstd: enable compression libraries for TLS certificate +# compression (RFC 8879). Record compression remains disabled at runtime +# via SSL_OP_NO_COMPRESSION and sk_SSL_COMP_zero() in crypto_util.cc. +# Include paths point to Node's bundled deps (relative to openssl/). +COPTS = no-shared no-afalgeng enable-ssl-trace enable-fips \ + zlib --with-zlib-include=../../zlib \ + enable-brotli --with-brotli-include=../../brotli/c/include \ + enable-zstd --with-zstd-include=../../zstd/lib # disable platform check in Configure NO_WARN_ENV = CONFIGURE_CHECKER_WARN=1 diff --git a/deps/openssl/config/generate_gypi.pl b/deps/openssl/config/generate_gypi.pl index 95373e5bc5626d..45a9306e17aa41 100755 --- a/deps/openssl/config/generate_gypi.pl +++ b/deps/openssl/config/generate_gypi.pl @@ -285,6 +285,21 @@ $target{'lib_cppflags'} =~ s/-D//g; my @lib_cppflags = split(/ /, $target{'lib_cppflags'}); +# Strip library flags for deps provided via GYP dependencies. +# zlib, brotli, and zstd are bundled in deps/ with proper GYP targets, +# so we must not link against system shared libraries. +$target{ex_libs} =~ s/-l(?:z|brotlienc|brotlidec|brotlicommon|zstd)\b//g; +$target{ex_libs} =~ s/\s+/ /g; +$target{ex_libs} =~ s/^\s+|\s+$//g; + +# Filter out bare ZLIB/BROTLI/ZSTD defines added by Configure for compression +# support. These are internal to OpenSSL and clash with identifiers in +# Node.js source (e.g. ZLIB in async_wrap.h) when propagated via +# direct_dependent_settings. They are kept in the main defines for OpenSSL's +# own compilation but excluded from the exported defines. +my @config_defines_exported = grep { $_ !~ /^(?:ZLIB|BROTLI|ZSTD)$/ } @{$config{defines}}; +my @target_defines_exported = grep { $_ !~ /^(?:ZLIB|BROTLI|ZSTD)$/ } @{$target{defines}}; + my @cflags = (); push(@cflags, @{$config{'cflags'}}); push(@cflags, @{$config{'CFLAGS'}}); @@ -315,6 +330,8 @@ arch => \$arch, lib_cppflags => \@lib_cppflags, is_win => \$is_win, + config_defines_exported => \@config_defines_exported, + target_defines_exported => \@target_defines_exported, }); open(GYPI, "> ./archs/$arch/$asm/openssl.gypi"); diff --git a/deps/openssl/config/openssl.gypi.tmpl b/deps/openssl/config/openssl.gypi.tmpl index 37399bb06cbbf0..cde6cf4a39e362 100644 --- a/deps/openssl/config/openssl.gypi.tmpl +++ b/deps/openssl/config/openssl.gypi.tmpl @@ -26,6 +26,22 @@ foreach $src (@libcrypto_srcs) { } foreach $define (@{$config{lib_defines}}) { $OUT .= " '$define',\n"; +} -%% ], + 'openssl_defines_exported_%%-$arch-%%': [ +%%- foreach $define (@config_defines_exported) { + $OUT .= " '$define',\n"; + } + foreach $define (@lib_cppflags) { + $OUT .= " '$define',\n"; + } + foreach $define (@target_defines_exported) { + $OUT .= " '$define',\n"; + } + foreach $define (@{lib_defines}) { + $OUT .= " '$define',\n"; + } + foreach $define (@{$config{lib_defines}}) { + $OUT .= " '$define',\n"; } -%% ], 'openssl_cflags_%%-$arch-%%': [ %%- foreach $cflag (@cflags) { @@ -50,6 +66,6 @@ foreach $src (@libcrypto_srcs) { 'sources': ['<@(openssl_sources)', '<@(openssl_sources_%%-$arch-%%)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_%%-$arch-%%)'], + 'defines': ['<@(openssl_defines_exported_%%-$arch-%%)'], }, } diff --git a/deps/openssl/openssl.gyp b/deps/openssl/openssl.gyp index ea3a2dc09ef29b..2f9d810d8f888d 100644 --- a/deps/openssl/openssl.gyp +++ b/deps/openssl/openssl.gyp @@ -19,6 +19,11 @@ { 'target_name': 'openssl', 'type': '<(library)', + 'dependencies': [ + '../zlib/zlib.gyp:zlib', + '../brotli/brotli.gyp:brotli', + '../zstd/zstd.gyp:zstd', + ], 'includes': ['./openssl_common.gypi'], 'defines': [ # Compile out hardware engines. Most are stubs that dynamically load diff --git a/deps/openssl/openssl.gypi b/deps/openssl/openssl.gypi index f590067c8d09c9..f3d32ffead5af6 100644 --- a/deps/openssl/openssl.gypi +++ b/deps/openssl/openssl.gypi @@ -1254,9 +1254,6 @@ # for reducing the overall entropy. 'PURIFY', - # Compression is not used and considered insecure (CRIME.) - 'OPENSSL_NO_COMP', - # SSLv3 is susceptible to downgrade attacks (POODLE.) 'OPENSSL_NO_SSL3', diff --git a/test/addons/openssl-client-cert-engine/binding.gyp b/test/addons/openssl-client-cert-engine/binding.gyp index 9d5f501fd633bc..726f135a4caf6a 100644 --- a/test/addons/openssl-client-cert-engine/binding.gyp +++ b/test/addons/openssl-client-cert-engine/binding.gyp @@ -13,10 +13,8 @@ 'sources': [ 'testengine.cc' ], 'product_extension': 'engine', 'include_dirs': ['../../../deps/openssl/openssl/include'], - 'link_settings': { - 'libraries': [ - '../../../../out/<(PRODUCT_DIR)/<(openssl_product)' - ] + 'xcode_settings': { + 'OTHER_LDFLAGS': ['-undefined', 'dynamic_lookup'], }, }], ] diff --git a/test/addons/openssl-key-engine/binding.gyp b/test/addons/openssl-key-engine/binding.gyp index 6f9a8c32c14e29..fc1fafa89babbb 100644 --- a/test/addons/openssl-key-engine/binding.gyp +++ b/test/addons/openssl-key-engine/binding.gyp @@ -13,10 +13,8 @@ 'sources': [ 'testkeyengine.cc' ], 'product_extension': 'engine', 'include_dirs': ['../../../deps/openssl/openssl/include'], - 'link_settings': { - 'libraries': [ - '../../../../out/<(PRODUCT_DIR)/<(openssl_product)' - ] + 'xcode_settings': { + 'OTHER_LDFLAGS': ['-undefined', 'dynamic_lookup'], }, }], ] diff --git a/test/addons/openssl-test-engine/binding.gyp b/test/addons/openssl-test-engine/binding.gyp index 132f39e621c316..fe18de701bbd17 100644 --- a/test/addons/openssl-test-engine/binding.gyp +++ b/test/addons/openssl-test-engine/binding.gyp @@ -17,11 +17,7 @@ ['OS=="mac"', { 'xcode_settings': { 'OTHER_CFLAGS': ['-Wno-deprecated-declarations'], - }, - 'link_settings': { - 'libraries': [ - '../../../../out/<(PRODUCT_DIR)/<(openssl_product)' - ] + 'OTHER_LDFLAGS': ['-undefined', 'dynamic_lookup'], }, }], ['OS=="linux"', { From f8244183388bb3d0f747e1d3562658d85b63b4e9 Mon Sep 17 00:00:00 2001 From: Tim Perry Date: Thu, 12 Mar 2026 18:18:56 +0100 Subject: [PATCH 2/4] Rebuild OpenSSL using new config --- .../config/archs/BSD-x86/asm/configdata.pm | 124 +++- .../archs/BSD-x86/asm/crypto/buildinf.h | 9 +- .../asm/include/openssl/configuration.h | 12 - .../config/archs/BSD-x86/asm/openssl-cl.gypi | 5 +- .../archs/BSD-x86/asm/openssl-fips.gypi | 5 +- .../config/archs/BSD-x86/asm/openssl.gypi | 38 +- .../archs/BSD-x86/asm_avx2/configdata.pm | 124 +++- .../archs/BSD-x86/asm_avx2/crypto/buildinf.h | 9 +- .../asm_avx2/include/openssl/configuration.h | 12 - .../archs/BSD-x86/asm_avx2/openssl-cl.gypi | 5 +- .../archs/BSD-x86/asm_avx2/openssl-fips.gypi | 5 +- .../archs/BSD-x86/asm_avx2/openssl.gypi | 38 +- .../config/archs/BSD-x86/no-asm/configdata.pm | 124 +++- .../archs/BSD-x86/no-asm/crypto/buildinf.h | 11 +- .../no-asm/include/openssl/configuration.h | 12 - .../archs/BSD-x86/no-asm/openssl-cl.gypi | 5 +- .../archs/BSD-x86/no-asm/openssl-fips.gypi | 5 +- .../config/archs/BSD-x86/no-asm/openssl.gypi | 18 +- .../config/archs/BSD-x86_64/asm/configdata.pm | 124 +++- .../archs/BSD-x86_64/asm/crypto/buildinf.h | 10 +- .../asm/include/openssl/configuration.h | 12 - .../archs/BSD-x86_64/asm/openssl-cl.gypi | 5 +- .../archs/BSD-x86_64/asm/openssl-fips.gypi | 5 +- .../config/archs/BSD-x86_64/asm/openssl.gypi | 39 +- .../archs/BSD-x86_64/asm_avx2/configdata.pm | 124 +++- .../BSD-x86_64/asm_avx2/crypto/buildinf.h | 11 +- .../asm_avx2/include/openssl/configuration.h | 12 - .../archs/BSD-x86_64/asm_avx2/openssl-cl.gypi | 5 +- .../BSD-x86_64/asm_avx2/openssl-fips.gypi | 5 +- .../archs/BSD-x86_64/asm_avx2/openssl.gypi | 39 +- .../archs/BSD-x86_64/no-asm/configdata.pm | 124 +++- .../archs/BSD-x86_64/no-asm/crypto/buildinf.h | 9 +- .../no-asm/include/openssl/configuration.h | 12 - .../archs/BSD-x86_64/no-asm/openssl-cl.gypi | 5 +- .../archs/BSD-x86_64/no-asm/openssl-fips.gypi | 5 +- .../archs/BSD-x86_64/no-asm/openssl.gypi | 18 +- .../config/archs/VC-WIN32/asm/configdata.pm | 124 +++- .../archs/VC-WIN32/asm/crypto/buildinf.h | 2 +- .../asm/include/openssl/configuration.h | 12 - .../config/archs/VC-WIN32/asm/openssl-cl.gypi | 5 +- .../archs/VC-WIN32/asm/openssl-fips.gypi | 5 +- .../config/archs/VC-WIN32/asm/openssl.gypi | 43 +- .../archs/VC-WIN32/asm_avx2/configdata.pm | 124 +++- .../archs/VC-WIN32/asm_avx2/crypto/buildinf.h | 2 +- .../asm_avx2/include/openssl/configuration.h | 12 - .../archs/VC-WIN32/asm_avx2/openssl-cl.gypi | 5 +- .../archs/VC-WIN32/asm_avx2/openssl-fips.gypi | 5 +- .../archs/VC-WIN32/asm_avx2/openssl.gypi | 43 +- .../archs/VC-WIN32/no-asm/configdata.pm | 124 +++- .../archs/VC-WIN32/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/configuration.h | 12 - .../archs/VC-WIN32/no-asm/openssl-cl.gypi | 5 +- .../archs/VC-WIN32/no-asm/openssl-fips.gypi | 5 +- .../config/archs/VC-WIN32/no-asm/openssl.gypi | 23 +- .../archs/VC-WIN64-ARM/no-asm/configdata.pm | 122 +++- .../VC-WIN64-ARM/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/configuration.h | 12 - .../archs/VC-WIN64-ARM/no-asm/openssl-cl.gypi | 3 + .../VC-WIN64-ARM/no-asm/openssl-fips.gypi | 3 + .../archs/VC-WIN64-ARM/no-asm/openssl.gypi | 23 +- .../config/archs/VC-WIN64A/asm/configdata.pm | 124 +++- .../archs/VC-WIN64A/asm/crypto/buildinf.h | 2 +- .../asm/include/openssl/configuration.h | 12 - .../archs/VC-WIN64A/asm/openssl-cl.gypi | 5 +- .../archs/VC-WIN64A/asm/openssl-fips.gypi | 5 +- .../config/archs/VC-WIN64A/asm/openssl.gypi | 44 +- .../archs/VC-WIN64A/asm_avx2/configdata.pm | 124 +++- .../VC-WIN64A/asm_avx2/crypto/buildinf.h | 2 +- .../asm_avx2/include/openssl/configuration.h | 12 - .../archs/VC-WIN64A/asm_avx2/openssl-cl.gypi | 5 +- .../VC-WIN64A/asm_avx2/openssl-fips.gypi | 5 +- .../archs/VC-WIN64A/asm_avx2/openssl.gypi | 44 +- .../archs/VC-WIN64A/no-asm/configdata.pm | 124 +++- .../archs/VC-WIN64A/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/configuration.h | 12 - .../archs/VC-WIN64A/no-asm/openssl-cl.gypi | 5 +- .../archs/VC-WIN64A/no-asm/openssl-fips.gypi | 5 +- .../archs/VC-WIN64A/no-asm/openssl.gypi | 23 +- .../archs/aix64-gcc-as/asm/configdata.pm | 691 +++++++++++++++++- .../archs/aix64-gcc-as/asm/crypto/buildinf.h | 9 +- .../asm/include/openssl/configuration.h | 12 - .../archs/aix64-gcc-as/asm/openssl-cl.gypi | 5 +- .../archs/aix64-gcc-as/asm/openssl-fips.gypi | 5 +- .../archs/aix64-gcc-as/asm/openssl.gypi | 29 +- .../archs/aix64-gcc-as/asm_avx2/configdata.pm | 124 +++- .../aix64-gcc-as/asm_avx2/crypto/buildinf.h | 10 +- .../asm_avx2/include/openssl/configuration.h | 12 - .../aix64-gcc-as/asm_avx2/openssl-cl.gypi | 5 +- .../aix64-gcc-as/asm_avx2/openssl-fips.gypi | 5 +- .../archs/aix64-gcc-as/asm_avx2/openssl.gypi | 29 +- .../archs/aix64-gcc-as/no-asm/configdata.pm | 124 +++- .../aix64-gcc-as/no-asm/crypto/buildinf.h | 9 +- .../no-asm/include/openssl/configuration.h | 12 - .../archs/aix64-gcc-as/no-asm/openssl-cl.gypi | 5 +- .../aix64-gcc-as/no-asm/openssl-fips.gypi | 5 +- .../archs/aix64-gcc-as/no-asm/openssl.gypi | 18 +- .../archs/darwin-i386-cc/asm/configdata.pm | 124 +++- .../darwin-i386-cc/asm/crypto/buildinf.h | 11 +- .../asm/include/openssl/configuration.h | 12 - .../archs/darwin-i386-cc/asm/openssl-cl.gypi | 5 +- .../darwin-i386-cc/asm/openssl-fips.gypi | 5 +- .../archs/darwin-i386-cc/asm/openssl.gypi | 38 +- .../darwin-i386-cc/asm_avx2/configdata.pm | 124 +++- .../darwin-i386-cc/asm_avx2/crypto/buildinf.h | 11 +- .../asm_avx2/include/openssl/configuration.h | 12 - .../darwin-i386-cc/asm_avx2/openssl-cl.gypi | 5 +- .../darwin-i386-cc/asm_avx2/openssl-fips.gypi | 5 +- .../darwin-i386-cc/asm_avx2/openssl.gypi | 38 +- .../archs/darwin-i386-cc/no-asm/configdata.pm | 124 +++- .../darwin-i386-cc/no-asm/crypto/buildinf.h | 9 +- .../no-asm/include/openssl/configuration.h | 12 - .../darwin-i386-cc/no-asm/openssl-cl.gypi | 5 +- .../darwin-i386-cc/no-asm/openssl-fips.gypi | 5 +- .../archs/darwin-i386-cc/no-asm/openssl.gypi | 18 +- .../archs/darwin64-arm64-cc/asm/configdata.pm | 124 +++- .../darwin64-arm64-cc/asm/crypto/buildinf.h | 11 +- .../asm/include/openssl/configuration.h | 12 - .../darwin64-arm64-cc/asm/openssl-cl.gypi | 5 +- .../darwin64-arm64-cc/asm/openssl-fips.gypi | 5 +- .../archs/darwin64-arm64-cc/asm/openssl.gypi | 33 +- .../darwin64-arm64-cc/asm_avx2/configdata.pm | 124 +++- .../asm_avx2/crypto/buildinf.h | 9 +- .../asm_avx2/include/openssl/configuration.h | 12 - .../asm_avx2/openssl-cl.gypi | 5 +- .../asm_avx2/openssl-fips.gypi | 5 +- .../darwin64-arm64-cc/asm_avx2/openssl.gypi | 33 +- .../darwin64-arm64-cc/no-asm/configdata.pm | 124 +++- .../no-asm/crypto/buildinf.h | 10 +- .../no-asm/include/openssl/configuration.h | 12 - .../darwin64-arm64-cc/no-asm/openssl-cl.gypi | 5 +- .../no-asm/openssl-fips.gypi | 5 +- .../darwin64-arm64-cc/no-asm/openssl.gypi | 18 +- .../darwin64-x86_64-cc/asm/configdata.pm | 124 +++- .../darwin64-x86_64-cc/asm/crypto/buildinf.h | 9 +- .../asm/include/openssl/configuration.h | 12 - .../darwin64-x86_64-cc/asm/openssl-cl.gypi | 5 +- .../darwin64-x86_64-cc/asm/openssl-fips.gypi | 5 +- .../archs/darwin64-x86_64-cc/asm/openssl.gypi | 39 +- .../darwin64-x86_64-cc/asm_avx2/configdata.pm | 124 +++- .../asm_avx2/crypto/buildinf.h | 9 +- .../asm_avx2/include/openssl/configuration.h | 12 - .../asm_avx2/openssl-cl.gypi | 5 +- .../asm_avx2/openssl-fips.gypi | 5 +- .../darwin64-x86_64-cc/asm_avx2/openssl.gypi | 39 +- .../darwin64-x86_64-cc/no-asm/configdata.pm | 124 +++- .../no-asm/crypto/buildinf.h | 11 +- .../no-asm/include/openssl/configuration.h | 12 - .../darwin64-x86_64-cc/no-asm/openssl-cl.gypi | 5 +- .../no-asm/openssl-fips.gypi | 5 +- .../darwin64-x86_64-cc/no-asm/openssl.gypi | 18 +- .../archs/linux-aarch64/asm/configdata.pm | 124 +++- .../archs/linux-aarch64/asm/crypto/buildinf.h | 10 +- .../asm/include/openssl/configuration.h | 12 - .../archs/linux-aarch64/asm/openssl-cl.gypi | 5 +- .../archs/linux-aarch64/asm/openssl-fips.gypi | 5 +- .../archs/linux-aarch64/asm/openssl.gypi | 33 +- .../linux-aarch64/asm_avx2/configdata.pm | 124 +++- .../linux-aarch64/asm_avx2/crypto/buildinf.h | 11 +- .../asm_avx2/include/openssl/configuration.h | 12 - .../linux-aarch64/asm_avx2/openssl-cl.gypi | 5 +- .../linux-aarch64/asm_avx2/openssl-fips.gypi | 5 +- .../archs/linux-aarch64/asm_avx2/openssl.gypi | 33 +- .../archs/linux-aarch64/no-asm/configdata.pm | 124 +++- .../linux-aarch64/no-asm/crypto/buildinf.h | 9 +- .../no-asm/include/openssl/configuration.h | 12 - .../linux-aarch64/no-asm/openssl-cl.gypi | 5 +- .../linux-aarch64/no-asm/openssl-fips.gypi | 5 +- .../archs/linux-aarch64/no-asm/openssl.gypi | 18 +- .../archs/linux-armv4/asm/configdata.pm | 124 +++- .../archs/linux-armv4/asm/crypto/buildinf.h | 10 +- .../asm/include/openssl/configuration.h | 12 - .../archs/linux-armv4/asm/openssl-cl.gypi | 5 +- .../archs/linux-armv4/asm/openssl-fips.gypi | 5 +- .../config/archs/linux-armv4/asm/openssl.gypi | 30 +- .../archs/linux-armv4/asm_avx2/configdata.pm | 124 +++- .../linux-armv4/asm_avx2/crypto/buildinf.h | 11 +- .../asm_avx2/include/openssl/configuration.h | 12 - .../linux-armv4/asm_avx2/openssl-cl.gypi | 5 +- .../linux-armv4/asm_avx2/openssl-fips.gypi | 5 +- .../archs/linux-armv4/asm_avx2/openssl.gypi | 30 +- .../archs/linux-armv4/no-asm/configdata.pm | 124 +++- .../linux-armv4/no-asm/crypto/buildinf.h | 9 +- .../no-asm/include/openssl/configuration.h | 12 - .../archs/linux-armv4/no-asm/openssl-cl.gypi | 5 +- .../linux-armv4/no-asm/openssl-fips.gypi | 5 +- .../archs/linux-armv4/no-asm/openssl.gypi | 18 +- .../config/archs/linux-elf/asm/configdata.pm | 124 +++- .../archs/linux-elf/asm/crypto/buildinf.h | 10 +- .../asm/include/openssl/configuration.h | 12 - .../archs/linux-elf/asm/openssl-cl.gypi | 5 +- .../archs/linux-elf/asm/openssl-fips.gypi | 5 +- .../config/archs/linux-elf/asm/openssl.gypi | 39 +- .../archs/linux-elf/asm_avx2/configdata.pm | 124 +++- .../linux-elf/asm_avx2/crypto/buildinf.h | 11 +- .../asm_avx2/include/openssl/configuration.h | 12 - .../archs/linux-elf/asm_avx2/openssl-cl.gypi | 5 +- .../linux-elf/asm_avx2/openssl-fips.gypi | 5 +- .../archs/linux-elf/asm_avx2/openssl.gypi | 39 +- .../archs/linux-elf/no-asm/configdata.pm | 124 +++- .../archs/linux-elf/no-asm/crypto/buildinf.h | 9 +- .../no-asm/include/openssl/configuration.h | 12 - .../archs/linux-elf/no-asm/openssl-cl.gypi | 5 +- .../archs/linux-elf/no-asm/openssl-fips.gypi | 5 +- .../archs/linux-elf/no-asm/openssl.gypi | 19 +- .../archs/linux-ppc64le/asm/configdata.pm | 124 +++- .../archs/linux-ppc64le/asm/crypto/buildinf.h | 10 +- .../asm/include/openssl/configuration.h | 12 - .../archs/linux-ppc64le/asm/openssl-cl.gypi | 5 +- .../archs/linux-ppc64le/asm/openssl-fips.gypi | 5 +- .../archs/linux-ppc64le/asm/openssl.gypi | 30 +- .../linux-ppc64le/asm_avx2/configdata.pm | 124 +++- .../linux-ppc64le/asm_avx2/crypto/buildinf.h | 11 +- .../asm_avx2/include/openssl/configuration.h | 12 - .../linux-ppc64le/asm_avx2/openssl-cl.gypi | 5 +- .../linux-ppc64le/asm_avx2/openssl-fips.gypi | 5 +- .../archs/linux-ppc64le/asm_avx2/openssl.gypi | 30 +- .../archs/linux-ppc64le/no-asm/configdata.pm | 124 +++- .../linux-ppc64le/no-asm/crypto/buildinf.h | 9 +- .../no-asm/include/openssl/configuration.h | 12 - .../linux-ppc64le/no-asm/openssl-cl.gypi | 5 +- .../linux-ppc64le/no-asm/openssl-fips.gypi | 5 +- .../archs/linux-ppc64le/no-asm/openssl.gypi | 19 +- .../archs/linux-x86_64/asm/configdata.pm | 124 +++- .../archs/linux-x86_64/asm/crypto/buildinf.h | 10 +- .../asm/include/openssl/configuration.h | 12 - .../archs/linux-x86_64/asm/openssl-cl.gypi | 5 +- .../archs/linux-x86_64/asm/openssl-fips.gypi | 5 +- .../archs/linux-x86_64/asm/openssl.gypi | 40 +- .../archs/linux-x86_64/asm_avx2/configdata.pm | 124 +++- .../linux-x86_64/asm_avx2/crypto/buildinf.h | 11 +- .../asm_avx2/include/openssl/configuration.h | 12 - .../linux-x86_64/asm_avx2/openssl-cl.gypi | 5 +- .../linux-x86_64/asm_avx2/openssl-fips.gypi | 5 +- .../archs/linux-x86_64/asm_avx2/openssl.gypi | 40 +- .../archs/linux-x86_64/no-asm/configdata.pm | 124 +++- .../linux-x86_64/no-asm/crypto/buildinf.h | 9 +- .../no-asm/include/openssl/configuration.h | 12 - .../archs/linux-x86_64/no-asm/openssl-cl.gypi | 5 +- .../linux-x86_64/no-asm/openssl-fips.gypi | 5 +- .../archs/linux-x86_64/no-asm/openssl.gypi | 19 +- .../archs/linux32-s390x/asm/configdata.pm | 124 +++- .../archs/linux32-s390x/asm/crypto/buildinf.h | 9 +- .../asm/include/openssl/configuration.h | 12 - .../archs/linux32-s390x/asm/openssl-cl.gypi | 5 +- .../archs/linux32-s390x/asm/openssl-fips.gypi | 5 +- .../archs/linux32-s390x/asm/openssl.gypi | 33 +- .../linux32-s390x/asm_avx2/configdata.pm | 124 +++- .../linux32-s390x/asm_avx2/crypto/buildinf.h | 9 +- .../asm_avx2/include/openssl/configuration.h | 12 - .../linux32-s390x/asm_avx2/openssl-cl.gypi | 5 +- .../linux32-s390x/asm_avx2/openssl-fips.gypi | 5 +- .../archs/linux32-s390x/asm_avx2/openssl.gypi | 33 +- .../archs/linux32-s390x/no-asm/configdata.pm | 124 +++- .../linux32-s390x/no-asm/crypto/buildinf.h | 9 +- .../no-asm/include/openssl/configuration.h | 12 - .../linux32-s390x/no-asm/openssl-cl.gypi | 5 +- .../linux32-s390x/no-asm/openssl-fips.gypi | 5 +- .../archs/linux32-s390x/no-asm/openssl.gypi | 19 +- .../linux64-loongarch64/no-asm/configdata.pm | 124 +++- .../no-asm/crypto/buildinf.h | 9 +- .../no-asm/include/openssl/configuration.h | 12 - .../no-asm/openssl-cl.gypi | 5 +- .../no-asm/openssl-fips.gypi | 5 +- .../linux64-loongarch64/no-asm/openssl.gypi | 19 +- .../archs/linux64-mips64/asm/configdata.pm | 124 +++- .../linux64-mips64/asm/crypto/buildinf.h | 10 +- .../asm/include/openssl/configuration.h | 12 - .../archs/linux64-mips64/asm/openssl-cl.gypi | 5 +- .../linux64-mips64/asm/openssl-fips.gypi | 5 +- .../archs/linux64-mips64/asm/openssl.gypi | 24 +- .../linux64-mips64/asm_avx2/configdata.pm | 124 +++- .../linux64-mips64/asm_avx2/crypto/buildinf.h | 11 +- .../asm_avx2/include/openssl/configuration.h | 12 - .../linux64-mips64/asm_avx2/openssl-cl.gypi | 5 +- .../linux64-mips64/asm_avx2/openssl-fips.gypi | 5 +- .../linux64-mips64/asm_avx2/openssl.gypi | 24 +- .../archs/linux64-mips64/no-asm/configdata.pm | 124 +++- .../linux64-mips64/no-asm/crypto/buildinf.h | 9 +- .../no-asm/include/openssl/configuration.h | 12 - .../linux64-mips64/no-asm/openssl-cl.gypi | 5 +- .../linux64-mips64/no-asm/openssl-fips.gypi | 5 +- .../archs/linux64-mips64/no-asm/openssl.gypi | 18 +- .../linux64-riscv64/no-asm/configdata.pm | 124 +++- .../linux64-riscv64/no-asm/crypto/buildinf.h | 9 +- .../no-asm/include/openssl/configuration.h | 12 - .../linux64-riscv64/no-asm/openssl-cl.gypi | 5 +- .../linux64-riscv64/no-asm/openssl-fips.gypi | 5 +- .../archs/linux64-riscv64/no-asm/openssl.gypi | 18 +- .../archs/linux64-s390x/asm/configdata.pm | 124 +++- .../archs/linux64-s390x/asm/crypto/buildinf.h | 10 +- .../asm/include/openssl/configuration.h | 12 - .../archs/linux64-s390x/asm/openssl-cl.gypi | 5 +- .../archs/linux64-s390x/asm/openssl-fips.gypi | 5 +- .../archs/linux64-s390x/asm/openssl.gypi | 34 +- .../linux64-s390x/asm_avx2/configdata.pm | 124 +++- .../linux64-s390x/asm_avx2/crypto/buildinf.h | 11 +- .../asm_avx2/include/openssl/configuration.h | 12 - .../linux64-s390x/asm_avx2/openssl-cl.gypi | 5 +- .../linux64-s390x/asm_avx2/openssl-fips.gypi | 5 +- .../archs/linux64-s390x/asm_avx2/openssl.gypi | 34 +- .../archs/linux64-s390x/no-asm/configdata.pm | 124 +++- .../linux64-s390x/no-asm/crypto/buildinf.h | 9 +- .../no-asm/include/openssl/configuration.h | 12 - .../linux64-s390x/no-asm/openssl-cl.gypi | 5 +- .../linux64-s390x/no-asm/openssl-fips.gypi | 5 +- .../archs/linux64-s390x/no-asm/openssl.gypi | 19 +- .../archs/solaris-x86-gcc/asm/configdata.pm | 124 +++- .../solaris-x86-gcc/asm/crypto/buildinf.h | 9 +- .../asm/include/openssl/configuration.h | 12 - .../archs/solaris-x86-gcc/asm/openssl-cl.gypi | 5 +- .../solaris-x86-gcc/asm/openssl-fips.gypi | 5 +- .../archs/solaris-x86-gcc/asm/openssl.gypi | 39 +- .../solaris-x86-gcc/asm_avx2/configdata.pm | 124 +++- .../asm_avx2/crypto/buildinf.h | 9 +- .../asm_avx2/include/openssl/configuration.h | 12 - .../solaris-x86-gcc/asm_avx2/openssl-cl.gypi | 5 +- .../asm_avx2/openssl-fips.gypi | 5 +- .../solaris-x86-gcc/asm_avx2/openssl.gypi | 39 +- .../solaris-x86-gcc/no-asm/configdata.pm | 124 +++- .../solaris-x86-gcc/no-asm/crypto/buildinf.h | 9 +- .../no-asm/include/openssl/configuration.h | 12 - .../solaris-x86-gcc/no-asm/openssl-cl.gypi | 5 +- .../solaris-x86-gcc/no-asm/openssl-fips.gypi | 5 +- .../archs/solaris-x86-gcc/no-asm/openssl.gypi | 19 +- .../solaris64-x86_64-gcc/asm/configdata.pm | 124 +++- .../asm/crypto/buildinf.h | 9 +- .../asm/include/openssl/configuration.h | 12 - .../solaris64-x86_64-gcc/asm/openssl-cl.gypi | 5 +- .../asm/openssl-fips.gypi | 5 +- .../solaris64-x86_64-gcc/asm/openssl.gypi | 40 +- .../asm_avx2/configdata.pm | 124 +++- .../asm_avx2/crypto/buildinf.h | 9 +- .../asm_avx2/include/openssl/configuration.h | 12 - .../asm_avx2/openssl-cl.gypi | 5 +- .../asm_avx2/openssl-fips.gypi | 5 +- .../asm_avx2/openssl.gypi | 40 +- .../solaris64-x86_64-gcc/no-asm/configdata.pm | 124 +++- .../no-asm/crypto/buildinf.h | 9 +- .../no-asm/include/openssl/configuration.h | 12 - .../no-asm/openssl-cl.gypi | 5 +- .../no-asm/openssl-fips.gypi | 5 +- .../solaris64-x86_64-gcc/no-asm/openssl.gypi | 19 +- 342 files changed, 8383 insertions(+), 2691 deletions(-) diff --git a/deps/openssl/config/archs/BSD-x86/asm/configdata.pm b/deps/openssl/config/archs/BSD-x86/asm/configdata.pm index 07cc9e9cbf3872..7f6d6c64ca7342 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/configdata.pm +++ b/deps/openssl/config/archs/BSD-x86/asm/configdata.pm @@ -112,6 +112,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -189,9 +190,7 @@ our %config = ( "OPENSSL_THREADS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -221,9 +220,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -232,17 +229,22 @@ our %config = ( ], "openssl_sys_defines" => [], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "BSD-x86" ], "perlenv" => { @@ -320,7 +322,10 @@ our %target = ( "cflags" => "-pthread", "cppflags" => "-D_THREAD_SAFE -D_REENTRANT", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_ldflags" => "-Wl,-z,defs", @@ -328,8 +333,12 @@ our %target = ( "enable" => [ "devcryptoeng" ], - "ex_libs" => "-pthread", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd -pthread", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "", "lib_cflags" => "", "lib_cppflags" => "-DL_ENDIAN", @@ -507,10 +516,8 @@ our @disablables_int = ( our %disabled = ( "afalgeng" => "option", "asan" => "default", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -542,12 +549,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1035,6 +1044,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1302,6 +1314,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8362,6 +8377,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10124,6 +10143,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12086,6 +12119,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12147,6 +12181,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21294,6 +21329,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21879,6 +21918,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23607,6 +23650,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23696,6 +23740,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -24958,6 +25003,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -27935,6 +27995,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30469,6 +30534,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -31014,6 +31085,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31439,6 +31517,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32662,18 +32743,9 @@ my %disabled_info = ( "asan" => { "macro" => "OPENSSL_NO_ASAN" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32767,15 +32839,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 05ad16c7cc7f0a..b644f3b823795e 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: BSD-x86" -#define DATE "built on: Tue Jan 27 17:25:31 2026 UTC" +#define DATE "built on: Wed Mar 11 15:38:13 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -29,5 +29,10 @@ static const char compiler_flags[] = { '_','S','A','F','E',' ','-','D','_','R','E','E','N','T','R','A', 'N','T',' ','-','D','O','P','E','N','S','S','L','_','B','U','I', 'L','D','I','N','G','_','O','P','E','N','S','S','L',' ','-','D', - 'N','D','E','B','U','G','\0' + 'B','R','O','T','L','I',' ','-','D','Z','L','I','B',' ','-','D', + 'Z','S','T','D',' ','-','D','N','D','E','B','U','G',' ','-','I', + '.','.','/','.','.','/','b','r','o','t','l','i','/','c','/','i', + 'n','c','l','u','d','e',' ','-','I','.','.','/','.','.','/','z', + 'l','i','b',' ','-','I','.','.','/','.','.','/','z','s','t','d', + '/','l','i','b','\0' }; diff --git a/deps/openssl/config/archs/BSD-x86/asm/include/openssl/configuration.h b/deps/openssl/config/archs/BSD-x86/asm/include/openssl/configuration.h index 315263a093cdae..433344211d7781 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/include/openssl/configuration.h +++ b/deps/openssl/config/archs/BSD-x86/asm/include/openssl/configuration.h @@ -41,15 +41,9 @@ extern "C" { # ifndef OPENSSL_NO_ASAN # define OPENSSL_NO_ASAN # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -137,15 +131,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/BSD-x86/asm/openssl-cl.gypi b/deps/openssl/config/archs/BSD-x86/asm/openssl-cl.gypi index b4d8e4514b603c..6497efdb12edab 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/BSD-x86/asm/openssl-cl.gypi @@ -4,6 +4,9 @@ 'NDEBUG', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'CMLL_ASM', 'DES_ASM', @@ -33,7 +36,7 @@ '-Wall -O3 -fomit-frame-pointer', ], 'openssl_ex_libs_BSD-x86': [ - '-pthread', + '-lm -pthread', ], 'openssl_cli_srcs_BSD-x86': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/BSD-x86/asm/openssl-fips.gypi b/deps/openssl/config/archs/BSD-x86/asm/openssl-fips.gypi index 8718c229855634..c8c7da4962a030 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/BSD-x86/asm/openssl-fips.gypi @@ -352,6 +352,9 @@ 'NDEBUG', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'DES_ASM', 'ECP_NISTZ256_ASM', @@ -375,7 +378,7 @@ '-Wall -O3 -fomit-frame-pointer', ], 'openssl_ex_libs_BSD-x86': [ - '-pthread', + '-lm -pthread', ], 'linker_script': '' }, diff --git a/deps/openssl/config/archs/BSD-x86/asm/openssl.gypi b/deps/openssl/config/archs/BSD-x86/asm/openssl.gypi index 2ddc8e46672933..ad8c89dee2a7f2 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/openssl.gypi +++ b/deps/openssl/config/archs/BSD-x86/asm/openssl.gypi @@ -278,6 +278,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1124,6 +1129,35 @@ './config/archs/BSD-x86/asm/providers/fips.ld', ], 'openssl_defines_BSD-x86': [ + 'NDEBUG', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'AES_ASM', + 'CMLL_ASM', + 'DES_ASM', + 'ECP_NISTZ256_ASM', + 'GHASH_ASM', + 'MD5_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_BN_ASM_PART_WORDS', + 'OPENSSL_CPUID_OBJ', + 'OPENSSL_IA32_SSE2', + 'PADLOCK_ASM', + 'POLY1305_ASM', + 'RC4_ASM', + 'RMD160_ASM', + 'SHA1_ASM', + 'SHA256_ASM', + 'SHA512_ASM', + 'VPAES_ASM', + 'WHIRLPOOL_ASM', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_BSD-x86': [ 'NDEBUG', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', @@ -1156,7 +1190,7 @@ '-Wall -O3 -fomit-frame-pointer', ], 'openssl_ex_libs_BSD-x86': [ - '-pthread', + '-lm -pthread', ], }, 'include_dirs': [ @@ -1172,6 +1206,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_BSD-x86)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_BSD-x86)'], + 'defines': ['<@(openssl_defines_exported_BSD-x86)'], }, } 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 16cbc1eba9a7bf..7fbc26175a8a99 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/configdata.pm @@ -112,6 +112,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -189,9 +190,7 @@ our %config = ( "OPENSSL_THREADS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -221,9 +220,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -232,17 +229,22 @@ our %config = ( ], "openssl_sys_defines" => [], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "BSD-x86" ], "perlenv" => { @@ -320,7 +322,10 @@ our %target = ( "cflags" => "-pthread", "cppflags" => "-D_THREAD_SAFE -D_REENTRANT", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_ldflags" => "-Wl,-z,defs", @@ -328,8 +333,12 @@ our %target = ( "enable" => [ "devcryptoeng" ], - "ex_libs" => "-pthread", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd -pthread", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "", "lib_cflags" => "", "lib_cppflags" => "-DL_ENDIAN", @@ -507,10 +516,8 @@ our @disablables_int = ( our %disabled = ( "afalgeng" => "option", "asan" => "default", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -542,12 +549,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1035,6 +1044,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1302,6 +1314,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8362,6 +8377,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10124,6 +10143,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12086,6 +12119,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12147,6 +12181,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21294,6 +21329,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21879,6 +21918,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23607,6 +23650,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23696,6 +23740,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -24958,6 +25003,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -27935,6 +27995,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30469,6 +30534,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -31014,6 +31085,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31439,6 +31517,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32662,18 +32743,9 @@ my %disabled_info = ( "asan" => { "macro" => "OPENSSL_NO_ASAN" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32767,15 +32839,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 bbc0f092862b9c..0cefa1f3db79b9 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: BSD-x86" -#define DATE "built on: Tue Jan 27 17:25:49 2026 UTC" +#define DATE "built on: Wed Mar 11 15:38:25 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -30,5 +30,10 @@ static const char compiler_flags[] = { 'A','D','_','S','A','F','E',' ','-','D','_','R','E','E','N','T', 'R','A','N','T',' ','-','D','O','P','E','N','S','S','L','_','B', 'U','I','L','D','I','N','G','_','O','P','E','N','S','S','L',' ', - '-','D','N','D','E','B','U','G','\0' + '-','D','B','R','O','T','L','I',' ','-','D','Z','L','I','B',' ', + '-','D','Z','S','T','D',' ','-','D','N','D','E','B','U','G',' ', + '-','I','.','.','/','.','.','/','b','r','o','t','l','i','/','c', + '/','i','n','c','l','u','d','e',' ','-','I','.','.','/','.','.', + '/','z','l','i','b',' ','-','I','.','.','/','.','.','/','z','s', + 't','d','/','l','i','b','\0' }; diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/configuration.h b/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/configuration.h index 315263a093cdae..433344211d7781 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/configuration.h +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/configuration.h @@ -41,15 +41,9 @@ extern "C" { # ifndef OPENSSL_NO_ASAN # define OPENSSL_NO_ASAN # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -137,15 +131,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl-cl.gypi index 064444ebf23c4c..fd9ff8e8dab6e1 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl-cl.gypi +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl-cl.gypi @@ -4,6 +4,9 @@ 'NDEBUG', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'CMLL_ASM', 'DES_ASM', @@ -33,7 +36,7 @@ '-Wall -O3 -fomit-frame-pointer', ], 'openssl_ex_libs_BSD-x86': [ - '-pthread', + '-lm -pthread', ], 'openssl_cli_srcs_BSD-x86': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl-fips.gypi index 9a52eae7b62593..22d98acc578556 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl-fips.gypi @@ -352,6 +352,9 @@ 'NDEBUG', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'DES_ASM', 'ECP_NISTZ256_ASM', @@ -375,7 +378,7 @@ '-Wall -O3 -fomit-frame-pointer', ], 'openssl_ex_libs_BSD-x86': [ - '-pthread', + '-lm -pthread', ], 'linker_script': '' }, diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl.gypi b/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl.gypi index 64ff3beaabdd72..00daf239b0acca 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl.gypi @@ -278,6 +278,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1124,6 +1129,35 @@ './config/archs/BSD-x86/asm_avx2/providers/fips.ld', ], 'openssl_defines_BSD-x86': [ + 'NDEBUG', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'AES_ASM', + 'CMLL_ASM', + 'DES_ASM', + 'ECP_NISTZ256_ASM', + 'GHASH_ASM', + 'MD5_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_BN_ASM_PART_WORDS', + 'OPENSSL_CPUID_OBJ', + 'OPENSSL_IA32_SSE2', + 'PADLOCK_ASM', + 'POLY1305_ASM', + 'RC4_ASM', + 'RMD160_ASM', + 'SHA1_ASM', + 'SHA256_ASM', + 'SHA512_ASM', + 'VPAES_ASM', + 'WHIRLPOOL_ASM', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_BSD-x86': [ 'NDEBUG', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', @@ -1156,7 +1190,7 @@ '-Wall -O3 -fomit-frame-pointer', ], 'openssl_ex_libs_BSD-x86': [ - '-pthread', + '-lm -pthread', ], }, 'include_dirs': [ @@ -1172,6 +1206,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_BSD-x86)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_BSD-x86)'], + 'defines': ['<@(openssl_defines_exported_BSD-x86)'], }, } 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 50be625354db51..59e982d57cdfe7 100644 --- a/deps/openssl/config/archs/BSD-x86/no-asm/configdata.pm +++ b/deps/openssl/config/archs/BSD-x86/no-asm/configdata.pm @@ -112,6 +112,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -188,9 +189,7 @@ our %config = ( "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -220,9 +219,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -231,17 +228,22 @@ our %config = ( ], "openssl_sys_defines" => [], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-asm no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "no-asm", "BSD-x86" ], @@ -320,7 +322,10 @@ our %target = ( "cflags" => "-pthread", "cppflags" => "-D_THREAD_SAFE -D_REENTRANT", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_ldflags" => "-Wl,-z,defs", @@ -328,8 +333,12 @@ our %target = ( "enable" => [ "devcryptoeng" ], - "ex_libs" => "-pthread", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd -pthread", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "", "lib_cflags" => "", "lib_cppflags" => "-DL_ENDIAN", @@ -508,10 +517,8 @@ our %disabled = ( "afalgeng" => "option", "asan" => "default", "asm" => "option", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -543,12 +550,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1036,6 +1045,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1303,6 +1315,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8304,6 +8319,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10060,6 +10079,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12006,6 +12039,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12067,6 +12101,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21211,6 +21246,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21796,6 +21835,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23524,6 +23567,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23613,6 +23657,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -24857,6 +24902,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -27784,6 +27844,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30298,6 +30363,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -30843,6 +30914,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31268,6 +31346,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32494,18 +32575,9 @@ my %disabled_info = ( "asm" => { "macro" => "OPENSSL_NO_ASM" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32599,15 +32671,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 898e10558fbee7..188fce45d8e566 100644 --- a/deps/openssl/config/archs/BSD-x86/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/BSD-x86/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: BSD-x86" -#define DATE "built on: Tue Jan 27 17:26:06 2026 UTC" +#define DATE "built on: Wed Mar 11 15:38:38 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -27,6 +27,11 @@ static const char compiler_flags[] = { 'P','I','C',' ','-','D','_','T','H','R','E','A','D','_','S','A', 'F','E',' ','-','D','_','R','E','E','N','T','R','A','N','T',' ', '-','D','O','P','E','N','S','S','L','_','B','U','I','L','D','I', - 'N','G','_','O','P','E','N','S','S','L',' ','-','D','N','D','E', - 'B','U','G','\0' + 'N','G','_','O','P','E','N','S','S','L',' ','-','D','B','R','O', + 'T','L','I',' ','-','D','Z','L','I','B',' ','-','D','Z','S','T', + 'D',' ','-','D','N','D','E','B','U','G',' ','-','I','.','.','/', + '.','.','/','b','r','o','t','l','i','/','c','/','i','n','c','l', + 'u','d','e',' ','-','I','.','.','/','.','.','/','z','l','i','b', + ' ','-','I','.','.','/','.','.','/','z','s','t','d','/','l','i', + 'b','\0' }; diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/configuration.h b/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/configuration.h index 0cd6daea42a4e7..f08c6b9afeace4 100644 --- a/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/configuration.h +++ b/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/configuration.h @@ -44,15 +44,9 @@ extern "C" { # ifndef OPENSSL_NO_ASM # define OPENSSL_NO_ASM # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -140,15 +134,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/openssl-cl.gypi b/deps/openssl/config/archs/BSD-x86/no-asm/openssl-cl.gypi index e7fb20b83987b3..a9f4b1e0498cab 100644 --- a/deps/openssl/config/archs/BSD-x86/no-asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/BSD-x86/no-asm/openssl-cl.gypi @@ -4,6 +4,9 @@ 'NDEBUG', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'OPENSSL_PIC', ], 'openssl_cflags_BSD-x86': [ @@ -12,7 +15,7 @@ '-Wall -O3 -fomit-frame-pointer', ], 'openssl_ex_libs_BSD-x86': [ - '-pthread', + '-lm -pthread', ], 'openssl_cli_srcs_BSD-x86': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/BSD-x86/no-asm/openssl-fips.gypi index f79299fd5746f4..1d92fba87e130c 100644 --- a/deps/openssl/config/archs/BSD-x86/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/BSD-x86/no-asm/openssl-fips.gypi @@ -333,6 +333,9 @@ 'NDEBUG', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'FIPS_MODULE', 'FIPS_MODULE', ], @@ -342,7 +345,7 @@ '-Wall -O3 -fomit-frame-pointer', ], 'openssl_ex_libs_BSD-x86': [ - '-pthread', + '-lm -pthread', ], 'linker_script': '' }, diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/openssl.gypi b/deps/openssl/config/archs/BSD-x86/no-asm/openssl.gypi index 3f9be62516b43b..dcffe84b87e2ad 100644 --- a/deps/openssl/config/archs/BSD-x86/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/BSD-x86/no-asm/openssl.gypi @@ -286,6 +286,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1112,6 +1117,15 @@ './config/archs/BSD-x86/no-asm/providers/fips.ld', ], 'openssl_defines_BSD-x86': [ + 'NDEBUG', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_BSD-x86': [ 'NDEBUG', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', @@ -1123,7 +1137,7 @@ '-Wall -O3 -fomit-frame-pointer', ], 'openssl_ex_libs_BSD-x86': [ - '-pthread', + '-lm -pthread', ], }, 'include_dirs': [ @@ -1139,6 +1153,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_BSD-x86)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_BSD-x86)'], + 'defines': ['<@(openssl_defines_exported_BSD-x86)'], }, } 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 dce49bb95f9a4c..91c271e6ca1f58 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm +++ b/deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm @@ -112,6 +112,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -189,9 +190,7 @@ our %config = ( "OPENSSL_THREADS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -221,9 +220,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -232,17 +229,22 @@ our %config = ( ], "openssl_sys_defines" => [], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "BSD-x86_64" ], "perlenv" => { @@ -321,7 +323,10 @@ our %target = ( "cflags" => "-pthread", "cppflags" => "-D_THREAD_SAFE -D_REENTRANT", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_ldflags" => "-Wl,-z,defs", @@ -329,8 +334,12 @@ our %target = ( "enable" => [ "devcryptoeng" ], - "ex_libs" => "-pthread", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd -pthread", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "", "lib_cflags" => "", "lib_cppflags" => "-DL_ENDIAN", @@ -508,10 +517,8 @@ our @disablables_int = ( our %disabled = ( "afalgeng" => "option", "asan" => "default", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -543,12 +550,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1036,6 +1045,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1303,6 +1315,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8369,6 +8384,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10172,6 +10191,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12143,6 +12176,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12204,6 +12238,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21351,6 +21386,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21936,6 +21975,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23664,6 +23707,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23753,6 +23797,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -25108,6 +25153,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -28128,6 +28188,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30686,6 +30751,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -31231,6 +31302,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31656,6 +31734,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32879,18 +32960,9 @@ my %disabled_info = ( "asan" => { "macro" => "OPENSSL_NO_ASAN" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32984,15 +33056,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 874c5ef38eb7c0..97794d5d2f97b5 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: BSD-x86_64" -#define DATE "built on: Tue Jan 27 17:26:21 2026 UTC" +#define DATE "built on: Wed Mar 11 15:38:50 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -27,6 +27,10 @@ static const char compiler_flags[] = { 'C',' ','-','D','_','T','H','R','E','A','D','_','S','A','F','E', ' ','-','D','_','R','E','E','N','T','R','A','N','T',' ','-','D', 'O','P','E','N','S','S','L','_','B','U','I','L','D','I','N','G', - '_','O','P','E','N','S','S','L',' ','-','D','N','D','E','B','U', - 'G','\0' + '_','O','P','E','N','S','S','L',' ','-','D','B','R','O','T','L', + 'I',' ','-','D','Z','L','I','B',' ','-','D','Z','S','T','D',' ', + '-','D','N','D','E','B','U','G',' ','-','I','.','.','/','.','.', + '/','b','r','o','t','l','i','/','c','/','i','n','c','l','u','d', + 'e',' ','-','I','.','.','/','.','.','/','z','l','i','b',' ','-', + 'I','.','.','/','.','.','/','z','s','t','d','/','l','i','b','\0' }; diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/configuration.h b/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/configuration.h index 73b68d311b7186..04755bee4cbff8 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/configuration.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/configuration.h @@ -41,15 +41,9 @@ extern "C" { # ifndef OPENSSL_NO_ASAN # define OPENSSL_NO_ASAN # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -137,15 +131,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/openssl-cl.gypi b/deps/openssl/config/archs/BSD-x86_64/asm/openssl-cl.gypi index 5bba9b3227268a..6126d83ddb668b 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/BSD-x86_64/asm/openssl-cl.gypi @@ -4,6 +4,9 @@ 'NDEBUG', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'BSAES_ASM', 'CMLL_ASM', @@ -34,7 +37,7 @@ '-Wall -O3', ], 'openssl_ex_libs_BSD-x86_64': [ - '-pthread', + '-lm -pthread', ], 'openssl_cli_srcs_BSD-x86_64': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/openssl-fips.gypi b/deps/openssl/config/archs/BSD-x86_64/asm/openssl-fips.gypi index cfcc959545aff6..c05d60cef438fe 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/BSD-x86_64/asm/openssl-fips.gypi @@ -371,6 +371,9 @@ 'NDEBUG', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'BSAES_ASM', 'ECP_NISTZ256_ASM', @@ -396,7 +399,7 @@ '-Wall -O3', ], 'openssl_ex_libs_BSD-x86_64': [ - '-pthread', + '-lm -pthread', ], 'linker_script': '' }, diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/openssl.gypi b/deps/openssl/config/archs/BSD-x86_64/asm/openssl.gypi index 6e425bd629a60d..49babda1ab4c39 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/openssl.gypi +++ b/deps/openssl/config/archs/BSD-x86_64/asm/openssl.gypi @@ -283,6 +283,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1144,6 +1149,36 @@ './config/archs/BSD-x86_64/asm/providers/fips.ld', ], 'openssl_defines_BSD-x86_64': [ + 'NDEBUG', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'AES_ASM', + 'BSAES_ASM', + 'CMLL_ASM', + 'ECP_NISTZ256_ASM', + 'GHASH_ASM', + 'KECCAK1600_ASM', + 'MD5_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_BN_ASM_MONT5', + 'OPENSSL_CPUID_OBJ', + 'OPENSSL_IA32_SSE2', + 'PADLOCK_ASM', + 'POLY1305_ASM', + 'RC4_ASM', + 'SHA1_ASM', + 'SHA256_ASM', + 'SHA512_ASM', + 'VPAES_ASM', + 'WHIRLPOOL_ASM', + 'X25519_ASM', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_BSD-x86_64': [ 'NDEBUG', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', @@ -1177,7 +1212,7 @@ '-Wall -O3', ], 'openssl_ex_libs_BSD-x86_64': [ - '-pthread', + '-lm -pthread', ], }, 'include_dirs': [ @@ -1193,6 +1228,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_BSD-x86_64)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_BSD-x86_64)'], + 'defines': ['<@(openssl_defines_exported_BSD-x86_64)'], }, } 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 767a367eefd07c..9c13abde3386dd 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 @@ -112,6 +112,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -189,9 +190,7 @@ our %config = ( "OPENSSL_THREADS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -221,9 +220,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -232,17 +229,22 @@ our %config = ( ], "openssl_sys_defines" => [], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "BSD-x86_64" ], "perlenv" => { @@ -321,7 +323,10 @@ our %target = ( "cflags" => "-pthread", "cppflags" => "-D_THREAD_SAFE -D_REENTRANT", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_ldflags" => "-Wl,-z,defs", @@ -329,8 +334,12 @@ our %target = ( "enable" => [ "devcryptoeng" ], - "ex_libs" => "-pthread", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd -pthread", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "", "lib_cflags" => "", "lib_cppflags" => "-DL_ENDIAN", @@ -508,10 +517,8 @@ our @disablables_int = ( our %disabled = ( "afalgeng" => "option", "asan" => "default", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -543,12 +550,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1036,6 +1045,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1303,6 +1315,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8369,6 +8384,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10172,6 +10191,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12143,6 +12176,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12204,6 +12238,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21351,6 +21386,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21936,6 +21975,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23664,6 +23707,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23753,6 +23797,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -25108,6 +25153,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -28128,6 +28188,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30686,6 +30751,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -31231,6 +31302,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31656,6 +31734,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32879,18 +32960,9 @@ my %disabled_info = ( "asan" => { "macro" => "OPENSSL_NO_ASAN" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32984,15 +33056,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 62b37842141c4f..2c6d105ada8138 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: BSD-x86_64" -#define DATE "built on: Tue Jan 27 17:26:46 2026 UTC" +#define DATE "built on: Wed Mar 11 15:39:08 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -28,6 +28,11 @@ static const char compiler_flags[] = { 'P','I','C',' ','-','D','_','T','H','R','E','A','D','_','S','A', 'F','E',' ','-','D','_','R','E','E','N','T','R','A','N','T',' ', '-','D','O','P','E','N','S','S','L','_','B','U','I','L','D','I', - 'N','G','_','O','P','E','N','S','S','L',' ','-','D','N','D','E', - 'B','U','G','\0' + 'N','G','_','O','P','E','N','S','S','L',' ','-','D','B','R','O', + 'T','L','I',' ','-','D','Z','L','I','B',' ','-','D','Z','S','T', + 'D',' ','-','D','N','D','E','B','U','G',' ','-','I','.','.','/', + '.','.','/','b','r','o','t','l','i','/','c','/','i','n','c','l', + 'u','d','e',' ','-','I','.','.','/','.','.','/','z','l','i','b', + ' ','-','I','.','.','/','.','.','/','z','s','t','d','/','l','i', + 'b','\0' }; diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/configuration.h b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/configuration.h index 73b68d311b7186..04755bee4cbff8 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/configuration.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/configuration.h @@ -41,15 +41,9 @@ extern "C" { # ifndef OPENSSL_NO_ASAN # define OPENSSL_NO_ASAN # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -137,15 +131,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl-cl.gypi index a4db7389987bbe..426a4a82a96798 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl-cl.gypi +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl-cl.gypi @@ -4,6 +4,9 @@ 'NDEBUG', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'BSAES_ASM', 'CMLL_ASM', @@ -34,7 +37,7 @@ '-Wall -O3', ], 'openssl_ex_libs_BSD-x86_64': [ - '-pthread', + '-lm -pthread', ], 'openssl_cli_srcs_BSD-x86_64': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl-fips.gypi index 4d73c4c1f2df43..5c4c228b05fe16 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl-fips.gypi @@ -371,6 +371,9 @@ 'NDEBUG', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'BSAES_ASM', 'ECP_NISTZ256_ASM', @@ -396,7 +399,7 @@ '-Wall -O3', ], 'openssl_ex_libs_BSD-x86_64': [ - '-pthread', + '-lm -pthread', ], 'linker_script': '' }, diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl.gypi b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl.gypi index a79f37a6eef887..30e86c0165bd9c 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl.gypi @@ -283,6 +283,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1144,6 +1149,36 @@ './config/archs/BSD-x86_64/asm_avx2/providers/fips.ld', ], 'openssl_defines_BSD-x86_64': [ + 'NDEBUG', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'AES_ASM', + 'BSAES_ASM', + 'CMLL_ASM', + 'ECP_NISTZ256_ASM', + 'GHASH_ASM', + 'KECCAK1600_ASM', + 'MD5_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_BN_ASM_MONT5', + 'OPENSSL_CPUID_OBJ', + 'OPENSSL_IA32_SSE2', + 'PADLOCK_ASM', + 'POLY1305_ASM', + 'RC4_ASM', + 'SHA1_ASM', + 'SHA256_ASM', + 'SHA512_ASM', + 'VPAES_ASM', + 'WHIRLPOOL_ASM', + 'X25519_ASM', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_BSD-x86_64': [ 'NDEBUG', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', @@ -1177,7 +1212,7 @@ '-Wall -O3', ], 'openssl_ex_libs_BSD-x86_64': [ - '-pthread', + '-lm -pthread', ], }, 'include_dirs': [ @@ -1193,6 +1228,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_BSD-x86_64)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_BSD-x86_64)'], + 'defines': ['<@(openssl_defines_exported_BSD-x86_64)'], }, } 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 9556fffc9896b6..4a49ed2dc4648e 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 @@ -112,6 +112,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -188,9 +189,7 @@ our %config = ( "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -220,9 +219,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -231,17 +228,22 @@ our %config = ( ], "openssl_sys_defines" => [], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-asm no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "no-asm", "BSD-x86_64" ], @@ -321,7 +323,10 @@ our %target = ( "cflags" => "-pthread", "cppflags" => "-D_THREAD_SAFE -D_REENTRANT", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_ldflags" => "-Wl,-z,defs", @@ -329,8 +334,12 @@ our %target = ( "enable" => [ "devcryptoeng" ], - "ex_libs" => "-pthread", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd -pthread", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "", "lib_cflags" => "", "lib_cppflags" => "-DL_ENDIAN", @@ -509,10 +518,8 @@ our %disabled = ( "afalgeng" => "option", "asan" => "default", "asm" => "option", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -544,12 +551,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1037,6 +1046,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1304,6 +1316,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8305,6 +8320,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10061,6 +10080,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12007,6 +12040,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12068,6 +12102,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21212,6 +21247,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21797,6 +21836,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23525,6 +23568,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23614,6 +23658,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -24858,6 +24903,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -27785,6 +27845,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30299,6 +30364,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -30844,6 +30915,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31269,6 +31347,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32495,18 +32576,9 @@ my %disabled_info = ( "asm" => { "macro" => "OPENSSL_NO_ASM" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32600,15 +32672,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 f2723e8e33b750..782eb5c32b3611 100644 --- a/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: BSD-x86_64" -#define DATE "built on: Tue Jan 27 17:27:07 2026 UTC" +#define DATE "built on: Wed Mar 11 15:39:22 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -26,5 +26,10 @@ static const char compiler_flags[] = { 'D','_','T','H','R','E','A','D','_','S','A','F','E',' ','-','D', '_','R','E','E','N','T','R','A','N','T',' ','-','D','O','P','E', 'N','S','S','L','_','B','U','I','L','D','I','N','G','_','O','P', - 'E','N','S','S','L',' ','-','D','N','D','E','B','U','G','\0' + 'E','N','S','S','L',' ','-','D','B','R','O','T','L','I',' ','-', + 'D','Z','L','I','B',' ','-','D','Z','S','T','D',' ','-','D','N', + 'D','E','B','U','G',' ','-','I','.','.','/','.','.','/','b','r', + 'o','t','l','i','/','c','/','i','n','c','l','u','d','e',' ','-', + 'I','.','.','/','.','.','/','z','l','i','b',' ','-','I','.','.', + '/','.','.','/','z','s','t','d','/','l','i','b','\0' }; diff --git a/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/configuration.h b/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/configuration.h index 2f036819c9f0dd..374930574cbcb3 100644 --- a/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/configuration.h +++ b/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/configuration.h @@ -44,15 +44,9 @@ extern "C" { # ifndef OPENSSL_NO_ASM # define OPENSSL_NO_ASM # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -140,15 +134,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/BSD-x86_64/no-asm/openssl-cl.gypi b/deps/openssl/config/archs/BSD-x86_64/no-asm/openssl-cl.gypi index 70fe127607efac..446ececf1bdf83 100644 --- a/deps/openssl/config/archs/BSD-x86_64/no-asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/BSD-x86_64/no-asm/openssl-cl.gypi @@ -4,6 +4,9 @@ 'NDEBUG', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'OPENSSL_PIC', ], 'openssl_cflags_BSD-x86_64': [ @@ -12,7 +15,7 @@ '-Wall -O3', ], 'openssl_ex_libs_BSD-x86_64': [ - '-pthread', + '-lm -pthread', ], 'openssl_cli_srcs_BSD-x86_64': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/BSD-x86_64/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/BSD-x86_64/no-asm/openssl-fips.gypi index 62e879b962df45..9d9b253a3c031c 100644 --- a/deps/openssl/config/archs/BSD-x86_64/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/BSD-x86_64/no-asm/openssl-fips.gypi @@ -333,6 +333,9 @@ 'NDEBUG', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'FIPS_MODULE', 'FIPS_MODULE', ], @@ -342,7 +345,7 @@ '-Wall -O3', ], 'openssl_ex_libs_BSD-x86_64': [ - '-pthread', + '-lm -pthread', ], 'linker_script': '' }, diff --git a/deps/openssl/config/archs/BSD-x86_64/no-asm/openssl.gypi b/deps/openssl/config/archs/BSD-x86_64/no-asm/openssl.gypi index 4be3cbae5d3a09..a2c6d9f2c7a310 100644 --- a/deps/openssl/config/archs/BSD-x86_64/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/BSD-x86_64/no-asm/openssl.gypi @@ -286,6 +286,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1112,6 +1117,15 @@ './config/archs/BSD-x86_64/no-asm/providers/fips.ld', ], 'openssl_defines_BSD-x86_64': [ + 'NDEBUG', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_BSD-x86_64': [ 'NDEBUG', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', @@ -1123,7 +1137,7 @@ '-Wall -O3', ], 'openssl_ex_libs_BSD-x86_64': [ - '-pthread', + '-lm -pthread', ], }, 'include_dirs': [ @@ -1139,6 +1153,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_BSD-x86_64)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_BSD-x86_64)'], + 'defines': ['<@(openssl_defines_exported_BSD-x86_64)'], }, } diff --git a/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm b/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm index 59d9d37cad68a4..a3e5ab8c5df988 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm @@ -120,6 +120,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -198,9 +199,7 @@ our %config = ( "OPENSSL_THREADS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -230,9 +229,7 @@ our %config = ( "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -243,17 +240,22 @@ our %config = ( "OPENSSL_SYS_WIN32" ], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "VC-WIN32" ], "perlenv" => { @@ -316,7 +318,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x55bb5bcbbe30)", + "RANLIB" => "CODE(0x5be80ea414c8)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -347,6 +349,9 @@ our %target = ( "cppflags" => "", "defines" => [ "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD", "OPENSSL_SYS_WIN32", "WIN32_LEAN_AND_MEAN", "UNICODE", @@ -358,8 +363,12 @@ our %target = ( "dso_cflags" => "/Zi /Fddso.pdb", "dso_scheme" => "win32", "enable" => [], - "ex_libs" => "ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib", - "includes" => [], + "ex_libs" => "ZLIB1 libzstd brotlicommon.lib brotlidec.lib brotlienc.lib ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "ld_implib_flag" => "/implib:", "ld_resp_delim" => " ", @@ -552,10 +561,8 @@ our @disablables_int = ( our %disabled = ( "afalgeng" => "option", "asan" => "default", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -587,12 +594,14 @@ our %disabled = ( "unit-test" => "default", "uplink" => "cascade", "weak-ssl-ciphers" => "default", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1080,6 +1089,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1347,6 +1359,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8410,6 +8425,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10174,6 +10193,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12136,6 +12169,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12197,6 +12231,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21369,6 +21404,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21954,6 +21993,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23682,6 +23725,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23771,6 +23815,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -25043,6 +25088,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -28017,6 +28077,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30562,6 +30627,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -31107,6 +31178,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31532,6 +31610,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32753,18 +32834,9 @@ my %disabled_info = ( "asan" => { "macro" => "OPENSSL_NO_ASAN" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32858,15 +32930,9 @@ my %disabled_info = ( "weak-ssl-ciphers" => { "macro" => "OPENSSL_NO_WEAK_SSL_CIPHERS" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 7b4d4fdd28ded0..33badd704a529e 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/VC-WIN32/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: " -#define DATE "built on: Tue Jan 27 17:39:36 2026 UTC" +#define DATE "built on: Wed Mar 11 15:48:27 2026 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/configuration.h b/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/configuration.h index d8cb5d1e601f30..9f7cfd11f21614 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/configuration.h +++ b/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/configuration.h @@ -43,15 +43,9 @@ extern "C" { # ifndef OPENSSL_NO_ASAN # define OPENSSL_NO_ASAN # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -139,15 +133,9 @@ extern "C" { # ifndef OPENSSL_NO_WEAK_SSL_CIPHERS # define OPENSSL_NO_WEAK_SSL_CIPHERS # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/VC-WIN32/asm/openssl-cl.gypi b/deps/openssl/config/archs/VC-WIN32/asm/openssl-cl.gypi index a1873a8a0c797b..a095617e6e58bf 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/VC-WIN32/asm/openssl-cl.gypi @@ -3,6 +3,9 @@ 'openssl_defines_VC-WIN32': [ 'NDEBUG', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'OPENSSL_SYS_WIN32', 'WIN32_LEAN_AND_MEAN', 'UNICODE', @@ -38,7 +41,7 @@ '/W3 /wd4090 /nologo /O2', ], 'openssl_ex_libs_VC-WIN32': [ - 'ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', + 'ZLIB1 libzstd brotlicommon.lib brotlidec.lib brotlienc.lib ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', ], 'openssl_cli_srcs_VC-WIN32': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/VC-WIN32/asm/openssl-fips.gypi b/deps/openssl/config/archs/VC-WIN32/asm/openssl-fips.gypi index 708da9a70f6db5..da54990c58f65e 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/VC-WIN32/asm/openssl-fips.gypi @@ -349,6 +349,9 @@ 'openssl_defines_VC-WIN32': [ 'NDEBUG', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'OPENSSL_SYS_WIN32', 'WIN32_LEAN_AND_MEAN', 'UNICODE', @@ -378,7 +381,7 @@ '/W3 /wd4090 /nologo /O2', ], 'openssl_ex_libs_VC-WIN32': [ - 'ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', + 'ZLIB1 libzstd brotlicommon.lib brotlidec.lib brotlienc.lib ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', ], 'linker_script': '' }, diff --git a/deps/openssl/config/archs/VC-WIN32/asm/openssl.gypi b/deps/openssl/config/archs/VC-WIN32/asm/openssl.gypi index 9db3574e8a98bb..45f3ce9f6b223c 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/openssl.gypi +++ b/deps/openssl/config/archs/VC-WIN32/asm/openssl.gypi @@ -278,6 +278,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1122,6 +1127,40 @@ './config/archs/VC-WIN32/asm/providers/common/der/der_wrap_gen.c', ], 'openssl_defines_VC-WIN32': [ + 'NDEBUG', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'OPENSSL_SYS_WIN32', + 'WIN32_LEAN_AND_MEAN', + 'UNICODE', + '_UNICODE', + '_CRT_SECURE_NO_DEPRECATE', + '_WINSOCK_DEPRECATED_NO_WARNINGS', + 'AES_ASM', + 'CMLL_ASM', + 'DES_ASM', + 'ECP_NISTZ256_ASM', + 'GHASH_ASM', + 'MD5_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_BN_ASM_PART_WORDS', + 'OPENSSL_CPUID_OBJ', + 'OPENSSL_IA32_SSE2', + 'PADLOCK_ASM', + 'POLY1305_ASM', + 'RC4_ASM', + 'RMD160_ASM', + 'SHA1_ASM', + 'SHA256_ASM', + 'SHA512_ASM', + 'VPAES_ASM', + 'WHIRLPOOL_ASM', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_VC-WIN32': [ 'NDEBUG', 'OPENSSL_BUILDING_OPENSSL', 'OPENSSL_SYS_WIN32', @@ -1159,7 +1198,7 @@ '/W3 /wd4090 /nologo /O2', ], 'openssl_ex_libs_VC-WIN32': [ - 'ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', + 'ZLIB1 libzstd brotlicommon.lib brotlidec.lib brotlienc.lib ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', ], }, 'include_dirs': [ @@ -1174,6 +1213,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_VC-WIN32)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_VC-WIN32)'], + 'defines': ['<@(openssl_defines_exported_VC-WIN32)'], }, } 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 a4016be69e646a..0e6fc98e2805f2 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/configdata.pm @@ -120,6 +120,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -198,9 +199,7 @@ our %config = ( "OPENSSL_THREADS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -230,9 +229,7 @@ our %config = ( "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -243,17 +240,22 @@ our %config = ( "OPENSSL_SYS_WIN32" ], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "VC-WIN32" ], "perlenv" => { @@ -316,7 +318,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x56558750c810)", + "RANLIB" => "CODE(0x61694cf8da38)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -347,6 +349,9 @@ our %target = ( "cppflags" => "", "defines" => [ "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD", "OPENSSL_SYS_WIN32", "WIN32_LEAN_AND_MEAN", "UNICODE", @@ -358,8 +363,12 @@ our %target = ( "dso_cflags" => "/Zi /Fddso.pdb", "dso_scheme" => "win32", "enable" => [], - "ex_libs" => "ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib", - "includes" => [], + "ex_libs" => "ZLIB1 libzstd brotlicommon.lib brotlidec.lib brotlienc.lib ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "ld_implib_flag" => "/implib:", "ld_resp_delim" => " ", @@ -552,10 +561,8 @@ our @disablables_int = ( our %disabled = ( "afalgeng" => "option", "asan" => "default", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -587,12 +594,14 @@ our %disabled = ( "unit-test" => "default", "uplink" => "cascade", "weak-ssl-ciphers" => "default", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1080,6 +1089,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1347,6 +1359,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8410,6 +8425,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10174,6 +10193,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12136,6 +12169,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12197,6 +12231,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21369,6 +21404,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21954,6 +21993,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23682,6 +23725,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23771,6 +23815,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -25043,6 +25088,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -28017,6 +28077,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30562,6 +30627,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -31107,6 +31178,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31532,6 +31610,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32753,18 +32834,9 @@ my %disabled_info = ( "asan" => { "macro" => "OPENSSL_NO_ASAN" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32858,15 +32930,9 @@ my %disabled_info = ( "weak-ssl-ciphers" => { "macro" => "OPENSSL_NO_WEAK_SSL_CIPHERS" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 ac3f33df3c0a86..32b83b890ad0a3 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: " -#define DATE "built on: Tue Jan 27 17:39:51 2026 UTC" +#define DATE "built on: Wed Mar 11 15:48:38 2026 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/configuration.h b/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/configuration.h index d8cb5d1e601f30..9f7cfd11f21614 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/configuration.h +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/configuration.h @@ -43,15 +43,9 @@ extern "C" { # ifndef OPENSSL_NO_ASAN # define OPENSSL_NO_ASAN # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -139,15 +133,9 @@ extern "C" { # ifndef OPENSSL_NO_WEAK_SSL_CIPHERS # define OPENSSL_NO_WEAK_SSL_CIPHERS # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl-cl.gypi index 21d695947f9190..0243ffcc67920b 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl-cl.gypi +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl-cl.gypi @@ -3,6 +3,9 @@ 'openssl_defines_VC-WIN32': [ 'NDEBUG', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'OPENSSL_SYS_WIN32', 'WIN32_LEAN_AND_MEAN', 'UNICODE', @@ -38,7 +41,7 @@ '/W3 /wd4090 /nologo /O2', ], 'openssl_ex_libs_VC-WIN32': [ - 'ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', + 'ZLIB1 libzstd brotlicommon.lib brotlidec.lib brotlienc.lib ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', ], 'openssl_cli_srcs_VC-WIN32': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl-fips.gypi index ed6a2a5dcd00a9..4ae7b0b83ebdb6 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl-fips.gypi @@ -349,6 +349,9 @@ 'openssl_defines_VC-WIN32': [ 'NDEBUG', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'OPENSSL_SYS_WIN32', 'WIN32_LEAN_AND_MEAN', 'UNICODE', @@ -378,7 +381,7 @@ '/W3 /wd4090 /nologo /O2', ], 'openssl_ex_libs_VC-WIN32': [ - 'ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', + 'ZLIB1 libzstd brotlicommon.lib brotlidec.lib brotlienc.lib ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', ], 'linker_script': '' }, diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl.gypi b/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl.gypi index ea34dae5791bfc..183e19453eb9c0 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl.gypi @@ -278,6 +278,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1122,6 +1127,40 @@ './config/archs/VC-WIN32/asm_avx2/providers/common/der/der_wrap_gen.c', ], 'openssl_defines_VC-WIN32': [ + 'NDEBUG', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'OPENSSL_SYS_WIN32', + 'WIN32_LEAN_AND_MEAN', + 'UNICODE', + '_UNICODE', + '_CRT_SECURE_NO_DEPRECATE', + '_WINSOCK_DEPRECATED_NO_WARNINGS', + 'AES_ASM', + 'CMLL_ASM', + 'DES_ASM', + 'ECP_NISTZ256_ASM', + 'GHASH_ASM', + 'MD5_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_BN_ASM_PART_WORDS', + 'OPENSSL_CPUID_OBJ', + 'OPENSSL_IA32_SSE2', + 'PADLOCK_ASM', + 'POLY1305_ASM', + 'RC4_ASM', + 'RMD160_ASM', + 'SHA1_ASM', + 'SHA256_ASM', + 'SHA512_ASM', + 'VPAES_ASM', + 'WHIRLPOOL_ASM', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_VC-WIN32': [ 'NDEBUG', 'OPENSSL_BUILDING_OPENSSL', 'OPENSSL_SYS_WIN32', @@ -1159,7 +1198,7 @@ '/W3 /wd4090 /nologo /O2', ], 'openssl_ex_libs_VC-WIN32': [ - 'ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', + 'ZLIB1 libzstd brotlicommon.lib brotlidec.lib brotlienc.lib ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', ], }, 'include_dirs': [ @@ -1174,6 +1213,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_VC-WIN32)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_VC-WIN32)'], + 'defines': ['<@(openssl_defines_exported_VC-WIN32)'], }, } 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 d7d59ee06e3f22..74b5ce846f98b2 100644 --- a/deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm @@ -120,6 +120,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -197,9 +198,7 @@ our %config = ( "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -229,9 +228,7 @@ our %config = ( "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -242,17 +239,22 @@ our %config = ( "OPENSSL_SYS_WIN32" ], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-asm no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "no-asm", "VC-WIN32" ], @@ -316,7 +318,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x5592ffbf0880)", + "RANLIB" => "CODE(0x58a7a4175a28)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -347,6 +349,9 @@ our %target = ( "cppflags" => "", "defines" => [ "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD", "OPENSSL_SYS_WIN32", "WIN32_LEAN_AND_MEAN", "UNICODE", @@ -358,8 +363,12 @@ our %target = ( "dso_cflags" => "/Zi /Fddso.pdb", "dso_scheme" => "win32", "enable" => [], - "ex_libs" => "ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib", - "includes" => [], + "ex_libs" => "ZLIB1 libzstd brotlicommon.lib brotlidec.lib brotlienc.lib ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "ld_implib_flag" => "/implib:", "ld_resp_delim" => " ", @@ -553,10 +562,8 @@ our %disabled = ( "afalgeng" => "option", "asan" => "default", "asm" => "option", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -588,12 +595,14 @@ our %disabled = ( "unit-test" => "default", "uplink" => "cascade", "weak-ssl-ciphers" => "default", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1081,6 +1090,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1348,6 +1360,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8352,6 +8367,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10110,6 +10129,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12056,6 +12089,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12117,6 +12151,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21286,6 +21321,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21871,6 +21910,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23599,6 +23642,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23688,6 +23732,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -24942,6 +24987,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -27866,6 +27926,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30391,6 +30456,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -30936,6 +31007,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31361,6 +31439,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32585,18 +32666,9 @@ my %disabled_info = ( "asm" => { "macro" => "OPENSSL_NO_ASM" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32690,15 +32762,9 @@ my %disabled_info = ( "weak-ssl-ciphers" => { "macro" => "OPENSSL_NO_WEAK_SSL_CIPHERS" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 1fb6ab1a1a46ed..70a7c0d5d0dade 100644 --- a/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: " -#define DATE "built on: Tue Jan 27 17:40:06 2026 UTC" +#define DATE "built on: Wed Mar 11 15:48:49 2026 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/configuration.h b/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/configuration.h index 113e70c6b9e7b8..d198e944ccea58 100644 --- a/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/configuration.h +++ b/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/configuration.h @@ -46,15 +46,9 @@ extern "C" { # ifndef OPENSSL_NO_ASM # define OPENSSL_NO_ASM # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -142,15 +136,9 @@ extern "C" { # ifndef OPENSSL_NO_WEAK_SSL_CIPHERS # define OPENSSL_NO_WEAK_SSL_CIPHERS # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/openssl-cl.gypi b/deps/openssl/config/archs/VC-WIN32/no-asm/openssl-cl.gypi index 530319ee1e2e35..0ceef19dd34fa6 100644 --- a/deps/openssl/config/archs/VC-WIN32/no-asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/VC-WIN32/no-asm/openssl-cl.gypi @@ -3,6 +3,9 @@ 'openssl_defines_VC-WIN32': [ 'NDEBUG', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'OPENSSL_SYS_WIN32', 'WIN32_LEAN_AND_MEAN', 'UNICODE', @@ -17,7 +20,7 @@ '/W3 /wd4090 /nologo /O2', ], 'openssl_ex_libs_VC-WIN32': [ - 'ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', + 'ZLIB1 libzstd brotlicommon.lib brotlidec.lib brotlienc.lib ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', ], 'openssl_cli_srcs_VC-WIN32': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/VC-WIN32/no-asm/openssl-fips.gypi index 1bfd7c4a4e246d..cedef446c725dc 100644 --- a/deps/openssl/config/archs/VC-WIN32/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/VC-WIN32/no-asm/openssl-fips.gypi @@ -330,6 +330,9 @@ 'openssl_defines_VC-WIN32': [ 'NDEBUG', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'OPENSSL_SYS_WIN32', 'WIN32_LEAN_AND_MEAN', 'UNICODE', @@ -345,7 +348,7 @@ '/W3 /wd4090 /nologo /O2', ], 'openssl_ex_libs_VC-WIN32': [ - 'ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', + 'ZLIB1 libzstd brotlicommon.lib brotlidec.lib brotlienc.lib ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', ], 'linker_script': '' }, diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/openssl.gypi b/deps/openssl/config/archs/VC-WIN32/no-asm/openssl.gypi index 2cd177674514a8..cdd0d6841361ba 100644 --- a/deps/openssl/config/archs/VC-WIN32/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/VC-WIN32/no-asm/openssl.gypi @@ -286,6 +286,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1110,6 +1115,20 @@ './config/archs/VC-WIN32/no-asm/providers/common/der/der_wrap_gen.c', ], 'openssl_defines_VC-WIN32': [ + 'NDEBUG', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'OPENSSL_SYS_WIN32', + 'WIN32_LEAN_AND_MEAN', + 'UNICODE', + '_UNICODE', + '_CRT_SECURE_NO_DEPRECATE', + '_WINSOCK_DEPRECATED_NO_WARNINGS', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_VC-WIN32': [ 'NDEBUG', 'OPENSSL_BUILDING_OPENSSL', 'OPENSSL_SYS_WIN32', @@ -1126,7 +1145,7 @@ '/W3 /wd4090 /nologo /O2', ], 'openssl_ex_libs_VC-WIN32': [ - 'ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', + 'ZLIB1 libzstd brotlicommon.lib brotlidec.lib brotlienc.lib ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', ], }, 'include_dirs': [ @@ -1141,6 +1160,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_VC-WIN32)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_VC-WIN32)'], + 'defines': ['<@(openssl_defines_exported_VC-WIN32)'], }, } 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 2e30b8f26a6e7d..17e350f095dc59 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 @@ -119,6 +119,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -197,9 +198,7 @@ our %config = ( "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -229,9 +228,7 @@ our %config = ( "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -240,17 +237,22 @@ our %config = ( ], "openssl_sys_defines" => [], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-asm no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "no-asm", "VC-WIN64-ARM" ], @@ -312,7 +314,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x55999cb2b9a0)", + "RANLIB" => "CODE(0x56ef7e1c4d68)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -339,6 +341,9 @@ our %target = ( "cppflags" => "", "defines" => [ "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD", "OPENSSL_SYS_WIN32", "WIN32_LEAN_AND_MEAN", "UNICODE", @@ -353,7 +358,11 @@ our %target = ( "dso_scheme" => "win32", "enable" => [], "ex_libs" => "onecore.lib", - "includes" => [], + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "ld_implib_flag" => "/implib:", "ld_resp_delim" => " ", @@ -545,10 +554,8 @@ our %disabled = ( "afalgeng" => "option", "asan" => "default", "asm" => "no asm_arch", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -580,12 +587,14 @@ our %disabled = ( "unit-test" => "default", "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1073,6 +1082,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1340,6 +1352,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8344,6 +8359,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10102,6 +10121,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12048,6 +12081,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12109,6 +12143,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21278,6 +21313,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21863,6 +21902,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23591,6 +23634,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23680,6 +23724,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -24934,6 +24979,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -27858,6 +27918,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30383,6 +30448,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -30928,6 +30999,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31353,6 +31431,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32577,18 +32658,9 @@ my %disabled_info = ( "asm" => { "macro" => "OPENSSL_NO_ASM" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32682,15 +32754,9 @@ my %disabled_info = ( "weak-ssl-ciphers" => { "macro" => "OPENSSL_NO_WEAK_SSL_CIPHERS" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 5ba5c0abed2166..87e6984869c107 100644 --- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: VC-WIN64-ARM" -#define DATE "built on: Tue Jan 27 17:40:20 2026 UTC" +#define DATE "built on: Wed Mar 11 15:49:00 2026 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/configuration.h b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/configuration.h index 8fde6aaeafe774..a20fadbffdbb72 100644 --- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/configuration.h +++ b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/configuration.h @@ -43,15 +43,9 @@ extern "C" { # ifndef OPENSSL_NO_ASM # define OPENSSL_NO_ASM # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -139,15 +133,9 @@ extern "C" { # ifndef OPENSSL_NO_WEAK_SSL_CIPHERS # define OPENSSL_NO_WEAK_SSL_CIPHERS # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/openssl-cl.gypi b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/openssl-cl.gypi index cd453fb703b754..da86cfe06d4ef7 100644 --- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/openssl-cl.gypi @@ -3,6 +3,9 @@ 'openssl_defines_VC-WIN64-ARM': [ 'NDEBUG', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'OPENSSL_SYS_WIN32', 'WIN32_LEAN_AND_MEAN', 'UNICODE', diff --git a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/openssl-fips.gypi index f85a51438a7158..47f62f8364c775 100644 --- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/openssl-fips.gypi @@ -330,6 +330,9 @@ 'openssl_defines_VC-WIN64-ARM': [ 'NDEBUG', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'OPENSSL_SYS_WIN32', 'WIN32_LEAN_AND_MEAN', 'UNICODE', diff --git a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/openssl.gypi b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/openssl.gypi index d48d1a61c89a22..102ebc98485ffb 100644 --- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/openssl.gypi @@ -286,6 +286,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1110,6 +1115,22 @@ './config/archs/VC-WIN64-ARM/no-asm/providers/common/der/der_wrap_gen.c', ], 'openssl_defines_VC-WIN64-ARM': [ + 'NDEBUG', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'OPENSSL_SYS_WIN32', + 'WIN32_LEAN_AND_MEAN', + 'UNICODE', + '_UNICODE', + '_CRT_SECURE_NO_DEPRECATE', + '_WINSOCK_DEPRECATED_NO_WARNINGS', + '_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE', + 'OPENSSL_SYS_WIN_CORE', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_VC-WIN64-ARM': [ 'NDEBUG', 'OPENSSL_BUILDING_OPENSSL', 'OPENSSL_SYS_WIN32', @@ -1143,6 +1164,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_VC-WIN64-ARM)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_VC-WIN64-ARM)'], + 'defines': ['<@(openssl_defines_exported_VC-WIN64-ARM)'], }, } diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm b/deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm index 8d8b179464192f..6728b771583054 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm @@ -122,6 +122,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -200,9 +201,7 @@ our %config = ( "OPENSSL_THREADS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -232,9 +231,7 @@ our %config = ( "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -245,17 +242,22 @@ our %config = ( "OPENSSL_SYS_WIN64A" ], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "VC-WIN64A" ], "perlenv" => { @@ -318,7 +320,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x55b7c154fd80)", + "RANLIB" => "CODE(0x5b0fa2e48998)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -349,6 +351,9 @@ our %target = ( "cppflags" => "", "defines" => [ "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD", "OPENSSL_SYS_WIN32", "WIN32_LEAN_AND_MEAN", "UNICODE", @@ -360,8 +365,12 @@ our %target = ( "dso_cflags" => "/Zi /Fddso.pdb", "dso_scheme" => "win32", "enable" => [], - "ex_libs" => "ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib", - "includes" => [], + "ex_libs" => "ZLIB1 libzstd brotlicommon.lib brotlidec.lib brotlienc.lib ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "ld_implib_flag" => "/implib:", "ld_resp_delim" => " ", @@ -555,10 +564,8 @@ our @disablables_int = ( our %disabled = ( "afalgeng" => "option", "asan" => "default", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -590,12 +597,14 @@ our %disabled = ( "unit-test" => "default", "uplink" => "cascade", "weak-ssl-ciphers" => "default", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1083,6 +1092,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1350,6 +1362,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8419,6 +8434,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10214,6 +10233,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12185,6 +12218,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12246,6 +12280,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21418,6 +21453,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -22003,6 +22042,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23731,6 +23774,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23820,6 +23864,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -25185,6 +25230,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -28202,6 +28262,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30771,6 +30836,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -31316,6 +31387,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31741,6 +31819,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32962,18 +33043,9 @@ my %disabled_info = ( "asan" => { "macro" => "OPENSSL_NO_ASAN" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -33067,15 +33139,9 @@ my %disabled_info = ( "weak-ssl-ciphers" => { "macro" => "OPENSSL_NO_WEAK_SSL_CIPHERS" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 b4f1193cd628b9..f010fff5881fd0 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: " -#define DATE "built on: Tue Jan 27 17:38:37 2026 UTC" +#define DATE "built on: Wed Mar 11 15:47:46 2026 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/configuration.h b/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/configuration.h index 30bfbe0b540169..50961b26f3d88e 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/configuration.h +++ b/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/configuration.h @@ -43,15 +43,9 @@ extern "C" { # ifndef OPENSSL_NO_ASAN # define OPENSSL_NO_ASAN # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -139,15 +133,9 @@ extern "C" { # ifndef OPENSSL_NO_WEAK_SSL_CIPHERS # define OPENSSL_NO_WEAK_SSL_CIPHERS # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/openssl-cl.gypi b/deps/openssl/config/archs/VC-WIN64A/asm/openssl-cl.gypi index 2de27868d138f9..d7dca40d518905 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/VC-WIN64A/asm/openssl-cl.gypi @@ -3,6 +3,9 @@ 'openssl_defines_VC-WIN64A': [ 'NDEBUG', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'OPENSSL_SYS_WIN32', 'WIN32_LEAN_AND_MEAN', 'UNICODE', @@ -39,7 +42,7 @@ '/W3 /wd4090 /nologo /O2', ], 'openssl_ex_libs_VC-WIN64A': [ - 'ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', + 'ZLIB1 libzstd brotlicommon.lib brotlidec.lib brotlienc.lib ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', ], 'openssl_cli_srcs_VC-WIN64A': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/openssl-fips.gypi b/deps/openssl/config/archs/VC-WIN64A/asm/openssl-fips.gypi index 03c0d5c847b84d..e46fd4ffd205a9 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/VC-WIN64A/asm/openssl-fips.gypi @@ -368,6 +368,9 @@ 'openssl_defines_VC-WIN64A': [ 'NDEBUG', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'OPENSSL_SYS_WIN32', 'WIN32_LEAN_AND_MEAN', 'UNICODE', @@ -399,7 +402,7 @@ '/W3 /wd4090 /nologo /O2', ], 'openssl_ex_libs_VC-WIN64A': [ - 'ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', + 'ZLIB1 libzstd brotlicommon.lib brotlidec.lib brotlienc.lib ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', ], 'linker_script': '' }, diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/openssl.gypi b/deps/openssl/config/archs/VC-WIN64A/asm/openssl.gypi index 8223693dea08c4..51b4843416987f 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/openssl.gypi +++ b/deps/openssl/config/archs/VC-WIN64A/asm/openssl.gypi @@ -283,6 +283,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1142,6 +1147,41 @@ './config/archs/VC-WIN64A/asm/providers/common/der/der_wrap_gen.c', ], 'openssl_defines_VC-WIN64A': [ + 'NDEBUG', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'OPENSSL_SYS_WIN32', + 'WIN32_LEAN_AND_MEAN', + 'UNICODE', + '_UNICODE', + '_CRT_SECURE_NO_DEPRECATE', + '_WINSOCK_DEPRECATED_NO_WARNINGS', + 'AES_ASM', + 'BSAES_ASM', + 'CMLL_ASM', + 'ECP_NISTZ256_ASM', + 'GHASH_ASM', + 'KECCAK1600_ASM', + 'MD5_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_BN_ASM_MONT5', + 'OPENSSL_CPUID_OBJ', + 'OPENSSL_IA32_SSE2', + 'PADLOCK_ASM', + 'POLY1305_ASM', + 'RC4_ASM', + 'SHA1_ASM', + 'SHA256_ASM', + 'SHA512_ASM', + 'VPAES_ASM', + 'WHIRLPOOL_ASM', + 'X25519_ASM', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_VC-WIN64A': [ 'NDEBUG', 'OPENSSL_BUILDING_OPENSSL', 'OPENSSL_SYS_WIN32', @@ -1180,7 +1220,7 @@ '/W3 /wd4090 /nologo /O2', ], 'openssl_ex_libs_VC-WIN64A': [ - 'ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', + 'ZLIB1 libzstd brotlicommon.lib brotlidec.lib brotlienc.lib ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', ], }, 'include_dirs': [ @@ -1195,6 +1235,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_VC-WIN64A)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_VC-WIN64A)'], + 'defines': ['<@(openssl_defines_exported_VC-WIN64A)'], }, } 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 0df1592755c740..cdca9e192e8810 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/configdata.pm @@ -122,6 +122,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -200,9 +201,7 @@ our %config = ( "OPENSSL_THREADS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -232,9 +231,7 @@ our %config = ( "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -245,17 +242,22 @@ our %config = ( "OPENSSL_SYS_WIN64A" ], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "VC-WIN64A" ], "perlenv" => { @@ -318,7 +320,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x55db31fd7f80)", + "RANLIB" => "CODE(0x574348ec6bd8)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -349,6 +351,9 @@ our %target = ( "cppflags" => "", "defines" => [ "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD", "OPENSSL_SYS_WIN32", "WIN32_LEAN_AND_MEAN", "UNICODE", @@ -360,8 +365,12 @@ our %target = ( "dso_cflags" => "/Zi /Fddso.pdb", "dso_scheme" => "win32", "enable" => [], - "ex_libs" => "ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib", - "includes" => [], + "ex_libs" => "ZLIB1 libzstd brotlicommon.lib brotlidec.lib brotlienc.lib ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "ld_implib_flag" => "/implib:", "ld_resp_delim" => " ", @@ -555,10 +564,8 @@ our @disablables_int = ( our %disabled = ( "afalgeng" => "option", "asan" => "default", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -590,12 +597,14 @@ our %disabled = ( "unit-test" => "default", "uplink" => "cascade", "weak-ssl-ciphers" => "default", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1083,6 +1092,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1350,6 +1362,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8419,6 +8434,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10214,6 +10233,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12185,6 +12218,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12246,6 +12280,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21418,6 +21453,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -22003,6 +22042,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23731,6 +23774,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23820,6 +23864,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -25185,6 +25230,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -28202,6 +28262,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30771,6 +30836,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -31316,6 +31387,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31741,6 +31819,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32962,18 +33043,9 @@ my %disabled_info = ( "asan" => { "macro" => "OPENSSL_NO_ASAN" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -33067,15 +33139,9 @@ my %disabled_info = ( "weak-ssl-ciphers" => { "macro" => "OPENSSL_NO_WEAK_SSL_CIPHERS" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 6278671a045897..c2e573e372807e 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: " -#define DATE "built on: Tue Jan 27 17:39:00 2026 UTC" +#define DATE "built on: Wed Mar 11 15:48:02 2026 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/configuration.h b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/configuration.h index 30bfbe0b540169..50961b26f3d88e 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/configuration.h +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/configuration.h @@ -43,15 +43,9 @@ extern "C" { # ifndef OPENSSL_NO_ASAN # define OPENSSL_NO_ASAN # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -139,15 +133,9 @@ extern "C" { # ifndef OPENSSL_NO_WEAK_SSL_CIPHERS # define OPENSSL_NO_WEAK_SSL_CIPHERS # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl-cl.gypi index b157348b51b406..26d797bbdf9280 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl-cl.gypi +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl-cl.gypi @@ -3,6 +3,9 @@ 'openssl_defines_VC-WIN64A': [ 'NDEBUG', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'OPENSSL_SYS_WIN32', 'WIN32_LEAN_AND_MEAN', 'UNICODE', @@ -39,7 +42,7 @@ '/W3 /wd4090 /nologo /O2', ], 'openssl_ex_libs_VC-WIN64A': [ - 'ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', + 'ZLIB1 libzstd brotlicommon.lib brotlidec.lib brotlienc.lib ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', ], 'openssl_cli_srcs_VC-WIN64A': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl-fips.gypi index b7d8cbbfab1747..2f1ba96ebd2d0e 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl-fips.gypi @@ -368,6 +368,9 @@ 'openssl_defines_VC-WIN64A': [ 'NDEBUG', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'OPENSSL_SYS_WIN32', 'WIN32_LEAN_AND_MEAN', 'UNICODE', @@ -399,7 +402,7 @@ '/W3 /wd4090 /nologo /O2', ], 'openssl_ex_libs_VC-WIN64A': [ - 'ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', + 'ZLIB1 libzstd brotlicommon.lib brotlidec.lib brotlienc.lib ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', ], 'linker_script': '' }, diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl.gypi b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl.gypi index ad55f0a83204fe..64c5249597ecc0 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl.gypi @@ -283,6 +283,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1142,6 +1147,41 @@ './config/archs/VC-WIN64A/asm_avx2/providers/common/der/der_wrap_gen.c', ], 'openssl_defines_VC-WIN64A': [ + 'NDEBUG', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'OPENSSL_SYS_WIN32', + 'WIN32_LEAN_AND_MEAN', + 'UNICODE', + '_UNICODE', + '_CRT_SECURE_NO_DEPRECATE', + '_WINSOCK_DEPRECATED_NO_WARNINGS', + 'AES_ASM', + 'BSAES_ASM', + 'CMLL_ASM', + 'ECP_NISTZ256_ASM', + 'GHASH_ASM', + 'KECCAK1600_ASM', + 'MD5_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_BN_ASM_MONT5', + 'OPENSSL_CPUID_OBJ', + 'OPENSSL_IA32_SSE2', + 'PADLOCK_ASM', + 'POLY1305_ASM', + 'RC4_ASM', + 'SHA1_ASM', + 'SHA256_ASM', + 'SHA512_ASM', + 'VPAES_ASM', + 'WHIRLPOOL_ASM', + 'X25519_ASM', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_VC-WIN64A': [ 'NDEBUG', 'OPENSSL_BUILDING_OPENSSL', 'OPENSSL_SYS_WIN32', @@ -1180,7 +1220,7 @@ '/W3 /wd4090 /nologo /O2', ], 'openssl_ex_libs_VC-WIN64A': [ - 'ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', + 'ZLIB1 libzstd brotlicommon.lib brotlidec.lib brotlienc.lib ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', ], }, 'include_dirs': [ @@ -1195,6 +1235,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_VC-WIN64A)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_VC-WIN64A)'], + 'defines': ['<@(openssl_defines_exported_VC-WIN64A)'], }, } 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 b5c4c040647e0a..8430267da24219 100644 --- a/deps/openssl/config/archs/VC-WIN64A/no-asm/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/configdata.pm @@ -122,6 +122,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -199,9 +200,7 @@ our %config = ( "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -231,9 +230,7 @@ our %config = ( "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -244,17 +241,22 @@ our %config = ( "OPENSSL_SYS_WIN64A" ], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-asm no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "no-asm", "VC-WIN64A" ], @@ -318,7 +320,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x55c0d782bbd0)", + "RANLIB" => "CODE(0x5deff8d5a818)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -349,6 +351,9 @@ our %target = ( "cppflags" => "", "defines" => [ "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD", "OPENSSL_SYS_WIN32", "WIN32_LEAN_AND_MEAN", "UNICODE", @@ -360,8 +365,12 @@ our %target = ( "dso_cflags" => "/Zi /Fddso.pdb", "dso_scheme" => "win32", "enable" => [], - "ex_libs" => "ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib", - "includes" => [], + "ex_libs" => "ZLIB1 libzstd brotlicommon.lib brotlidec.lib brotlienc.lib ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "ld_implib_flag" => "/implib:", "ld_resp_delim" => " ", @@ -556,10 +565,8 @@ our %disabled = ( "afalgeng" => "option", "asan" => "default", "asm" => "option", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -591,12 +598,14 @@ our %disabled = ( "unit-test" => "default", "uplink" => "cascade", "weak-ssl-ciphers" => "default", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1084,6 +1093,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1351,6 +1363,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8355,6 +8370,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10113,6 +10132,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12059,6 +12092,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12120,6 +12154,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21289,6 +21324,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21874,6 +21913,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23602,6 +23645,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23691,6 +23735,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -24945,6 +24990,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -27869,6 +27929,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30394,6 +30459,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -30939,6 +31010,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31364,6 +31442,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32588,18 +32669,9 @@ my %disabled_info = ( "asm" => { "macro" => "OPENSSL_NO_ASM" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32693,15 +32765,9 @@ my %disabled_info = ( "weak-ssl-ciphers" => { "macro" => "OPENSSL_NO_WEAK_SSL_CIPHERS" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 96dee6a28bea61..aa238c013bb8bf 100644 --- a/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: " -#define DATE "built on: Tue Jan 27 17:39:22 2026 UTC" +#define DATE "built on: Wed Mar 11 15:48:17 2026 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/configuration.h b/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/configuration.h index 673e21b471956a..4f2c58dc633ac5 100644 --- a/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/configuration.h +++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/configuration.h @@ -46,15 +46,9 @@ extern "C" { # ifndef OPENSSL_NO_ASM # define OPENSSL_NO_ASM # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -142,15 +136,9 @@ extern "C" { # ifndef OPENSSL_NO_WEAK_SSL_CIPHERS # define OPENSSL_NO_WEAK_SSL_CIPHERS # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl-cl.gypi b/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl-cl.gypi index ff7f1a59ed7849..d127058f34ea8b 100644 --- a/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl-cl.gypi @@ -3,6 +3,9 @@ 'openssl_defines_VC-WIN64A': [ 'NDEBUG', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'OPENSSL_SYS_WIN32', 'WIN32_LEAN_AND_MEAN', 'UNICODE', @@ -17,7 +20,7 @@ '/W3 /wd4090 /nologo /O2', ], 'openssl_ex_libs_VC-WIN64A': [ - 'ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', + 'ZLIB1 libzstd brotlicommon.lib brotlidec.lib brotlienc.lib ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', ], 'openssl_cli_srcs_VC-WIN64A': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl-fips.gypi index b55a20cd59d795..f90cb1ced624d9 100644 --- a/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl-fips.gypi @@ -330,6 +330,9 @@ 'openssl_defines_VC-WIN64A': [ 'NDEBUG', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'OPENSSL_SYS_WIN32', 'WIN32_LEAN_AND_MEAN', 'UNICODE', @@ -345,7 +348,7 @@ '/W3 /wd4090 /nologo /O2', ], 'openssl_ex_libs_VC-WIN64A': [ - 'ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', + 'ZLIB1 libzstd brotlicommon.lib brotlidec.lib brotlienc.lib ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', ], 'linker_script': '' }, diff --git a/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl.gypi b/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl.gypi index 7a39f9337fe074..626b914f76384e 100644 --- a/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl.gypi @@ -286,6 +286,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1110,6 +1115,20 @@ './config/archs/VC-WIN64A/no-asm/providers/common/der/der_wrap_gen.c', ], 'openssl_defines_VC-WIN64A': [ + 'NDEBUG', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'OPENSSL_SYS_WIN32', + 'WIN32_LEAN_AND_MEAN', + 'UNICODE', + '_UNICODE', + '_CRT_SECURE_NO_DEPRECATE', + '_WINSOCK_DEPRECATED_NO_WARNINGS', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_VC-WIN64A': [ 'NDEBUG', 'OPENSSL_BUILDING_OPENSSL', 'OPENSSL_SYS_WIN32', @@ -1126,7 +1145,7 @@ '/W3 /wd4090 /nologo /O2', ], 'openssl_ex_libs_VC-WIN64A': [ - 'ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', + 'ZLIB1 libzstd brotlicommon.lib brotlidec.lib brotlienc.lib ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', ], }, 'include_dirs': [ @@ -1141,6 +1160,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_VC-WIN64A)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_VC-WIN64A)'], + 'defines': ['<@(openssl_defines_exported_VC-WIN64A)'], }, } 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 d2888ae4fba76d..b2f67b9c06dc3d 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm/configdata.pm +++ b/deps/openssl/config/archs/aix64-gcc-as/asm/configdata.pm @@ -112,6 +112,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -189,9 +190,7 @@ our %config = ( "OPENSSL_THREADS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -222,9 +221,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -235,17 +232,22 @@ our %config = ( "OPENSSL_SYS_AIX" ], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "aix64-gcc-as" ], "perlenv" => { @@ -324,13 +326,20 @@ our %target = ( "cflags" => "-maix64 -pthread", "cppflags" => "", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_scheme" => "dlfcn", "enable" => [], - "ex_libs" => "-pthread", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd -pthread", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "-Wl,-bsvr4", "lib_cflags" => "", "lib_cppflags" => "-DB_ENDIAN", @@ -510,10 +519,8 @@ our @disablables_int = ( our %disabled = ( "afalgeng" => "option", "asan" => "default", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -546,12 +553,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1039,6 +1048,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1081,9 +1093,18 @@ our %unified_info = ( "test/buildtest_c_aes" => { "noinst" => "1" }, + "test/buildtest_c_asn1" => { + "noinst" => "1" + }, + "test/buildtest_c_asn1t" => { + "noinst" => "1" + }, "test/buildtest_c_async" => { "noinst" => "1" }, + "test/buildtest_c_bio" => { + "noinst" => "1" + }, "test/buildtest_c_blowfish" => { "noinst" => "1" }, @@ -1105,12 +1126,27 @@ our %unified_info = ( "test/buildtest_c_cmac" => { "noinst" => "1" }, + "test/buildtest_c_cmp" => { + "noinst" => "1" + }, "test/buildtest_c_cmp_util" => { "noinst" => "1" }, + "test/buildtest_c_cms" => { + "noinst" => "1" + }, + "test/buildtest_c_comp" => { + "noinst" => "1" + }, + "test/buildtest_c_conf" => { + "noinst" => "1" + }, "test/buildtest_c_conf_api" => { "noinst" => "1" }, + "test/buildtest_c_configuration" => { + "noinst" => "1" + }, "test/buildtest_c_conftypes" => { "noinst" => "1" }, @@ -1120,12 +1156,24 @@ our %unified_info = ( "test/buildtest_c_core_dispatch" => { "noinst" => "1" }, + "test/buildtest_c_core_names" => { + "noinst" => "1" + }, "test/buildtest_c_core_object" => { "noinst" => "1" }, + "test/buildtest_c_crmf" => { + "noinst" => "1" + }, + "test/buildtest_c_crypto" => { + "noinst" => "1" + }, "test/buildtest_c_cryptoerr_legacy" => { "noinst" => "1" }, + "test/buildtest_c_ct" => { + "noinst" => "1" + }, "test/buildtest_c_decoder" => { "noinst" => "1" }, @@ -1165,12 +1213,18 @@ our %unified_info = ( "test/buildtest_c_engine" => { "noinst" => "1" }, + "test/buildtest_c_ess" => { + "noinst" => "1" + }, "test/buildtest_c_evp" => { "noinst" => "1" }, "test/buildtest_c_fips_names" => { "noinst" => "1" }, + "test/buildtest_c_fipskey" => { + "noinst" => "1" + }, "test/buildtest_c_hmac" => { "noinst" => "1" }, @@ -1189,6 +1243,9 @@ our %unified_info = ( "test/buildtest_c_kdf" => { "noinst" => "1" }, + "test/buildtest_c_lhash" => { + "noinst" => "1" + }, "test/buildtest_c_macros" => { "noinst" => "1" }, @@ -1213,6 +1270,12 @@ our %unified_info = ( "test/buildtest_c_objects" => { "noinst" => "1" }, + "test/buildtest_c_ocsp" => { + "noinst" => "1" + }, + "test/buildtest_c_opensslv" => { + "noinst" => "1" + }, "test/buildtest_c_ossl_typ" => { "noinst" => "1" }, @@ -1228,6 +1291,12 @@ our %unified_info = ( "test/buildtest_c_pem2" => { "noinst" => "1" }, + "test/buildtest_c_pkcs12" => { + "noinst" => "1" + }, + "test/buildtest_c_pkcs7" => { + "noinst" => "1" + }, "test/buildtest_c_prov_ssl" => { "noinst" => "1" }, @@ -1252,6 +1321,9 @@ our %unified_info = ( "test/buildtest_c_rsa" => { "noinst" => "1" }, + "test/buildtest_c_safestack" => { + "noinst" => "1" + }, "test/buildtest_c_seed" => { "noinst" => "1" }, @@ -1261,9 +1333,15 @@ our %unified_info = ( "test/buildtest_c_sha" => { "noinst" => "1" }, + "test/buildtest_c_srp" => { + "noinst" => "1" + }, "test/buildtest_c_srtp" => { "noinst" => "1" }, + "test/buildtest_c_ssl" => { + "noinst" => "1" + }, "test/buildtest_c_ssl2" => { "noinst" => "1" }, @@ -1294,9 +1372,24 @@ our %unified_info = ( "test/buildtest_c_types" => { "noinst" => "1" }, + "test/buildtest_c_ui" => { + "noinst" => "1" + }, "test/buildtest_c_whrlpool" => { "noinst" => "1" }, + "test/buildtest_c_x509" => { + "noinst" => "1" + }, + "test/buildtest_c_x509_acert" => { + "noinst" => "1" + }, + "test/buildtest_c_x509_vfy" => { + "noinst" => "1" + }, + "test/buildtest_c_x509v3" => { + "noinst" => "1" + }, "test/byteorder_test" => { "noinst" => "1" }, @@ -1306,6 +1399,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8345,6 +8441,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -8401,10 +8501,22 @@ our %unified_info = ( "libcrypto", "libssl" ], + "test/buildtest_c_asn1" => [ + "libcrypto", + "libssl" + ], + "test/buildtest_c_asn1t" => [ + "libcrypto", + "libssl" + ], "test/buildtest_c_async" => [ "libcrypto", "libssl" ], + "test/buildtest_c_bio" => [ + "libcrypto", + "libssl" + ], "test/buildtest_c_blowfish" => [ "libcrypto", "libssl" @@ -8433,14 +8545,34 @@ our %unified_info = ( "libcrypto", "libssl" ], + "test/buildtest_c_cmp" => [ + "libcrypto", + "libssl" + ], "test/buildtest_c_cmp_util" => [ "libcrypto", "libssl" ], + "test/buildtest_c_cms" => [ + "libcrypto", + "libssl" + ], + "test/buildtest_c_comp" => [ + "libcrypto", + "libssl" + ], + "test/buildtest_c_conf" => [ + "libcrypto", + "libssl" + ], "test/buildtest_c_conf_api" => [ "libcrypto", "libssl" ], + "test/buildtest_c_configuration" => [ + "libcrypto", + "libssl" + ], "test/buildtest_c_conftypes" => [ "libcrypto", "libssl" @@ -8453,14 +8585,30 @@ our %unified_info = ( "libcrypto", "libssl" ], + "test/buildtest_c_core_names" => [ + "libcrypto", + "libssl" + ], "test/buildtest_c_core_object" => [ "libcrypto", "libssl" ], + "test/buildtest_c_crmf" => [ + "libcrypto", + "libssl" + ], + "test/buildtest_c_crypto" => [ + "libcrypto", + "libssl" + ], "test/buildtest_c_cryptoerr_legacy" => [ "libcrypto", "libssl" ], + "test/buildtest_c_ct" => [ + "libcrypto", + "libssl" + ], "test/buildtest_c_decoder" => [ "libcrypto", "libssl" @@ -8513,6 +8661,10 @@ our %unified_info = ( "libcrypto", "libssl" ], + "test/buildtest_c_ess" => [ + "libcrypto", + "libssl" + ], "test/buildtest_c_evp" => [ "libcrypto", "libssl" @@ -8521,6 +8673,10 @@ our %unified_info = ( "libcrypto", "libssl" ], + "test/buildtest_c_fipskey" => [ + "libcrypto", + "libssl" + ], "test/buildtest_c_hmac" => [ "libcrypto", "libssl" @@ -8545,6 +8701,10 @@ our %unified_info = ( "libcrypto", "libssl" ], + "test/buildtest_c_lhash" => [ + "libcrypto", + "libssl" + ], "test/buildtest_c_macros" => [ "libcrypto", "libssl" @@ -8577,6 +8737,14 @@ our %unified_info = ( "libcrypto", "libssl" ], + "test/buildtest_c_ocsp" => [ + "libcrypto", + "libssl" + ], + "test/buildtest_c_opensslv" => [ + "libcrypto", + "libssl" + ], "test/buildtest_c_ossl_typ" => [ "libcrypto", "libssl" @@ -8597,6 +8765,14 @@ our %unified_info = ( "libcrypto", "libssl" ], + "test/buildtest_c_pkcs12" => [ + "libcrypto", + "libssl" + ], + "test/buildtest_c_pkcs7" => [ + "libcrypto", + "libssl" + ], "test/buildtest_c_prov_ssl" => [ "libcrypto", "libssl" @@ -8629,6 +8805,10 @@ our %unified_info = ( "libcrypto", "libssl" ], + "test/buildtest_c_safestack" => [ + "libcrypto", + "libssl" + ], "test/buildtest_c_seed" => [ "libcrypto", "libssl" @@ -8641,10 +8821,18 @@ our %unified_info = ( "libcrypto", "libssl" ], + "test/buildtest_c_srp" => [ + "libcrypto", + "libssl" + ], "test/buildtest_c_srtp" => [ "libcrypto", "libssl" ], + "test/buildtest_c_ssl" => [ + "libcrypto", + "libssl" + ], "test/buildtest_c_ssl2" => [ "libcrypto", "libssl" @@ -8685,10 +8873,30 @@ our %unified_info = ( "libcrypto", "libssl" ], + "test/buildtest_c_ui" => [ + "libcrypto", + "libssl" + ], "test/buildtest_c_whrlpool" => [ "libcrypto", "libssl" ], + "test/buildtest_c_x509" => [ + "libcrypto", + "libssl" + ], + "test/buildtest_c_x509_acert" => [ + "libcrypto", + "libssl" + ], + "test/buildtest_c_x509_vfy" => [ + "libcrypto", + "libssl" + ], + "test/buildtest_c_x509v3" => [ + "libcrypto", + "libssl" + ], "test/byteorder_test" => [ "libcrypto.a", "test/libtestutil.a" @@ -10116,6 +10324,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12086,6 +12308,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12147,6 +12370,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -18714,10 +18938,22 @@ our %unified_info = ( "test/generate_buildtest.pl", "aes" ], + "test/buildtest_asn1.c" => [ + "test/generate_buildtest.pl", + "asn1" + ], + "test/buildtest_asn1t.c" => [ + "test/generate_buildtest.pl", + "asn1t" + ], "test/buildtest_async.c" => [ "test/generate_buildtest.pl", "async" ], + "test/buildtest_bio.c" => [ + "test/generate_buildtest.pl", + "bio" + ], "test/buildtest_blowfish.c" => [ "test/generate_buildtest.pl", "blowfish" @@ -18746,14 +18982,34 @@ our %unified_info = ( "test/generate_buildtest.pl", "cmac" ], + "test/buildtest_cmp.c" => [ + "test/generate_buildtest.pl", + "cmp" + ], "test/buildtest_cmp_util.c" => [ "test/generate_buildtest.pl", "cmp_util" ], + "test/buildtest_cms.c" => [ + "test/generate_buildtest.pl", + "cms" + ], + "test/buildtest_comp.c" => [ + "test/generate_buildtest.pl", + "comp" + ], + "test/buildtest_conf.c" => [ + "test/generate_buildtest.pl", + "conf" + ], "test/buildtest_conf_api.c" => [ "test/generate_buildtest.pl", "conf_api" ], + "test/buildtest_configuration.c" => [ + "test/generate_buildtest.pl", + "configuration" + ], "test/buildtest_conftypes.c" => [ "test/generate_buildtest.pl", "conftypes" @@ -18766,14 +19022,30 @@ our %unified_info = ( "test/generate_buildtest.pl", "core_dispatch" ], + "test/buildtest_core_names.c" => [ + "test/generate_buildtest.pl", + "core_names" + ], "test/buildtest_core_object.c" => [ "test/generate_buildtest.pl", "core_object" ], + "test/buildtest_crmf.c" => [ + "test/generate_buildtest.pl", + "crmf" + ], + "test/buildtest_crypto.c" => [ + "test/generate_buildtest.pl", + "crypto" + ], "test/buildtest_cryptoerr_legacy.c" => [ "test/generate_buildtest.pl", "cryptoerr_legacy" ], + "test/buildtest_ct.c" => [ + "test/generate_buildtest.pl", + "ct" + ], "test/buildtest_decoder.c" => [ "test/generate_buildtest.pl", "decoder" @@ -18826,6 +19098,10 @@ our %unified_info = ( "test/generate_buildtest.pl", "engine" ], + "test/buildtest_ess.c" => [ + "test/generate_buildtest.pl", + "ess" + ], "test/buildtest_evp.c" => [ "test/generate_buildtest.pl", "evp" @@ -18834,6 +19110,10 @@ our %unified_info = ( "test/generate_buildtest.pl", "fips_names" ], + "test/buildtest_fipskey.c" => [ + "test/generate_buildtest.pl", + "fipskey" + ], "test/buildtest_hmac.c" => [ "test/generate_buildtest.pl", "hmac" @@ -18858,6 +19138,10 @@ our %unified_info = ( "test/generate_buildtest.pl", "kdf" ], + "test/buildtest_lhash.c" => [ + "test/generate_buildtest.pl", + "lhash" + ], "test/buildtest_macros.c" => [ "test/generate_buildtest.pl", "macros" @@ -18890,6 +19174,14 @@ our %unified_info = ( "test/generate_buildtest.pl", "objects" ], + "test/buildtest_ocsp.c" => [ + "test/generate_buildtest.pl", + "ocsp" + ], + "test/buildtest_opensslv.c" => [ + "test/generate_buildtest.pl", + "opensslv" + ], "test/buildtest_ossl_typ.c" => [ "test/generate_buildtest.pl", "ossl_typ" @@ -18910,6 +19202,14 @@ our %unified_info = ( "test/generate_buildtest.pl", "pem2" ], + "test/buildtest_pkcs12.c" => [ + "test/generate_buildtest.pl", + "pkcs12" + ], + "test/buildtest_pkcs7.c" => [ + "test/generate_buildtest.pl", + "pkcs7" + ], "test/buildtest_prov_ssl.c" => [ "test/generate_buildtest.pl", "prov_ssl" @@ -18942,6 +19242,10 @@ our %unified_info = ( "test/generate_buildtest.pl", "rsa" ], + "test/buildtest_safestack.c" => [ + "test/generate_buildtest.pl", + "safestack" + ], "test/buildtest_seed.c" => [ "test/generate_buildtest.pl", "seed" @@ -18954,10 +19258,18 @@ our %unified_info = ( "test/generate_buildtest.pl", "sha" ], + "test/buildtest_srp.c" => [ + "test/generate_buildtest.pl", + "srp" + ], "test/buildtest_srtp.c" => [ "test/generate_buildtest.pl", "srtp" ], + "test/buildtest_ssl.c" => [ + "test/generate_buildtest.pl", + "ssl" + ], "test/buildtest_ssl2.c" => [ "test/generate_buildtest.pl", "ssl2" @@ -18998,10 +19310,30 @@ our %unified_info = ( "test/generate_buildtest.pl", "types" ], + "test/buildtest_ui.c" => [ + "test/generate_buildtest.pl", + "ui" + ], "test/buildtest_whrlpool.c" => [ "test/generate_buildtest.pl", "whrlpool" ], + "test/buildtest_x509.c" => [ + "test/generate_buildtest.pl", + "x509" + ], + "test/buildtest_x509_acert.c" => [ + "test/generate_buildtest.pl", + "x509_acert" + ], + "test/buildtest_x509_vfy.c" => [ + "test/generate_buildtest.pl", + "x509_vfy" + ], + "test/buildtest_x509v3.c" => [ + "test/generate_buildtest.pl", + "x509v3" + ], "test/p_minimal.ld" => [ "util/providers.num" ], @@ -21294,6 +21626,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21353,9 +21689,18 @@ our %unified_info = ( "test/buildtest_c_aes" => [ "include" ], + "test/buildtest_c_asn1" => [ + "include" + ], + "test/buildtest_c_asn1t" => [ + "include" + ], "test/buildtest_c_async" => [ "include" ], + "test/buildtest_c_bio" => [ + "include" + ], "test/buildtest_c_blowfish" => [ "include" ], @@ -21377,12 +21722,27 @@ our %unified_info = ( "test/buildtest_c_cmac" => [ "include" ], + "test/buildtest_c_cmp" => [ + "include" + ], "test/buildtest_c_cmp_util" => [ "include" ], + "test/buildtest_c_cms" => [ + "include" + ], + "test/buildtest_c_comp" => [ + "include" + ], + "test/buildtest_c_conf" => [ + "include" + ], "test/buildtest_c_conf_api" => [ "include" ], + "test/buildtest_c_configuration" => [ + "include" + ], "test/buildtest_c_conftypes" => [ "include" ], @@ -21392,12 +21752,24 @@ our %unified_info = ( "test/buildtest_c_core_dispatch" => [ "include" ], + "test/buildtest_c_core_names" => [ + "include" + ], "test/buildtest_c_core_object" => [ "include" ], + "test/buildtest_c_crmf" => [ + "include" + ], + "test/buildtest_c_crypto" => [ + "include" + ], "test/buildtest_c_cryptoerr_legacy" => [ "include" ], + "test/buildtest_c_ct" => [ + "include" + ], "test/buildtest_c_decoder" => [ "include" ], @@ -21437,12 +21809,18 @@ our %unified_info = ( "test/buildtest_c_engine" => [ "include" ], + "test/buildtest_c_ess" => [ + "include" + ], "test/buildtest_c_evp" => [ "include" ], "test/buildtest_c_fips_names" => [ "include" ], + "test/buildtest_c_fipskey" => [ + "include" + ], "test/buildtest_c_hmac" => [ "include" ], @@ -21461,6 +21839,9 @@ our %unified_info = ( "test/buildtest_c_kdf" => [ "include" ], + "test/buildtest_c_lhash" => [ + "include" + ], "test/buildtest_c_macros" => [ "include" ], @@ -21485,6 +21866,12 @@ our %unified_info = ( "test/buildtest_c_objects" => [ "include" ], + "test/buildtest_c_ocsp" => [ + "include" + ], + "test/buildtest_c_opensslv" => [ + "include" + ], "test/buildtest_c_ossl_typ" => [ "include" ], @@ -21500,6 +21887,12 @@ our %unified_info = ( "test/buildtest_c_pem2" => [ "include" ], + "test/buildtest_c_pkcs12" => [ + "include" + ], + "test/buildtest_c_pkcs7" => [ + "include" + ], "test/buildtest_c_prov_ssl" => [ "include" ], @@ -21524,6 +21917,9 @@ our %unified_info = ( "test/buildtest_c_rsa" => [ "include" ], + "test/buildtest_c_safestack" => [ + "include" + ], "test/buildtest_c_seed" => [ "include" ], @@ -21533,9 +21929,15 @@ our %unified_info = ( "test/buildtest_c_sha" => [ "include" ], + "test/buildtest_c_srp" => [ + "include" + ], "test/buildtest_c_srtp" => [ "include" ], + "test/buildtest_c_ssl" => [ + "include" + ], "test/buildtest_c_ssl2" => [ "include" ], @@ -21566,9 +21968,24 @@ our %unified_info = ( "test/buildtest_c_types" => [ "include" ], + "test/buildtest_c_ui" => [ + "include" + ], "test/buildtest_c_whrlpool" => [ "include" ], + "test/buildtest_c_x509" => [ + "include" + ], + "test/buildtest_c_x509_acert" => [ + "include" + ], + "test/buildtest_c_x509_vfy" => [ + "include" + ], + "test/buildtest_c_x509v3" => [ + "include" + ], "test/byteorder_test" => [ "include", "apps/include" @@ -21879,6 +22296,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23607,6 +24028,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23621,7 +24043,10 @@ our %unified_info = ( "test/bntest", "test/build_wincrypt_test", "test/buildtest_c_aes", + "test/buildtest_c_asn1", + "test/buildtest_c_asn1t", "test/buildtest_c_async", + "test/buildtest_c_bio", "test/buildtest_c_blowfish", "test/buildtest_c_bn", "test/buildtest_c_buffer", @@ -23629,13 +24054,22 @@ our %unified_info = ( "test/buildtest_c_camellia", "test/buildtest_c_cast", "test/buildtest_c_cmac", + "test/buildtest_c_cmp", "test/buildtest_c_cmp_util", + "test/buildtest_c_cms", + "test/buildtest_c_comp", + "test/buildtest_c_conf", "test/buildtest_c_conf_api", + "test/buildtest_c_configuration", "test/buildtest_c_conftypes", "test/buildtest_c_core", "test/buildtest_c_core_dispatch", + "test/buildtest_c_core_names", "test/buildtest_c_core_object", + "test/buildtest_c_crmf", + "test/buildtest_c_crypto", "test/buildtest_c_cryptoerr_legacy", + "test/buildtest_c_ct", "test/buildtest_c_decoder", "test/buildtest_c_des", "test/buildtest_c_dh", @@ -23649,14 +24083,17 @@ our %unified_info = ( "test/buildtest_c_ecdsa", "test/buildtest_c_encoder", "test/buildtest_c_engine", + "test/buildtest_c_ess", "test/buildtest_c_evp", "test/buildtest_c_fips_names", + "test/buildtest_c_fipskey", "test/buildtest_c_hmac", "test/buildtest_c_hpke", "test/buildtest_c_http", "test/buildtest_c_idea", "test/buildtest_c_indicator", "test/buildtest_c_kdf", + "test/buildtest_c_lhash", "test/buildtest_c_macros", "test/buildtest_c_md4", "test/buildtest_c_md5", @@ -23665,11 +24102,15 @@ our %unified_info = ( "test/buildtest_c_modes", "test/buildtest_c_obj_mac", "test/buildtest_c_objects", + "test/buildtest_c_ocsp", + "test/buildtest_c_opensslv", "test/buildtest_c_ossl_typ", "test/buildtest_c_param_build", "test/buildtest_c_params", "test/buildtest_c_pem", "test/buildtest_c_pem2", + "test/buildtest_c_pkcs12", + "test/buildtest_c_pkcs7", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", "test/buildtest_c_quic", @@ -23678,10 +24119,13 @@ our %unified_info = ( "test/buildtest_c_rc4", "test/buildtest_c_ripemd", "test/buildtest_c_rsa", + "test/buildtest_c_safestack", "test/buildtest_c_seed", "test/buildtest_c_self_test", "test/buildtest_c_sha", + "test/buildtest_c_srp", "test/buildtest_c_srtp", + "test/buildtest_c_ssl", "test/buildtest_c_ssl2", "test/buildtest_c_sslerr_legacy", "test/buildtest_c_stack", @@ -23692,10 +24136,16 @@ our %unified_info = ( "test/buildtest_c_ts", "test/buildtest_c_txt_db", "test/buildtest_c_types", + "test/buildtest_c_ui", "test/buildtest_c_whrlpool", + "test/buildtest_c_x509", + "test/buildtest_c_x509_acert", + "test/buildtest_c_x509_vfy", + "test/buildtest_c_x509v3", "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -24979,6 +25429,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -27991,6 +28456,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30537,6 +31007,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -30621,12 +31097,30 @@ our %unified_info = ( "test/buildtest_c_aes-bin-buildtest_aes.o" => [ "test/buildtest_aes.c" ], + "test/buildtest_c_asn1" => [ + "test/buildtest_c_asn1-bin-buildtest_asn1.o" + ], + "test/buildtest_c_asn1-bin-buildtest_asn1.o" => [ + "test/buildtest_asn1.c" + ], + "test/buildtest_c_asn1t" => [ + "test/buildtest_c_asn1t-bin-buildtest_asn1t.o" + ], + "test/buildtest_c_asn1t-bin-buildtest_asn1t.o" => [ + "test/buildtest_asn1t.c" + ], "test/buildtest_c_async" => [ "test/buildtest_c_async-bin-buildtest_async.o" ], "test/buildtest_c_async-bin-buildtest_async.o" => [ "test/buildtest_async.c" ], + "test/buildtest_c_bio" => [ + "test/buildtest_c_bio-bin-buildtest_bio.o" + ], + "test/buildtest_c_bio-bin-buildtest_bio.o" => [ + "test/buildtest_bio.c" + ], "test/buildtest_c_blowfish" => [ "test/buildtest_c_blowfish-bin-buildtest_blowfish.o" ], @@ -30669,18 +31163,48 @@ our %unified_info = ( "test/buildtest_c_cmac-bin-buildtest_cmac.o" => [ "test/buildtest_cmac.c" ], + "test/buildtest_c_cmp" => [ + "test/buildtest_c_cmp-bin-buildtest_cmp.o" + ], + "test/buildtest_c_cmp-bin-buildtest_cmp.o" => [ + "test/buildtest_cmp.c" + ], "test/buildtest_c_cmp_util" => [ "test/buildtest_c_cmp_util-bin-buildtest_cmp_util.o" ], "test/buildtest_c_cmp_util-bin-buildtest_cmp_util.o" => [ "test/buildtest_cmp_util.c" ], + "test/buildtest_c_cms" => [ + "test/buildtest_c_cms-bin-buildtest_cms.o" + ], + "test/buildtest_c_cms-bin-buildtest_cms.o" => [ + "test/buildtest_cms.c" + ], + "test/buildtest_c_comp" => [ + "test/buildtest_c_comp-bin-buildtest_comp.o" + ], + "test/buildtest_c_comp-bin-buildtest_comp.o" => [ + "test/buildtest_comp.c" + ], + "test/buildtest_c_conf" => [ + "test/buildtest_c_conf-bin-buildtest_conf.o" + ], + "test/buildtest_c_conf-bin-buildtest_conf.o" => [ + "test/buildtest_conf.c" + ], "test/buildtest_c_conf_api" => [ "test/buildtest_c_conf_api-bin-buildtest_conf_api.o" ], "test/buildtest_c_conf_api-bin-buildtest_conf_api.o" => [ "test/buildtest_conf_api.c" ], + "test/buildtest_c_configuration" => [ + "test/buildtest_c_configuration-bin-buildtest_configuration.o" + ], + "test/buildtest_c_configuration-bin-buildtest_configuration.o" => [ + "test/buildtest_configuration.c" + ], "test/buildtest_c_conftypes" => [ "test/buildtest_c_conftypes-bin-buildtest_conftypes.o" ], @@ -30699,18 +31223,42 @@ our %unified_info = ( "test/buildtest_c_core_dispatch-bin-buildtest_core_dispatch.o" => [ "test/buildtest_core_dispatch.c" ], + "test/buildtest_c_core_names" => [ + "test/buildtest_c_core_names-bin-buildtest_core_names.o" + ], + "test/buildtest_c_core_names-bin-buildtest_core_names.o" => [ + "test/buildtest_core_names.c" + ], "test/buildtest_c_core_object" => [ "test/buildtest_c_core_object-bin-buildtest_core_object.o" ], "test/buildtest_c_core_object-bin-buildtest_core_object.o" => [ "test/buildtest_core_object.c" ], + "test/buildtest_c_crmf" => [ + "test/buildtest_c_crmf-bin-buildtest_crmf.o" + ], + "test/buildtest_c_crmf-bin-buildtest_crmf.o" => [ + "test/buildtest_crmf.c" + ], + "test/buildtest_c_crypto" => [ + "test/buildtest_c_crypto-bin-buildtest_crypto.o" + ], + "test/buildtest_c_crypto-bin-buildtest_crypto.o" => [ + "test/buildtest_crypto.c" + ], "test/buildtest_c_cryptoerr_legacy" => [ "test/buildtest_c_cryptoerr_legacy-bin-buildtest_cryptoerr_legacy.o" ], "test/buildtest_c_cryptoerr_legacy-bin-buildtest_cryptoerr_legacy.o" => [ "test/buildtest_cryptoerr_legacy.c" ], + "test/buildtest_c_ct" => [ + "test/buildtest_c_ct-bin-buildtest_ct.o" + ], + "test/buildtest_c_ct-bin-buildtest_ct.o" => [ + "test/buildtest_ct.c" + ], "test/buildtest_c_decoder" => [ "test/buildtest_c_decoder-bin-buildtest_decoder.o" ], @@ -30789,6 +31337,12 @@ our %unified_info = ( "test/buildtest_c_engine-bin-buildtest_engine.o" => [ "test/buildtest_engine.c" ], + "test/buildtest_c_ess" => [ + "test/buildtest_c_ess-bin-buildtest_ess.o" + ], + "test/buildtest_c_ess-bin-buildtest_ess.o" => [ + "test/buildtest_ess.c" + ], "test/buildtest_c_evp" => [ "test/buildtest_c_evp-bin-buildtest_evp.o" ], @@ -30801,6 +31355,12 @@ our %unified_info = ( "test/buildtest_c_fips_names-bin-buildtest_fips_names.o" => [ "test/buildtest_fips_names.c" ], + "test/buildtest_c_fipskey" => [ + "test/buildtest_c_fipskey-bin-buildtest_fipskey.o" + ], + "test/buildtest_c_fipskey-bin-buildtest_fipskey.o" => [ + "test/buildtest_fipskey.c" + ], "test/buildtest_c_hmac" => [ "test/buildtest_c_hmac-bin-buildtest_hmac.o" ], @@ -30837,6 +31397,12 @@ our %unified_info = ( "test/buildtest_c_kdf-bin-buildtest_kdf.o" => [ "test/buildtest_kdf.c" ], + "test/buildtest_c_lhash" => [ + "test/buildtest_c_lhash-bin-buildtest_lhash.o" + ], + "test/buildtest_c_lhash-bin-buildtest_lhash.o" => [ + "test/buildtest_lhash.c" + ], "test/buildtest_c_macros" => [ "test/buildtest_c_macros-bin-buildtest_macros.o" ], @@ -30885,6 +31451,18 @@ our %unified_info = ( "test/buildtest_c_objects-bin-buildtest_objects.o" => [ "test/buildtest_objects.c" ], + "test/buildtest_c_ocsp" => [ + "test/buildtest_c_ocsp-bin-buildtest_ocsp.o" + ], + "test/buildtest_c_ocsp-bin-buildtest_ocsp.o" => [ + "test/buildtest_ocsp.c" + ], + "test/buildtest_c_opensslv" => [ + "test/buildtest_c_opensslv-bin-buildtest_opensslv.o" + ], + "test/buildtest_c_opensslv-bin-buildtest_opensslv.o" => [ + "test/buildtest_opensslv.c" + ], "test/buildtest_c_ossl_typ" => [ "test/buildtest_c_ossl_typ-bin-buildtest_ossl_typ.o" ], @@ -30915,6 +31493,18 @@ our %unified_info = ( "test/buildtest_c_pem2-bin-buildtest_pem2.o" => [ "test/buildtest_pem2.c" ], + "test/buildtest_c_pkcs12" => [ + "test/buildtest_c_pkcs12-bin-buildtest_pkcs12.o" + ], + "test/buildtest_c_pkcs12-bin-buildtest_pkcs12.o" => [ + "test/buildtest_pkcs12.c" + ], + "test/buildtest_c_pkcs7" => [ + "test/buildtest_c_pkcs7-bin-buildtest_pkcs7.o" + ], + "test/buildtest_c_pkcs7-bin-buildtest_pkcs7.o" => [ + "test/buildtest_pkcs7.c" + ], "test/buildtest_c_prov_ssl" => [ "test/buildtest_c_prov_ssl-bin-buildtest_prov_ssl.o" ], @@ -30963,6 +31553,12 @@ our %unified_info = ( "test/buildtest_c_rsa-bin-buildtest_rsa.o" => [ "test/buildtest_rsa.c" ], + "test/buildtest_c_safestack" => [ + "test/buildtest_c_safestack-bin-buildtest_safestack.o" + ], + "test/buildtest_c_safestack-bin-buildtest_safestack.o" => [ + "test/buildtest_safestack.c" + ], "test/buildtest_c_seed" => [ "test/buildtest_c_seed-bin-buildtest_seed.o" ], @@ -30981,12 +31577,24 @@ our %unified_info = ( "test/buildtest_c_sha-bin-buildtest_sha.o" => [ "test/buildtest_sha.c" ], + "test/buildtest_c_srp" => [ + "test/buildtest_c_srp-bin-buildtest_srp.o" + ], + "test/buildtest_c_srp-bin-buildtest_srp.o" => [ + "test/buildtest_srp.c" + ], "test/buildtest_c_srtp" => [ "test/buildtest_c_srtp-bin-buildtest_srtp.o" ], "test/buildtest_c_srtp-bin-buildtest_srtp.o" => [ "test/buildtest_srtp.c" ], + "test/buildtest_c_ssl" => [ + "test/buildtest_c_ssl-bin-buildtest_ssl.o" + ], + "test/buildtest_c_ssl-bin-buildtest_ssl.o" => [ + "test/buildtest_ssl.c" + ], "test/buildtest_c_ssl2" => [ "test/buildtest_c_ssl2-bin-buildtest_ssl2.o" ], @@ -31047,12 +31655,42 @@ our %unified_info = ( "test/buildtest_c_types-bin-buildtest_types.o" => [ "test/buildtest_types.c" ], + "test/buildtest_c_ui" => [ + "test/buildtest_c_ui-bin-buildtest_ui.o" + ], + "test/buildtest_c_ui-bin-buildtest_ui.o" => [ + "test/buildtest_ui.c" + ], "test/buildtest_c_whrlpool" => [ "test/buildtest_c_whrlpool-bin-buildtest_whrlpool.o" ], "test/buildtest_c_whrlpool-bin-buildtest_whrlpool.o" => [ "test/buildtest_whrlpool.c" ], + "test/buildtest_c_x509" => [ + "test/buildtest_c_x509-bin-buildtest_x509.o" + ], + "test/buildtest_c_x509-bin-buildtest_x509.o" => [ + "test/buildtest_x509.c" + ], + "test/buildtest_c_x509_acert" => [ + "test/buildtest_c_x509_acert-bin-buildtest_x509_acert.o" + ], + "test/buildtest_c_x509_acert-bin-buildtest_x509_acert.o" => [ + "test/buildtest_x509_acert.c" + ], + "test/buildtest_c_x509_vfy" => [ + "test/buildtest_c_x509_vfy-bin-buildtest_x509_vfy.o" + ], + "test/buildtest_c_x509_vfy-bin-buildtest_x509_vfy.o" => [ + "test/buildtest_x509_vfy.c" + ], + "test/buildtest_c_x509v3" => [ + "test/buildtest_c_x509v3-bin-buildtest_x509v3.o" + ], + "test/buildtest_c_x509v3-bin-buildtest_x509v3.o" => [ + "test/buildtest_x509v3.c" + ], "test/byteorder_test" => [ "test/byteorder_test-bin-byteorder_test.o" ], @@ -31082,6 +31720,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31507,6 +32152,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32730,18 +33378,9 @@ my %disabled_info = ( "asan" => { "macro" => "OPENSSL_NO_ASAN" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32838,15 +33477,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 6a69ea5fecf4fc..38556b83349b7e 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/aix64-gcc-as/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: aix64-gcc-as" -#define DATE "built on: Tue Jan 27 17:24:42 2026 UTC" +#define DATE "built on: Wed Mar 11 15:37:37 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -25,5 +25,10 @@ static const char compiler_flags[] = { ' ','-','O',' ','-','D','B','_','E','N','D','I','A','N',' ','-', 'D','O','P','E','N','S','S','L','_','P','I','C',' ','-','D','O', 'P','E','N','S','S','L','_','B','U','I','L','D','I','N','G','_', - 'O','P','E','N','S','S','L',' ','-','D','N','D','E','B','U','G','\0' + 'O','P','E','N','S','S','L',' ','-','D','B','R','O','T','L','I', + ' ','-','D','Z','L','I','B',' ','-','D','Z','S','T','D',' ','-', + 'D','N','D','E','B','U','G',' ','-','I','.','.','/','.','.','/', + 'b','r','o','t','l','i','/','c','/','i','n','c','l','u','d','e', + ' ','-','I','.','.','/','.','.','/','z','l','i','b',' ','-','I', + '.','.','/','.','.','/','z','s','t','d','/','l','i','b','\0' }; diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/configuration.h b/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/configuration.h index 864351678bb116..bf839c23b3b156 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/configuration.h +++ b/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/configuration.h @@ -44,15 +44,9 @@ extern "C" { # ifndef OPENSSL_NO_ASAN # define OPENSSL_NO_ASAN # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -143,15 +137,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm/openssl-cl.gypi b/deps/openssl/config/archs/aix64-gcc-as/asm/openssl-cl.gypi index 6e716704b82718..e986cc19314a9b 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/aix64-gcc-as/asm/openssl-cl.gypi @@ -4,6 +4,9 @@ 'NDEBUG', 'B_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'ECP_NISTZ256_ASM', 'KECCAK1600_ASM', @@ -23,7 +26,7 @@ '-O', ], 'openssl_ex_libs_aix64-gcc-as': [ - '-pthread', + '-lm -pthread', ], 'openssl_cli_srcs_aix64-gcc-as': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm/openssl-fips.gypi b/deps/openssl/config/archs/aix64-gcc-as/asm/openssl-fips.gypi index 42565428a601a2..60c79f0196fe5b 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/aix64-gcc-as/asm/openssl-fips.gypi @@ -354,6 +354,9 @@ 'NDEBUG', 'B_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'ECP_NISTZ256_ASM', 'FIPS_MODULE', @@ -373,7 +376,7 @@ '-O', ], 'openssl_ex_libs_aix64-gcc-as': [ - '-pthread', + '-lm -pthread', ], 'linker_script': '' }, diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm/openssl.gypi b/deps/openssl/config/archs/aix64-gcc-as/asm/openssl.gypi index 2c9de18b950e59..bac2ae6948f492 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm/openssl.gypi +++ b/deps/openssl/config/archs/aix64-gcc-as/asm/openssl.gypi @@ -286,6 +286,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1133,6 +1138,26 @@ './config/archs/aix64-gcc-as/asm/providers/fips.ld', ], 'openssl_defines_aix64-gcc-as': [ + 'NDEBUG', + 'B_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'AES_ASM', + 'ECP_NISTZ256_ASM', + 'KECCAK1600_ASM', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_CPUID_OBJ', + 'POLY1305_ASM', + 'SHA1_ASM', + 'SHA256_ASM', + 'SHA512_ASM', + 'VPAES_ASM', + 'X25519_ASM', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_aix64-gcc-as': [ 'NDEBUG', 'B_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', @@ -1155,7 +1180,7 @@ '-O', ], 'openssl_ex_libs_aix64-gcc-as': [ - '-pthread', + '-lm -pthread', ], }, 'include_dirs': [ @@ -1171,6 +1196,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_aix64-gcc-as)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_aix64-gcc-as)'], + 'defines': ['<@(openssl_defines_exported_aix64-gcc-as)'], }, } 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 2c4bb3fab9c880..a156247dbbf716 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 @@ -112,6 +112,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -189,9 +190,7 @@ our %config = ( "OPENSSL_THREADS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -222,9 +221,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -235,17 +232,22 @@ our %config = ( "OPENSSL_SYS_AIX" ], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "aix64-gcc-as" ], "perlenv" => { @@ -324,13 +326,20 @@ our %target = ( "cflags" => "-maix64 -pthread", "cppflags" => "", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_scheme" => "dlfcn", "enable" => [], - "ex_libs" => "-pthread", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd -pthread", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "-Wl,-bsvr4", "lib_cflags" => "", "lib_cppflags" => "-DB_ENDIAN", @@ -510,10 +519,8 @@ our @disablables_int = ( our %disabled = ( "afalgeng" => "option", "asan" => "default", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -546,12 +553,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1039,6 +1048,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1306,6 +1318,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8345,6 +8360,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10116,6 +10135,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12086,6 +12119,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12147,6 +12181,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21294,6 +21329,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21879,6 +21918,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23607,6 +23650,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23696,6 +23740,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -24979,6 +25024,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -27991,6 +28051,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30537,6 +30602,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -31082,6 +31153,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31507,6 +31585,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32730,18 +32811,9 @@ my %disabled_info = ( "asan" => { "macro" => "OPENSSL_NO_ASAN" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32838,15 +32910,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 732b1fe844d1b0..cd516ef38416ff 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: aix64-gcc-as" -#define DATE "built on: Tue Jan 27 17:24:59 2026 UTC" +#define DATE "built on: Wed Mar 11 15:37:49 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -26,6 +26,10 @@ static const char compiler_flags[] = { 'c','k',' ','-','O',' ','-','D','B','_','E','N','D','I','A','N', ' ','-','D','O','P','E','N','S','S','L','_','P','I','C',' ','-', 'D','O','P','E','N','S','S','L','_','B','U','I','L','D','I','N', - 'G','_','O','P','E','N','S','S','L',' ','-','D','N','D','E','B', - 'U','G','\0' + 'G','_','O','P','E','N','S','S','L',' ','-','D','B','R','O','T', + 'L','I',' ','-','D','Z','L','I','B',' ','-','D','Z','S','T','D', + ' ','-','D','N','D','E','B','U','G',' ','-','I','.','.','/','.', + '.','/','b','r','o','t','l','i','/','c','/','i','n','c','l','u', + 'd','e',' ','-','I','.','.','/','.','.','/','z','l','i','b',' ', + '-','I','.','.','/','.','.','/','z','s','t','d','/','l','i','b','\0' }; diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/configuration.h b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/configuration.h index 864351678bb116..bf839c23b3b156 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/configuration.h +++ b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/configuration.h @@ -44,15 +44,9 @@ extern "C" { # ifndef OPENSSL_NO_ASAN # define OPENSSL_NO_ASAN # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -143,15 +137,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/openssl-cl.gypi index 81147b9497d640..15fce9522140a3 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/openssl-cl.gypi +++ b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/openssl-cl.gypi @@ -4,6 +4,9 @@ 'NDEBUG', 'B_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'ECP_NISTZ256_ASM', 'KECCAK1600_ASM', @@ -23,7 +26,7 @@ '-O', ], 'openssl_ex_libs_aix64-gcc-as': [ - '-pthread', + '-lm -pthread', ], 'openssl_cli_srcs_aix64-gcc-as': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/openssl-fips.gypi index cc4851d83f0c9d..83e4f89bf24b23 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/openssl-fips.gypi @@ -354,6 +354,9 @@ 'NDEBUG', 'B_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'ECP_NISTZ256_ASM', 'FIPS_MODULE', @@ -373,7 +376,7 @@ '-O', ], 'openssl_ex_libs_aix64-gcc-as': [ - '-pthread', + '-lm -pthread', ], 'linker_script': '' }, diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/openssl.gypi b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/openssl.gypi index e600553fcedaa7..916f155cb6c12c 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/openssl.gypi @@ -286,6 +286,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1133,6 +1138,26 @@ './config/archs/aix64-gcc-as/asm_avx2/providers/fips.ld', ], 'openssl_defines_aix64-gcc-as': [ + 'NDEBUG', + 'B_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'AES_ASM', + 'ECP_NISTZ256_ASM', + 'KECCAK1600_ASM', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_CPUID_OBJ', + 'POLY1305_ASM', + 'SHA1_ASM', + 'SHA256_ASM', + 'SHA512_ASM', + 'VPAES_ASM', + 'X25519_ASM', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_aix64-gcc-as': [ 'NDEBUG', 'B_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', @@ -1155,7 +1180,7 @@ '-O', ], 'openssl_ex_libs_aix64-gcc-as': [ - '-pthread', + '-lm -pthread', ], }, 'include_dirs': [ @@ -1171,6 +1196,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_aix64-gcc-as)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_aix64-gcc-as)'], + 'defines': ['<@(openssl_defines_exported_aix64-gcc-as)'], }, } 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 e5347ae269c32d..5dc01ef0ee8f88 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 @@ -112,6 +112,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -188,9 +189,7 @@ our %config = ( "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -221,9 +220,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -234,17 +231,22 @@ our %config = ( "OPENSSL_SYS_AIX" ], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-asm no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "no-asm", "aix64-gcc-as" ], @@ -324,13 +326,20 @@ our %target = ( "cflags" => "-maix64 -pthread", "cppflags" => "", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_scheme" => "dlfcn", "enable" => [], - "ex_libs" => "-pthread", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd -pthread", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "-Wl,-bsvr4", "lib_cflags" => "", "lib_cppflags" => "-DB_ENDIAN", @@ -511,10 +520,8 @@ our %disabled = ( "afalgeng" => "option", "asan" => "default", "asm" => "option", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -547,12 +554,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1040,6 +1049,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1307,6 +1319,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8308,6 +8323,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10064,6 +10083,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12009,6 +12042,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12070,6 +12104,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21214,6 +21249,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21799,6 +21838,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23527,6 +23570,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23616,6 +23660,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -24860,6 +24905,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -27784,6 +27844,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30297,6 +30362,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -30842,6 +30913,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31267,6 +31345,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32493,18 +32574,9 @@ my %disabled_info = ( "asm" => { "macro" => "OPENSSL_NO_ASM" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32601,15 +32673,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 fc29be8278bcf0..cd384c1f73d15b 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/aix64-gcc-as/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: aix64-gcc-as" -#define DATE "built on: Tue Jan 27 17:25:15 2026 UTC" +#define DATE "built on: Wed Mar 11 15:38:01 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -24,5 +24,10 @@ static const char compiler_flags[] = { 'O',' ','-','D','B','_','E','N','D','I','A','N',' ','-','D','O', 'P','E','N','S','S','L','_','P','I','C',' ','-','D','O','P','E', 'N','S','S','L','_','B','U','I','L','D','I','N','G','_','O','P', - 'E','N','S','S','L',' ','-','D','N','D','E','B','U','G','\0' + 'E','N','S','S','L',' ','-','D','B','R','O','T','L','I',' ','-', + 'D','Z','L','I','B',' ','-','D','Z','S','T','D',' ','-','D','N', + 'D','E','B','U','G',' ','-','I','.','.','/','.','.','/','b','r', + 'o','t','l','i','/','c','/','i','n','c','l','u','d','e',' ','-', + 'I','.','.','/','.','.','/','z','l','i','b',' ','-','I','.','.', + '/','.','.','/','z','s','t','d','/','l','i','b','\0' }; diff --git a/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/configuration.h b/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/configuration.h index 680591823973f5..12867dd58f4e89 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/configuration.h +++ b/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/configuration.h @@ -47,15 +47,9 @@ extern "C" { # ifndef OPENSSL_NO_ASM # define OPENSSL_NO_ASM # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -146,15 +140,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/aix64-gcc-as/no-asm/openssl-cl.gypi b/deps/openssl/config/archs/aix64-gcc-as/no-asm/openssl-cl.gypi index e3e7f7eb70e421..1c2142988f5721 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/no-asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/aix64-gcc-as/no-asm/openssl-cl.gypi @@ -4,6 +4,9 @@ 'NDEBUG', 'B_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'OPENSSL_PIC', ], 'openssl_cflags_aix64-gcc-as': [ @@ -12,7 +15,7 @@ '-O', ], 'openssl_ex_libs_aix64-gcc-as': [ - '-pthread', + '-lm -pthread', ], 'openssl_cli_srcs_aix64-gcc-as': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/aix64-gcc-as/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/aix64-gcc-as/no-asm/openssl-fips.gypi index 73b6c38c827c60..5dac46e2650e26 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/aix64-gcc-as/no-asm/openssl-fips.gypi @@ -333,6 +333,9 @@ 'NDEBUG', 'B_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'FIPS_MODULE', 'FIPS_MODULE', ], @@ -342,7 +345,7 @@ '-O', ], 'openssl_ex_libs_aix64-gcc-as': [ - '-pthread', + '-lm -pthread', ], 'linker_script': '' }, diff --git a/deps/openssl/config/archs/aix64-gcc-as/no-asm/openssl.gypi b/deps/openssl/config/archs/aix64-gcc-as/no-asm/openssl.gypi index 75ffff2b75fd16..551fe7b0bed1d5 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/aix64-gcc-as/no-asm/openssl.gypi @@ -286,6 +286,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1111,6 +1116,15 @@ './config/archs/aix64-gcc-as/no-asm/providers/fips.ld', ], 'openssl_defines_aix64-gcc-as': [ + 'NDEBUG', + 'B_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_aix64-gcc-as': [ 'NDEBUG', 'B_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', @@ -1122,7 +1136,7 @@ '-O', ], 'openssl_ex_libs_aix64-gcc-as': [ - '-pthread', + '-lm -pthread', ], }, 'include_dirs': [ @@ -1138,6 +1152,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_aix64-gcc-as)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_aix64-gcc-as)'], + 'defines': ['<@(openssl_defines_exported_aix64-gcc-as)'], }, } 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 065a48272d1b33..f90ef0d1bb7e51 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/configdata.pm +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/configdata.pm @@ -112,6 +112,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -189,9 +190,7 @@ our %config = ( "OPENSSL_THREADS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -222,9 +221,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -235,17 +232,22 @@ our %config = ( "OPENSSL_SYS_MACOSX" ], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "darwin-i386-cc" ], "perlenv" => { @@ -324,13 +326,20 @@ our %target = ( "cflags" => "-arch i386", "cppflags" => "-D_REENTRANT", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_scheme" => "dlfcn", "enable" => [], - "ex_libs" => "", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "-Wl,-search_paths_first", "lib_cflags" => "", "lib_cppflags" => "-DL_ENDIAN", @@ -509,10 +518,8 @@ our @disablables_int = ( our %disabled = ( "afalgeng" => "option", "asan" => "default", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -545,12 +552,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1038,6 +1047,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1305,6 +1317,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8357,6 +8372,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10119,6 +10138,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12079,6 +12112,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12140,6 +12174,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21259,6 +21294,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21844,6 +21883,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23572,6 +23615,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23661,6 +23705,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -24923,6 +24968,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -27897,6 +27957,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30428,6 +30493,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -30973,6 +31044,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31398,6 +31476,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32619,18 +32700,9 @@ my %disabled_info = ( "asan" => { "macro" => "OPENSSL_NO_ASAN" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32727,15 +32799,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 03bcb7da85a93b..39b6428706a402 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin-i386-cc" -#define DATE "built on: Tue Jan 27 17:28:25 2026 UTC" +#define DATE "built on: Wed Mar 11 15:40:17 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -27,6 +27,11 @@ static const char compiler_flags[] = { 'D','I','A','N',' ','-','D','O','P','E','N','S','S','L','_','P', 'I','C',' ','-','D','_','R','E','E','N','T','R','A','N','T',' ', '-','D','O','P','E','N','S','S','L','_','B','U','I','L','D','I', - 'N','G','_','O','P','E','N','S','S','L',' ','-','D','N','D','E', - 'B','U','G','\0' + 'N','G','_','O','P','E','N','S','S','L',' ','-','D','B','R','O', + 'T','L','I',' ','-','D','Z','L','I','B',' ','-','D','Z','S','T', + 'D',' ','-','D','N','D','E','B','U','G',' ','-','I','.','.','/', + '.','.','/','b','r','o','t','l','i','/','c','/','i','n','c','l', + 'u','d','e',' ','-','I','.','.','/','.','.','/','z','l','i','b', + ' ','-','I','.','.','/','.','.','/','z','s','t','d','/','l','i', + 'b','\0' }; diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/configuration.h b/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/configuration.h index f8a15226bdff35..acbdaa5da95995 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/configuration.h +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/configuration.h @@ -44,15 +44,9 @@ extern "C" { # ifndef OPENSSL_NO_ASAN # define OPENSSL_NO_ASAN # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -143,15 +137,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/openssl-cl.gypi b/deps/openssl/config/archs/darwin-i386-cc/asm/openssl-cl.gypi index 8cecd066b0884d..bf7ac394582f51 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/openssl-cl.gypi @@ -4,6 +4,9 @@ 'NDEBUG', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'CMLL_ASM', 'DES_ASM', @@ -33,7 +36,7 @@ '-O3 -fomit-frame-pointer', ], 'openssl_ex_libs_darwin-i386-cc': [ - '', + '-lm', ], 'openssl_cli_srcs_darwin-i386-cc': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/openssl-fips.gypi b/deps/openssl/config/archs/darwin-i386-cc/asm/openssl-fips.gypi index a09c8de96c8ba4..8f76a721609d14 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/openssl-fips.gypi @@ -350,6 +350,9 @@ 'NDEBUG', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'DES_ASM', 'ECP_NISTZ256_ASM', @@ -373,7 +376,7 @@ '-O3 -fomit-frame-pointer', ], 'openssl_ex_libs_darwin-i386-cc': [ - '', + '-lm', ], 'linker_script': '' }, diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/openssl.gypi b/deps/openssl/config/archs/darwin-i386-cc/asm/openssl.gypi index 494e7ffed49ed2..17a4d83114b3b7 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/openssl.gypi +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/openssl.gypi @@ -278,6 +278,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1121,6 +1126,35 @@ './config/archs/darwin-i386-cc/asm/providers/common/der/der_wrap_gen.c', ], 'openssl_defines_darwin-i386-cc': [ + 'NDEBUG', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'AES_ASM', + 'CMLL_ASM', + 'DES_ASM', + 'ECP_NISTZ256_ASM', + 'GHASH_ASM', + 'MD5_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_BN_ASM_PART_WORDS', + 'OPENSSL_CPUID_OBJ', + 'OPENSSL_IA32_SSE2', + 'PADLOCK_ASM', + 'POLY1305_ASM', + 'RC4_ASM', + 'RMD160_ASM', + 'SHA1_ASM', + 'SHA256_ASM', + 'SHA512_ASM', + 'VPAES_ASM', + 'WHIRLPOOL_ASM', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_darwin-i386-cc': [ 'NDEBUG', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', @@ -1153,7 +1187,7 @@ '-O3 -fomit-frame-pointer', ], 'openssl_ex_libs_darwin-i386-cc': [ - '', + '-lm', ], }, 'include_dirs': [ @@ -1169,6 +1203,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_darwin-i386-cc)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_darwin-i386-cc)'], + 'defines': ['<@(openssl_defines_exported_darwin-i386-cc)'], }, } 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 60224210b8b73d..6f310da8ff2164 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 @@ -112,6 +112,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -189,9 +190,7 @@ our %config = ( "OPENSSL_THREADS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -222,9 +221,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -235,17 +232,22 @@ our %config = ( "OPENSSL_SYS_MACOSX" ], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "darwin-i386-cc" ], "perlenv" => { @@ -324,13 +326,20 @@ our %target = ( "cflags" => "-arch i386", "cppflags" => "-D_REENTRANT", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_scheme" => "dlfcn", "enable" => [], - "ex_libs" => "", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "-Wl,-search_paths_first", "lib_cflags" => "", "lib_cppflags" => "-DL_ENDIAN", @@ -509,10 +518,8 @@ our @disablables_int = ( our %disabled = ( "afalgeng" => "option", "asan" => "default", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -545,12 +552,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1038,6 +1047,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1305,6 +1317,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8357,6 +8372,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10119,6 +10138,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12079,6 +12112,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12140,6 +12174,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21259,6 +21294,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21844,6 +21883,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23572,6 +23615,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23661,6 +23705,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -24923,6 +24968,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -27897,6 +27957,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30428,6 +30493,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -30973,6 +31044,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31398,6 +31476,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32619,18 +32700,9 @@ my %disabled_info = ( "asan" => { "macro" => "OPENSSL_NO_ASAN" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32727,15 +32799,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 b83b1cd54b62e9..5362ef70917a2f 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin-i386-cc" -#define DATE "built on: Tue Jan 27 17:28:42 2026 UTC" +#define DATE "built on: Wed Mar 11 15:40:28 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -28,6 +28,11 @@ static const char compiler_flags[] = { 'E','N','D','I','A','N',' ','-','D','O','P','E','N','S','S','L', '_','P','I','C',' ','-','D','_','R','E','E','N','T','R','A','N', 'T',' ','-','D','O','P','E','N','S','S','L','_','B','U','I','L', - 'D','I','N','G','_','O','P','E','N','S','S','L',' ','-','D','N', - 'D','E','B','U','G','\0' + 'D','I','N','G','_','O','P','E','N','S','S','L',' ','-','D','B', + 'R','O','T','L','I',' ','-','D','Z','L','I','B',' ','-','D','Z', + 'S','T','D',' ','-','D','N','D','E','B','U','G',' ','-','I','.', + '.','/','.','.','/','b','r','o','t','l','i','/','c','/','i','n', + 'c','l','u','d','e',' ','-','I','.','.','/','.','.','/','z','l', + 'i','b',' ','-','I','.','.','/','.','.','/','z','s','t','d','/', + 'l','i','b','\0' }; diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/configuration.h b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/configuration.h index f8a15226bdff35..acbdaa5da95995 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/configuration.h +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/configuration.h @@ -44,15 +44,9 @@ extern "C" { # ifndef OPENSSL_NO_ASAN # define OPENSSL_NO_ASAN # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -143,15 +137,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl-cl.gypi index 0a31a94ea4d4f1..38858fbdef5ee9 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl-cl.gypi +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl-cl.gypi @@ -4,6 +4,9 @@ 'NDEBUG', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'CMLL_ASM', 'DES_ASM', @@ -33,7 +36,7 @@ '-O3 -fomit-frame-pointer', ], 'openssl_ex_libs_darwin-i386-cc': [ - '', + '-lm', ], 'openssl_cli_srcs_darwin-i386-cc': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl-fips.gypi index f8011a09b7bff6..adc3fc6ce9ecf4 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl-fips.gypi @@ -350,6 +350,9 @@ 'NDEBUG', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'DES_ASM', 'ECP_NISTZ256_ASM', @@ -373,7 +376,7 @@ '-O3 -fomit-frame-pointer', ], 'openssl_ex_libs_darwin-i386-cc': [ - '', + '-lm', ], 'linker_script': '' }, diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl.gypi b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl.gypi index a72215cf5cfc07..4518a4e9c25e42 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl.gypi @@ -278,6 +278,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1121,6 +1126,35 @@ './config/archs/darwin-i386-cc/asm_avx2/providers/common/der/der_wrap_gen.c', ], 'openssl_defines_darwin-i386-cc': [ + 'NDEBUG', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'AES_ASM', + 'CMLL_ASM', + 'DES_ASM', + 'ECP_NISTZ256_ASM', + 'GHASH_ASM', + 'MD5_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_BN_ASM_PART_WORDS', + 'OPENSSL_CPUID_OBJ', + 'OPENSSL_IA32_SSE2', + 'PADLOCK_ASM', + 'POLY1305_ASM', + 'RC4_ASM', + 'RMD160_ASM', + 'SHA1_ASM', + 'SHA256_ASM', + 'SHA512_ASM', + 'VPAES_ASM', + 'WHIRLPOOL_ASM', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_darwin-i386-cc': [ 'NDEBUG', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', @@ -1153,7 +1187,7 @@ '-O3 -fomit-frame-pointer', ], 'openssl_ex_libs_darwin-i386-cc': [ - '', + '-lm', ], }, 'include_dirs': [ @@ -1169,6 +1203,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_darwin-i386-cc)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_darwin-i386-cc)'], + 'defines': ['<@(openssl_defines_exported_darwin-i386-cc)'], }, } 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 73231b28932e34..89a3c71b8a3fe2 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 @@ -112,6 +112,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -188,9 +189,7 @@ our %config = ( "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -221,9 +220,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -234,17 +231,22 @@ our %config = ( "OPENSSL_SYS_MACOSX" ], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-asm no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "no-asm", "darwin-i386-cc" ], @@ -324,13 +326,20 @@ our %target = ( "cflags" => "-arch i386", "cppflags" => "-D_REENTRANT", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_scheme" => "dlfcn", "enable" => [], - "ex_libs" => "", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "-Wl,-search_paths_first", "lib_cflags" => "", "lib_cppflags" => "-DL_ENDIAN", @@ -510,10 +519,8 @@ our %disabled = ( "afalgeng" => "option", "asan" => "default", "asm" => "option", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -546,12 +553,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1039,6 +1048,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1306,6 +1318,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8299,6 +8314,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10055,6 +10074,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -11999,6 +12032,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12060,6 +12094,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21176,6 +21211,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21761,6 +21800,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23489,6 +23532,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23578,6 +23622,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -24822,6 +24867,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -27746,6 +27806,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30257,6 +30322,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -30802,6 +30873,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31227,6 +31305,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32451,18 +32532,9 @@ my %disabled_info = ( "asm" => { "macro" => "OPENSSL_NO_ASM" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32559,15 +32631,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 b9a7699af252cd..b5fa5c8214f7e9 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin-i386-cc" -#define DATE "built on: Tue Jan 27 17:28:59 2026 UTC" +#define DATE "built on: Wed Mar 11 15:40:41 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -26,5 +26,10 @@ static const char compiler_flags[] = { 'N',' ','-','D','O','P','E','N','S','S','L','_','P','I','C',' ', '-','D','_','R','E','E','N','T','R','A','N','T',' ','-','D','O', 'P','E','N','S','S','L','_','B','U','I','L','D','I','N','G','_', - 'O','P','E','N','S','S','L',' ','-','D','N','D','E','B','U','G','\0' + 'O','P','E','N','S','S','L',' ','-','D','B','R','O','T','L','I', + ' ','-','D','Z','L','I','B',' ','-','D','Z','S','T','D',' ','-', + 'D','N','D','E','B','U','G',' ','-','I','.','.','/','.','.','/', + 'b','r','o','t','l','i','/','c','/','i','n','c','l','u','d','e', + ' ','-','I','.','.','/','.','.','/','z','l','i','b',' ','-','I', + '.','.','/','.','.','/','z','s','t','d','/','l','i','b','\0' }; diff --git a/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/configuration.h b/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/configuration.h index 8823b14bca5bfe..5591824069c596 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/configuration.h +++ b/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/configuration.h @@ -47,15 +47,9 @@ extern "C" { # ifndef OPENSSL_NO_ASM # define OPENSSL_NO_ASM # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -146,15 +140,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/darwin-i386-cc/no-asm/openssl-cl.gypi b/deps/openssl/config/archs/darwin-i386-cc/no-asm/openssl-cl.gypi index f695ce5b96a8ab..b94451b8f875de 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/no-asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/darwin-i386-cc/no-asm/openssl-cl.gypi @@ -4,6 +4,9 @@ 'NDEBUG', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'OPENSSL_PIC', ], 'openssl_cflags_darwin-i386-cc': [ @@ -12,7 +15,7 @@ '-O3 -fomit-frame-pointer', ], 'openssl_ex_libs_darwin-i386-cc': [ - '', + '-lm', ], 'openssl_cli_srcs_darwin-i386-cc': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/darwin-i386-cc/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/darwin-i386-cc/no-asm/openssl-fips.gypi index 1dd482582817b3..a3e183df55db16 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/darwin-i386-cc/no-asm/openssl-fips.gypi @@ -331,6 +331,9 @@ 'NDEBUG', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'FIPS_MODULE', 'FIPS_MODULE', ], @@ -340,7 +343,7 @@ '-O3 -fomit-frame-pointer', ], 'openssl_ex_libs_darwin-i386-cc': [ - '', + '-lm', ], 'linker_script': '' }, diff --git a/deps/openssl/config/archs/darwin-i386-cc/no-asm/openssl.gypi b/deps/openssl/config/archs/darwin-i386-cc/no-asm/openssl.gypi index cc59c0f6807c8e..74fa1c3e5aad60 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/darwin-i386-cc/no-asm/openssl.gypi @@ -286,6 +286,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1109,6 +1114,15 @@ './config/archs/darwin-i386-cc/no-asm/providers/common/der/der_wrap_gen.c', ], 'openssl_defines_darwin-i386-cc': [ + 'NDEBUG', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_darwin-i386-cc': [ 'NDEBUG', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', @@ -1120,7 +1134,7 @@ '-O3 -fomit-frame-pointer', ], 'openssl_ex_libs_darwin-i386-cc': [ - '', + '-lm', ], }, 'include_dirs': [ @@ -1136,6 +1150,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_darwin-i386-cc)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_darwin-i386-cc)'], + 'defines': ['<@(openssl_defines_exported_darwin-i386-cc)'], }, } 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 c9bdc194c16688..cfd58e3f4e8c3d 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm/configdata.pm +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm/configdata.pm @@ -112,6 +112,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -189,9 +190,7 @@ our %config = ( "OPENSSL_THREADS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -222,9 +221,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -235,17 +232,22 @@ our %config = ( "OPENSSL_SYS_MACOSX" ], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "darwin64-arm64-cc" ], "perlenv" => { @@ -324,13 +326,20 @@ our %target = ( "cflags" => "-arch arm64", "cppflags" => "-D_REENTRANT", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_scheme" => "dlfcn", "enable" => [], - "ex_libs" => "", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "-Wl,-search_paths_first", "lib_cflags" => "", "lib_cppflags" => "-DL_ENDIAN", @@ -509,10 +518,8 @@ our @disablables_int = ( our %disabled = ( "afalgeng" => "option", "asan" => "default", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -545,12 +552,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1038,6 +1047,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1305,6 +1317,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8347,6 +8362,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10114,6 +10133,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12086,6 +12119,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12147,6 +12181,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21368,6 +21403,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21953,6 +21992,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23681,6 +23724,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23770,6 +23814,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -25041,6 +25086,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -28060,6 +28120,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30605,6 +30670,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -31150,6 +31221,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31575,6 +31653,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32796,18 +32877,9 @@ my %disabled_info = ( "asan" => { "macro" => "OPENSSL_NO_ASAN" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32904,15 +32976,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 c1735da364a496..bc98e45374d97b 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin64-arm64-cc" -#define DATE "built on: Tue Jan 27 17:29:14 2026 UTC" +#define DATE "built on: Wed Mar 11 15:40:52 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -26,6 +26,11 @@ static const char compiler_flags[] = { 'E','N','D','I','A','N',' ','-','D','O','P','E','N','S','S','L', '_','P','I','C',' ','-','D','_','R','E','E','N','T','R','A','N', 'T',' ','-','D','O','P','E','N','S','S','L','_','B','U','I','L', - 'D','I','N','G','_','O','P','E','N','S','S','L',' ','-','D','N', - 'D','E','B','U','G','\0' + 'D','I','N','G','_','O','P','E','N','S','S','L',' ','-','D','B', + 'R','O','T','L','I',' ','-','D','Z','L','I','B',' ','-','D','Z', + 'S','T','D',' ','-','D','N','D','E','B','U','G',' ','-','I','.', + '.','/','.','.','/','b','r','o','t','l','i','/','c','/','i','n', + 'c','l','u','d','e',' ','-','I','.','.','/','.','.','/','z','l', + 'i','b',' ','-','I','.','.','/','.','.','/','z','s','t','d','/', + 'l','i','b','\0' }; diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/configuration.h b/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/configuration.h index 8adadc8a1803a1..6c45824758980e 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/configuration.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/configuration.h @@ -44,15 +44,9 @@ extern "C" { # ifndef OPENSSL_NO_ASAN # define OPENSSL_NO_ASAN # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -143,15 +137,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm/openssl-cl.gypi b/deps/openssl/config/archs/darwin64-arm64-cc/asm/openssl-cl.gypi index 6d8634febd3575..4a5b923dad5bbf 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm/openssl-cl.gypi @@ -4,6 +4,9 @@ 'NDEBUG', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'BSAES_ASM', 'ECP_NISTZ256_ASM', 'ECP_SM2P256_ASM', @@ -28,7 +31,7 @@ '-O3 -Wall', ], 'openssl_ex_libs_darwin64-arm64-cc': [ - '', + '-lm', ], 'openssl_cli_srcs_darwin64-arm64-cc': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm/openssl-fips.gypi b/deps/openssl/config/archs/darwin64-arm64-cc/asm/openssl-fips.gypi index d942744f24a951..a5b855a49268f1 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm/openssl-fips.gypi @@ -355,6 +355,9 @@ 'NDEBUG', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'BSAES_ASM', 'ECP_NISTZ256_ASM', 'ECP_SM2P256_ASM', @@ -377,7 +380,7 @@ '-O3 -Wall', ], 'openssl_ex_libs_darwin64-arm64-cc': [ - '', + '-lm', ], 'linker_script': '' }, diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm/openssl.gypi b/deps/openssl/config/archs/darwin64-arm64-cc/asm/openssl.gypi index b3ddc67124bc4d..7e2091f3d8b611 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm/openssl.gypi +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm/openssl.gypi @@ -285,6 +285,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1132,6 +1137,30 @@ './config/archs/darwin64-arm64-cc/asm/providers/common/der/der_wrap_gen.c', ], 'openssl_defines_darwin64-arm64-cc': [ + 'NDEBUG', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'BSAES_ASM', + 'ECP_NISTZ256_ASM', + 'ECP_SM2P256_ASM', + 'KECCAK1600_ASM', + 'MD5_ASM', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_CPUID_OBJ', + 'OPENSSL_SM3_ASM', + 'POLY1305_ASM', + 'SHA1_ASM', + 'SHA256_ASM', + 'SHA512_ASM', + 'SM4_ASM', + 'VPAES_ASM', + 'VPSM4_ASM', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_darwin64-arm64-cc': [ 'NDEBUG', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', @@ -1159,7 +1188,7 @@ '-O3 -Wall', ], 'openssl_ex_libs_darwin64-arm64-cc': [ - '', + '-lm', ], }, 'include_dirs': [ @@ -1175,6 +1204,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_darwin64-arm64-cc)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_darwin64-arm64-cc)'], + 'defines': ['<@(openssl_defines_exported_darwin64-arm64-cc)'], }, } 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 62bce20835c4af..2a41772ffa4144 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 @@ -112,6 +112,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -189,9 +190,7 @@ our %config = ( "OPENSSL_THREADS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -222,9 +221,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -235,17 +232,22 @@ our %config = ( "OPENSSL_SYS_MACOSX" ], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "darwin64-arm64-cc" ], "perlenv" => { @@ -324,13 +326,20 @@ our %target = ( "cflags" => "-arch arm64", "cppflags" => "-D_REENTRANT", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_scheme" => "dlfcn", "enable" => [], - "ex_libs" => "", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "-Wl,-search_paths_first", "lib_cflags" => "", "lib_cppflags" => "-DL_ENDIAN", @@ -509,10 +518,8 @@ our @disablables_int = ( our %disabled = ( "afalgeng" => "option", "asan" => "default", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -545,12 +552,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1038,6 +1047,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1305,6 +1317,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8347,6 +8362,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10114,6 +10133,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12086,6 +12119,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12147,6 +12181,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21368,6 +21403,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21953,6 +21992,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23681,6 +23724,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23770,6 +23814,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -25041,6 +25086,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -28060,6 +28120,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30605,6 +30670,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -31150,6 +31221,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31575,6 +31653,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32796,18 +32877,9 @@ my %disabled_info = ( "asan" => { "macro" => "OPENSSL_NO_ASAN" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32904,15 +32976,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 fe5b798f400a4a..9af61b900023b7 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin64-arm64-cc" -#define DATE "built on: Tue Jan 27 17:29:31 2026 UTC" +#define DATE "built on: Wed Mar 11 15:41:04 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -28,5 +28,10 @@ static const char compiler_flags[] = { 'S','L','_','P','I','C',' ','-','D','_','R','E','E','N','T','R', 'A','N','T',' ','-','D','O','P','E','N','S','S','L','_','B','U', 'I','L','D','I','N','G','_','O','P','E','N','S','S','L',' ','-', - 'D','N','D','E','B','U','G','\0' + 'D','B','R','O','T','L','I',' ','-','D','Z','L','I','B',' ','-', + 'D','Z','S','T','D',' ','-','D','N','D','E','B','U','G',' ','-', + 'I','.','.','/','.','.','/','b','r','o','t','l','i','/','c','/', + 'i','n','c','l','u','d','e',' ','-','I','.','.','/','.','.','/', + 'z','l','i','b',' ','-','I','.','.','/','.','.','/','z','s','t', + 'd','/','l','i','b','\0' }; diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/configuration.h b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/configuration.h index 8adadc8a1803a1..6c45824758980e 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/configuration.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/configuration.h @@ -44,15 +44,9 @@ extern "C" { # ifndef OPENSSL_NO_ASAN # define OPENSSL_NO_ASAN # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -143,15 +137,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/openssl-cl.gypi index d97d8a092ad246..9d1ff74cd1da3a 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/openssl-cl.gypi +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/openssl-cl.gypi @@ -4,6 +4,9 @@ 'NDEBUG', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'BSAES_ASM', 'ECP_NISTZ256_ASM', 'ECP_SM2P256_ASM', @@ -28,7 +31,7 @@ '-O3 -Wall', ], 'openssl_ex_libs_darwin64-arm64-cc': [ - '', + '-lm', ], 'openssl_cli_srcs_darwin64-arm64-cc': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/openssl-fips.gypi index 942ef14388f83b..648560da0c2b02 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/openssl-fips.gypi @@ -355,6 +355,9 @@ 'NDEBUG', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'BSAES_ASM', 'ECP_NISTZ256_ASM', 'ECP_SM2P256_ASM', @@ -377,7 +380,7 @@ '-O3 -Wall', ], 'openssl_ex_libs_darwin64-arm64-cc': [ - '', + '-lm', ], 'linker_script': '' }, diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/openssl.gypi b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/openssl.gypi index a55ec2d80cda87..ee131330c356c0 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/openssl.gypi @@ -285,6 +285,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1132,6 +1137,30 @@ './config/archs/darwin64-arm64-cc/asm_avx2/providers/common/der/der_wrap_gen.c', ], 'openssl_defines_darwin64-arm64-cc': [ + 'NDEBUG', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'BSAES_ASM', + 'ECP_NISTZ256_ASM', + 'ECP_SM2P256_ASM', + 'KECCAK1600_ASM', + 'MD5_ASM', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_CPUID_OBJ', + 'OPENSSL_SM3_ASM', + 'POLY1305_ASM', + 'SHA1_ASM', + 'SHA256_ASM', + 'SHA512_ASM', + 'SM4_ASM', + 'VPAES_ASM', + 'VPSM4_ASM', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_darwin64-arm64-cc': [ 'NDEBUG', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', @@ -1159,7 +1188,7 @@ '-O3 -Wall', ], 'openssl_ex_libs_darwin64-arm64-cc': [ - '', + '-lm', ], }, 'include_dirs': [ @@ -1175,6 +1204,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_darwin64-arm64-cc)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_darwin64-arm64-cc)'], + 'defines': ['<@(openssl_defines_exported_darwin64-arm64-cc)'], }, } 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 4223dbfc9e2e17..f5d41cf5c29cb1 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 @@ -112,6 +112,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -188,9 +189,7 @@ our %config = ( "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -221,9 +220,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -234,17 +231,22 @@ our %config = ( "OPENSSL_SYS_MACOSX" ], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-asm no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "no-asm", "darwin64-arm64-cc" ], @@ -324,13 +326,20 @@ our %target = ( "cflags" => "-arch arm64", "cppflags" => "-D_REENTRANT", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_scheme" => "dlfcn", "enable" => [], - "ex_libs" => "", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "-Wl,-search_paths_first", "lib_cflags" => "", "lib_cppflags" => "-DL_ENDIAN", @@ -510,10 +519,8 @@ our %disabled = ( "afalgeng" => "option", "asan" => "default", "asm" => "option", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -546,12 +553,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1039,6 +1048,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1306,6 +1318,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8299,6 +8314,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10055,6 +10074,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -11999,6 +12032,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12060,6 +12094,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21176,6 +21211,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21761,6 +21800,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23489,6 +23532,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23578,6 +23622,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -24822,6 +24867,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -27746,6 +27806,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30257,6 +30322,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -30802,6 +30873,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31227,6 +31305,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32451,18 +32532,9 @@ my %disabled_info = ( "asm" => { "macro" => "OPENSSL_NO_ASM" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32559,15 +32631,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 99c2e287d6b0b6..44842832e924e5 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin64-arm64-cc" -#define DATE "built on: Tue Jan 27 17:29:48 2026 UTC" +#define DATE "built on: Wed Mar 11 15:41:17 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -25,6 +25,10 @@ static const char compiler_flags[] = { 'I','A','N',' ','-','D','O','P','E','N','S','S','L','_','P','I', 'C',' ','-','D','_','R','E','E','N','T','R','A','N','T',' ','-', 'D','O','P','E','N','S','S','L','_','B','U','I','L','D','I','N', - 'G','_','O','P','E','N','S','S','L',' ','-','D','N','D','E','B', - 'U','G','\0' + 'G','_','O','P','E','N','S','S','L',' ','-','D','B','R','O','T', + 'L','I',' ','-','D','Z','L','I','B',' ','-','D','Z','S','T','D', + ' ','-','D','N','D','E','B','U','G',' ','-','I','.','.','/','.', + '.','/','b','r','o','t','l','i','/','c','/','i','n','c','l','u', + 'd','e',' ','-','I','.','.','/','.','.','/','z','l','i','b',' ', + '-','I','.','.','/','.','.','/','z','s','t','d','/','l','i','b','\0' }; diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/configuration.h b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/configuration.h index d591c99694fdda..44299b254b5578 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/configuration.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/configuration.h @@ -47,15 +47,9 @@ extern "C" { # ifndef OPENSSL_NO_ASM # define OPENSSL_NO_ASM # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -146,15 +140,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/openssl-cl.gypi b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/openssl-cl.gypi index 83052b88f37f51..2b34a0b54f0fa4 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/openssl-cl.gypi @@ -4,6 +4,9 @@ 'NDEBUG', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'OPENSSL_PIC', ], 'openssl_cflags_darwin64-arm64-cc': [ @@ -12,7 +15,7 @@ '-O3 -Wall', ], 'openssl_ex_libs_darwin64-arm64-cc': [ - '', + '-lm', ], 'openssl_cli_srcs_darwin64-arm64-cc': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/openssl-fips.gypi index 13f09884e61ee4..df3be2bdb90f9f 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/openssl-fips.gypi @@ -331,6 +331,9 @@ 'NDEBUG', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'FIPS_MODULE', 'FIPS_MODULE', ], @@ -340,7 +343,7 @@ '-O3 -Wall', ], 'openssl_ex_libs_darwin64-arm64-cc': [ - '', + '-lm', ], 'linker_script': '' }, diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/openssl.gypi b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/openssl.gypi index c36e968366112b..d65c8f96b1ce78 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/openssl.gypi @@ -286,6 +286,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1109,6 +1114,15 @@ './config/archs/darwin64-arm64-cc/no-asm/providers/common/der/der_wrap_gen.c', ], 'openssl_defines_darwin64-arm64-cc': [ + 'NDEBUG', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_darwin64-arm64-cc': [ 'NDEBUG', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', @@ -1120,7 +1134,7 @@ '-O3 -Wall', ], 'openssl_ex_libs_darwin64-arm64-cc': [ - '', + '-lm', ], }, 'include_dirs': [ @@ -1136,6 +1150,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_darwin64-arm64-cc)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_darwin64-arm64-cc)'], + 'defines': ['<@(openssl_defines_exported_darwin64-arm64-cc)'], }, } 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 1c91ad90488d68..a389781012fce2 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 @@ -112,6 +112,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -189,9 +190,7 @@ our %config = ( "OPENSSL_THREADS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -222,9 +221,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -235,17 +232,22 @@ our %config = ( "OPENSSL_SYS_MACOSX" ], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "darwin64-x86_64-cc" ], "perlenv" => { @@ -324,13 +326,20 @@ our %target = ( "cflags" => "-arch x86_64", "cppflags" => "-D_REENTRANT", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_scheme" => "dlfcn", "enable" => [], - "ex_libs" => "", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "-Wl,-search_paths_first", "lib_cflags" => "", "lib_cppflags" => "-DL_ENDIAN", @@ -509,10 +518,8 @@ our @disablables_int = ( our %disabled = ( "afalgeng" => "option", "asan" => "default", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -545,12 +552,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1038,6 +1047,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1305,6 +1317,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8363,6 +8378,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10166,6 +10185,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12135,6 +12168,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12196,6 +12230,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21315,6 +21350,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21900,6 +21939,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23628,6 +23671,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23717,6 +23761,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -25072,6 +25117,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -28089,6 +28149,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30644,6 +30709,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -31189,6 +31260,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31614,6 +31692,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32835,18 +32916,9 @@ my %disabled_info = ( "asan" => { "macro" => "OPENSSL_NO_ASAN" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32943,15 +33015,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 9e25e370f1ca07..fd45f4f6e8c413 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin64-x86_64-cc" -#define DATE "built on: Tue Jan 27 17:27:23 2026 UTC" +#define DATE "built on: Wed Mar 11 15:39:33 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -27,5 +27,10 @@ static const char compiler_flags[] = { 'L','_','P','I','C',' ','-','D','_','R','E','E','N','T','R','A', 'N','T',' ','-','D','O','P','E','N','S','S','L','_','B','U','I', 'L','D','I','N','G','_','O','P','E','N','S','S','L',' ','-','D', - 'N','D','E','B','U','G','\0' + 'B','R','O','T','L','I',' ','-','D','Z','L','I','B',' ','-','D', + 'Z','S','T','D',' ','-','D','N','D','E','B','U','G',' ','-','I', + '.','.','/','.','.','/','b','r','o','t','l','i','/','c','/','i', + 'n','c','l','u','d','e',' ','-','I','.','.','/','.','.','/','z', + 'l','i','b',' ','-','I','.','.','/','.','.','/','z','s','t','d', + '/','l','i','b','\0' }; diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/configuration.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/configuration.h index 8adadc8a1803a1..6c45824758980e 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/configuration.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/configuration.h @@ -44,15 +44,9 @@ extern "C" { # ifndef OPENSSL_NO_ASAN # define OPENSSL_NO_ASAN # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -143,15 +137,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl-cl.gypi b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl-cl.gypi index e6837cf2fbb1be..51879bb1a5ea84 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl-cl.gypi @@ -4,6 +4,9 @@ 'NDEBUG', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'BSAES_ASM', 'CMLL_ASM', @@ -34,7 +37,7 @@ '-O3 -Wall', ], 'openssl_ex_libs_darwin64-x86_64-cc': [ - '', + '-lm', ], 'openssl_cli_srcs_darwin64-x86_64-cc': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl-fips.gypi b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl-fips.gypi index d410da85b3130f..c10a3229679b6c 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl-fips.gypi @@ -369,6 +369,9 @@ 'NDEBUG', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'BSAES_ASM', 'ECP_NISTZ256_ASM', @@ -394,7 +397,7 @@ '-O3 -Wall', ], 'openssl_ex_libs_darwin64-x86_64-cc': [ - '', + '-lm', ], 'linker_script': '' }, diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl.gypi b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl.gypi index e9c2bc3974dd4d..074ee3f02409ef 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl.gypi +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl.gypi @@ -283,6 +283,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1141,6 +1146,36 @@ './config/archs/darwin64-x86_64-cc/asm/providers/common/der/der_wrap_gen.c', ], 'openssl_defines_darwin64-x86_64-cc': [ + 'NDEBUG', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'AES_ASM', + 'BSAES_ASM', + 'CMLL_ASM', + 'ECP_NISTZ256_ASM', + 'GHASH_ASM', + 'KECCAK1600_ASM', + 'MD5_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_BN_ASM_MONT5', + 'OPENSSL_CPUID_OBJ', + 'OPENSSL_IA32_SSE2', + 'PADLOCK_ASM', + 'POLY1305_ASM', + 'RC4_ASM', + 'SHA1_ASM', + 'SHA256_ASM', + 'SHA512_ASM', + 'VPAES_ASM', + 'WHIRLPOOL_ASM', + 'X25519_ASM', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_darwin64-x86_64-cc': [ 'NDEBUG', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', @@ -1174,7 +1209,7 @@ '-O3 -Wall', ], 'openssl_ex_libs_darwin64-x86_64-cc': [ - '', + '-lm', ], }, 'include_dirs': [ @@ -1190,6 +1225,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_darwin64-x86_64-cc)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_darwin64-x86_64-cc)'], + 'defines': ['<@(openssl_defines_exported_darwin64-x86_64-cc)'], }, } 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 bfb76101a6d0e3..08f01084df1020 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 @@ -112,6 +112,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -189,9 +190,7 @@ our %config = ( "OPENSSL_THREADS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -222,9 +221,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -235,17 +232,22 @@ our %config = ( "OPENSSL_SYS_MACOSX" ], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "darwin64-x86_64-cc" ], "perlenv" => { @@ -324,13 +326,20 @@ our %target = ( "cflags" => "-arch x86_64", "cppflags" => "-D_REENTRANT", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_scheme" => "dlfcn", "enable" => [], - "ex_libs" => "", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "-Wl,-search_paths_first", "lib_cflags" => "", "lib_cppflags" => "-DL_ENDIAN", @@ -509,10 +518,8 @@ our @disablables_int = ( our %disabled = ( "afalgeng" => "option", "asan" => "default", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -545,12 +552,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1038,6 +1047,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1305,6 +1317,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8363,6 +8378,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10166,6 +10185,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12135,6 +12168,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12196,6 +12230,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21315,6 +21350,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21900,6 +21939,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23628,6 +23671,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23717,6 +23761,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -25072,6 +25117,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -28089,6 +28149,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30644,6 +30709,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -31189,6 +31260,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31614,6 +31692,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32835,18 +32916,9 @@ my %disabled_info = ( "asan" => { "macro" => "OPENSSL_NO_ASAN" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32943,15 +33015,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 8b2ad2a1136895..1ab5c56d7ef713 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin64-x86_64-cc" -#define DATE "built on: Tue Jan 27 17:27:50 2026 UTC" +#define DATE "built on: Wed Mar 11 15:39:51 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -28,5 +28,10 @@ static const char compiler_flags[] = { 'S','S','L','_','P','I','C',' ','-','D','_','R','E','E','N','T', 'R','A','N','T',' ','-','D','O','P','E','N','S','S','L','_','B', 'U','I','L','D','I','N','G','_','O','P','E','N','S','S','L',' ', - '-','D','N','D','E','B','U','G','\0' + '-','D','B','R','O','T','L','I',' ','-','D','Z','L','I','B',' ', + '-','D','Z','S','T','D',' ','-','D','N','D','E','B','U','G',' ', + '-','I','.','.','/','.','.','/','b','r','o','t','l','i','/','c', + '/','i','n','c','l','u','d','e',' ','-','I','.','.','/','.','.', + '/','z','l','i','b',' ','-','I','.','.','/','.','.','/','z','s', + 't','d','/','l','i','b','\0' }; diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/configuration.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/configuration.h index 8adadc8a1803a1..6c45824758980e 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/configuration.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/configuration.h @@ -44,15 +44,9 @@ extern "C" { # ifndef OPENSSL_NO_ASAN # define OPENSSL_NO_ASAN # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -143,15 +137,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl-cl.gypi index c3500cfc53bc12..690b1793e8b79c 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl-cl.gypi +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl-cl.gypi @@ -4,6 +4,9 @@ 'NDEBUG', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'BSAES_ASM', 'CMLL_ASM', @@ -34,7 +37,7 @@ '-O3 -Wall', ], 'openssl_ex_libs_darwin64-x86_64-cc': [ - '', + '-lm', ], 'openssl_cli_srcs_darwin64-x86_64-cc': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl-fips.gypi index 7dcf32d3e02060..ee18c935fc014c 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl-fips.gypi @@ -369,6 +369,9 @@ 'NDEBUG', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'BSAES_ASM', 'ECP_NISTZ256_ASM', @@ -394,7 +397,7 @@ '-O3 -Wall', ], 'openssl_ex_libs_darwin64-x86_64-cc': [ - '', + '-lm', ], 'linker_script': '' }, diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl.gypi b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl.gypi index 0a0ba759b78804..fb034d85fdf20a 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl.gypi @@ -283,6 +283,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1141,6 +1146,36 @@ './config/archs/darwin64-x86_64-cc/asm_avx2/providers/common/der/der_wrap_gen.c', ], 'openssl_defines_darwin64-x86_64-cc': [ + 'NDEBUG', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'AES_ASM', + 'BSAES_ASM', + 'CMLL_ASM', + 'ECP_NISTZ256_ASM', + 'GHASH_ASM', + 'KECCAK1600_ASM', + 'MD5_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_BN_ASM_MONT5', + 'OPENSSL_CPUID_OBJ', + 'OPENSSL_IA32_SSE2', + 'PADLOCK_ASM', + 'POLY1305_ASM', + 'RC4_ASM', + 'SHA1_ASM', + 'SHA256_ASM', + 'SHA512_ASM', + 'VPAES_ASM', + 'WHIRLPOOL_ASM', + 'X25519_ASM', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_darwin64-x86_64-cc': [ 'NDEBUG', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', @@ -1174,7 +1209,7 @@ '-O3 -Wall', ], 'openssl_ex_libs_darwin64-x86_64-cc': [ - '', + '-lm', ], }, 'include_dirs': [ @@ -1190,6 +1225,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_darwin64-x86_64-cc)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_darwin64-x86_64-cc)'], + 'defines': ['<@(openssl_defines_exported_darwin64-x86_64-cc)'], }, } 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 b7899dd4f09380..d28def3f84c2cb 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 @@ -112,6 +112,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -188,9 +189,7 @@ our %config = ( "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -221,9 +220,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -234,17 +231,22 @@ our %config = ( "OPENSSL_SYS_MACOSX" ], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-asm no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "no-asm", "darwin64-x86_64-cc" ], @@ -324,13 +326,20 @@ our %target = ( "cflags" => "-arch x86_64", "cppflags" => "-D_REENTRANT", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_scheme" => "dlfcn", "enable" => [], - "ex_libs" => "", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "-Wl,-search_paths_first", "lib_cflags" => "", "lib_cppflags" => "-DL_ENDIAN", @@ -510,10 +519,8 @@ our %disabled = ( "afalgeng" => "option", "asan" => "default", "asm" => "option", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -546,12 +553,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1039,6 +1048,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1306,6 +1318,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8299,6 +8314,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10055,6 +10074,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -11999,6 +12032,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12060,6 +12094,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21176,6 +21211,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21761,6 +21800,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23489,6 +23532,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23578,6 +23622,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -24822,6 +24867,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -27746,6 +27806,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30257,6 +30322,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -30802,6 +30873,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31227,6 +31305,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32451,18 +32532,9 @@ my %disabled_info = ( "asm" => { "macro" => "OPENSSL_NO_ASM" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32559,15 +32631,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 b715619fa10376..ef62d8455a7508 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin64-x86_64-cc" -#define DATE "built on: Tue Jan 27 17:28:10 2026 UTC" +#define DATE "built on: Wed Mar 11 15:40:06 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -25,6 +25,11 @@ static const char compiler_flags[] = { 'D','I','A','N',' ','-','D','O','P','E','N','S','S','L','_','P', 'I','C',' ','-','D','_','R','E','E','N','T','R','A','N','T',' ', '-','D','O','P','E','N','S','S','L','_','B','U','I','L','D','I', - 'N','G','_','O','P','E','N','S','S','L',' ','-','D','N','D','E', - 'B','U','G','\0' + 'N','G','_','O','P','E','N','S','S','L',' ','-','D','B','R','O', + 'T','L','I',' ','-','D','Z','L','I','B',' ','-','D','Z','S','T', + 'D',' ','-','D','N','D','E','B','U','G',' ','-','I','.','.','/', + '.','.','/','b','r','o','t','l','i','/','c','/','i','n','c','l', + 'u','d','e',' ','-','I','.','.','/','.','.','/','z','l','i','b', + ' ','-','I','.','.','/','.','.','/','z','s','t','d','/','l','i', + 'b','\0' }; diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/configuration.h b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/configuration.h index d591c99694fdda..44299b254b5578 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/configuration.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/configuration.h @@ -47,15 +47,9 @@ extern "C" { # ifndef OPENSSL_NO_ASM # define OPENSSL_NO_ASM # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -146,15 +140,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/openssl-cl.gypi b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/openssl-cl.gypi index 53b6e4ddd2c30c..ed9338e61a2034 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/openssl-cl.gypi @@ -4,6 +4,9 @@ 'NDEBUG', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'OPENSSL_PIC', ], 'openssl_cflags_darwin64-x86_64-cc': [ @@ -12,7 +15,7 @@ '-O3 -Wall', ], 'openssl_ex_libs_darwin64-x86_64-cc': [ - '', + '-lm', ], 'openssl_cli_srcs_darwin64-x86_64-cc': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/openssl-fips.gypi index c44a696348fd08..0e7242c3ce8987 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/openssl-fips.gypi @@ -331,6 +331,9 @@ 'NDEBUG', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'FIPS_MODULE', 'FIPS_MODULE', ], @@ -340,7 +343,7 @@ '-O3 -Wall', ], 'openssl_ex_libs_darwin64-x86_64-cc': [ - '', + '-lm', ], 'linker_script': '' }, diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/openssl.gypi b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/openssl.gypi index b1974600fdf4f3..24057ceaae21b3 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/openssl.gypi @@ -286,6 +286,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1109,6 +1114,15 @@ './config/archs/darwin64-x86_64-cc/no-asm/providers/common/der/der_wrap_gen.c', ], 'openssl_defines_darwin64-x86_64-cc': [ + 'NDEBUG', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_darwin64-x86_64-cc': [ 'NDEBUG', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', @@ -1120,7 +1134,7 @@ '-O3 -Wall', ], 'openssl_ex_libs_darwin64-x86_64-cc': [ - '', + '-lm', ], }, 'include_dirs': [ @@ -1136,6 +1150,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_darwin64-x86_64-cc)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_darwin64-x86_64-cc)'], + 'defines': ['<@(openssl_defines_exported_darwin64-x86_64-cc)'], }, } diff --git a/deps/openssl/config/archs/linux-aarch64/asm/configdata.pm b/deps/openssl/config/archs/linux-aarch64/asm/configdata.pm index d845b337ee2fba..d98af45d4886aa 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/configdata.pm +++ b/deps/openssl/config/archs/linux-aarch64/asm/configdata.pm @@ -115,6 +115,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -192,9 +193,7 @@ our %config = ( "OPENSSL_THREADS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -225,9 +224,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -236,17 +233,22 @@ our %config = ( ], "openssl_sys_defines" => [], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "linux-aarch64" ], "perlenv" => { @@ -328,7 +330,10 @@ our %target = ( "cppflags" => "", "cxxflags" => "-std=c++11 -pthread", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_ldflags" => "-Wl,-z,defs", @@ -336,8 +341,12 @@ our %target = ( "enable" => [ "afalgeng" ], - "ex_libs" => "-ldl -pthread", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd -ldl -pthread", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "", "lib_cflags" => "", "lib_cppflags" => "-DOPENSSL_USE_NODELETE", @@ -515,10 +524,8 @@ our @disablables_int = ( our %disabled = ( "afalgeng" => "option", "asan" => "default", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -551,12 +558,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1044,6 +1053,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1311,6 +1323,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8361,6 +8376,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10128,6 +10147,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12101,6 +12134,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12162,6 +12196,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21411,6 +21446,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21996,6 +22035,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23724,6 +23767,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23813,6 +23857,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -25084,6 +25129,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -28103,6 +28163,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30650,6 +30715,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -31195,6 +31266,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31620,6 +31698,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32843,18 +32924,9 @@ my %disabled_info = ( "asan" => { "macro" => "OPENSSL_NO_ASAN" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32951,15 +33023,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 b4cffed5bc81e7..7bdba6a944acfe 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-aarch64/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-aarch64" -#define DATE "built on: Tue Jan 27 17:30:04 2026 UTC" +#define DATE "built on: Wed Mar 11 15:41:29 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -26,6 +26,10 @@ static const char compiler_flags[] = { 'S','L','_','U','S','E','_','N','O','D','E','L','E','T','E',' ', '-','D','O','P','E','N','S','S','L','_','P','I','C',' ','-','D', 'O','P','E','N','S','S','L','_','B','U','I','L','D','I','N','G', - '_','O','P','E','N','S','S','L',' ','-','D','N','D','E','B','U', - 'G','\0' + '_','O','P','E','N','S','S','L',' ','-','D','B','R','O','T','L', + 'I',' ','-','D','Z','L','I','B',' ','-','D','Z','S','T','D',' ', + '-','D','N','D','E','B','U','G',' ','-','I','.','.','/','.','.', + '/','b','r','o','t','l','i','/','c','/','i','n','c','l','u','d', + 'e',' ','-','I','.','.','/','.','.','/','z','l','i','b',' ','-', + 'I','.','.','/','.','.','/','z','s','t','d','/','l','i','b','\0' }; diff --git a/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/configuration.h b/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/configuration.h index f7d23da524f1ee..72f598af52ae68 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/configuration.h +++ b/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/configuration.h @@ -41,15 +41,9 @@ extern "C" { # ifndef OPENSSL_NO_ASAN # define OPENSSL_NO_ASAN # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -140,15 +134,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/linux-aarch64/asm/openssl-cl.gypi b/deps/openssl/config/archs/linux-aarch64/asm/openssl-cl.gypi index 05a63c13fc08f8..0f9978cfc0d53c 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/linux-aarch64/asm/openssl-cl.gypi @@ -4,6 +4,9 @@ 'NDEBUG', 'OPENSSL_USE_NODELETE', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'BSAES_ASM', 'ECP_NISTZ256_ASM', 'ECP_SM2P256_ASM', @@ -28,7 +31,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux-aarch64': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], 'openssl_cli_srcs_linux-aarch64': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/linux-aarch64/asm/openssl-fips.gypi b/deps/openssl/config/archs/linux-aarch64/asm/openssl-fips.gypi index 32db2665a21a45..e107e3ca2c0930 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-aarch64/asm/openssl-fips.gypi @@ -357,6 +357,9 @@ 'NDEBUG', 'OPENSSL_USE_NODELETE', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'BSAES_ASM', 'ECP_NISTZ256_ASM', 'ECP_SM2P256_ASM', @@ -379,7 +382,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux-aarch64': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux-aarch64/asm/providers/fips.ld' }, diff --git a/deps/openssl/config/archs/linux-aarch64/asm/openssl.gypi b/deps/openssl/config/archs/linux-aarch64/asm/openssl.gypi index 7813ecbf86fd50..c132b62c40e650 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-aarch64/asm/openssl.gypi @@ -285,6 +285,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1134,6 +1139,30 @@ './config/archs/linux-aarch64/asm/providers/fips.ld', ], 'openssl_defines_linux-aarch64': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'BSAES_ASM', + 'ECP_NISTZ256_ASM', + 'ECP_SM2P256_ASM', + 'KECCAK1600_ASM', + 'MD5_ASM', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_CPUID_OBJ', + 'OPENSSL_SM3_ASM', + 'POLY1305_ASM', + 'SHA1_ASM', + 'SHA256_ASM', + 'SHA512_ASM', + 'SM4_ASM', + 'VPAES_ASM', + 'VPSM4_ASM', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_linux-aarch64': [ 'NDEBUG', 'OPENSSL_USE_NODELETE', 'OPENSSL_BUILDING_OPENSSL', @@ -1161,7 +1190,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux-aarch64': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], }, 'include_dirs': [ @@ -1177,6 +1206,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-aarch64)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_linux-aarch64)'], + 'defines': ['<@(openssl_defines_exported_linux-aarch64)'], }, } 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 66c967c249ff9a..38a98437117eea 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/configdata.pm @@ -115,6 +115,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -192,9 +193,7 @@ our %config = ( "OPENSSL_THREADS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -225,9 +224,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -236,17 +233,22 @@ our %config = ( ], "openssl_sys_defines" => [], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "linux-aarch64" ], "perlenv" => { @@ -328,7 +330,10 @@ our %target = ( "cppflags" => "", "cxxflags" => "-std=c++11 -pthread", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_ldflags" => "-Wl,-z,defs", @@ -336,8 +341,12 @@ our %target = ( "enable" => [ "afalgeng" ], - "ex_libs" => "-ldl -pthread", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd -ldl -pthread", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "", "lib_cflags" => "", "lib_cppflags" => "-DOPENSSL_USE_NODELETE", @@ -515,10 +524,8 @@ our @disablables_int = ( our %disabled = ( "afalgeng" => "option", "asan" => "default", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -551,12 +558,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1044,6 +1053,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1311,6 +1323,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8361,6 +8376,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10128,6 +10147,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12101,6 +12134,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12162,6 +12196,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21411,6 +21446,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21996,6 +22035,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23724,6 +23767,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23813,6 +23857,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -25084,6 +25129,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -28103,6 +28163,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30650,6 +30715,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -31195,6 +31266,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31620,6 +31698,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32843,18 +32924,9 @@ my %disabled_info = ( "asan" => { "macro" => "OPENSSL_NO_ASAN" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32951,15 +33023,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 9ed5b2ce877ce4..f63db71ae6b54e 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-aarch64" -#define DATE "built on: Tue Jan 27 17:30:21 2026 UTC" +#define DATE "built on: Wed Mar 11 15:41:42 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -27,6 +27,11 @@ static const char compiler_flags[] = { 'N','S','S','L','_','U','S','E','_','N','O','D','E','L','E','T', 'E',' ','-','D','O','P','E','N','S','S','L','_','P','I','C',' ', '-','D','O','P','E','N','S','S','L','_','B','U','I','L','D','I', - 'N','G','_','O','P','E','N','S','S','L',' ','-','D','N','D','E', - 'B','U','G','\0' + 'N','G','_','O','P','E','N','S','S','L',' ','-','D','B','R','O', + 'T','L','I',' ','-','D','Z','L','I','B',' ','-','D','Z','S','T', + 'D',' ','-','D','N','D','E','B','U','G',' ','-','I','.','.','/', + '.','.','/','b','r','o','t','l','i','/','c','/','i','n','c','l', + 'u','d','e',' ','-','I','.','.','/','.','.','/','z','l','i','b', + ' ','-','I','.','.','/','.','.','/','z','s','t','d','/','l','i', + 'b','\0' }; diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/configuration.h b/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/configuration.h index f7d23da524f1ee..72f598af52ae68 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/configuration.h +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/configuration.h @@ -41,15 +41,9 @@ extern "C" { # ifndef OPENSSL_NO_ASAN # define OPENSSL_NO_ASAN # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -140,15 +134,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/linux-aarch64/asm_avx2/openssl-cl.gypi index aac6b3926e16d4..81aa1d910a5220 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/openssl-cl.gypi +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/openssl-cl.gypi @@ -4,6 +4,9 @@ 'NDEBUG', 'OPENSSL_USE_NODELETE', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'BSAES_ASM', 'ECP_NISTZ256_ASM', 'ECP_SM2P256_ASM', @@ -28,7 +31,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux-aarch64': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], 'openssl_cli_srcs_linux-aarch64': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/linux-aarch64/asm_avx2/openssl-fips.gypi index 19a9fdc22e5ac6..3218ce574f6d43 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/openssl-fips.gypi @@ -357,6 +357,9 @@ 'NDEBUG', 'OPENSSL_USE_NODELETE', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'BSAES_ASM', 'ECP_NISTZ256_ASM', 'ECP_SM2P256_ASM', @@ -379,7 +382,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux-aarch64': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux-aarch64/asm_avx2/providers/fips.ld' }, diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux-aarch64/asm_avx2/openssl.gypi index ccfd87f4c0eaa0..4218859030774f 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/openssl.gypi @@ -285,6 +285,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1134,6 +1139,30 @@ './config/archs/linux-aarch64/asm_avx2/providers/fips.ld', ], 'openssl_defines_linux-aarch64': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'BSAES_ASM', + 'ECP_NISTZ256_ASM', + 'ECP_SM2P256_ASM', + 'KECCAK1600_ASM', + 'MD5_ASM', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_CPUID_OBJ', + 'OPENSSL_SM3_ASM', + 'POLY1305_ASM', + 'SHA1_ASM', + 'SHA256_ASM', + 'SHA512_ASM', + 'SM4_ASM', + 'VPAES_ASM', + 'VPSM4_ASM', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_linux-aarch64': [ 'NDEBUG', 'OPENSSL_USE_NODELETE', 'OPENSSL_BUILDING_OPENSSL', @@ -1161,7 +1190,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux-aarch64': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], }, 'include_dirs': [ @@ -1177,6 +1206,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-aarch64)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_linux-aarch64)'], + 'defines': ['<@(openssl_defines_exported_linux-aarch64)'], }, } 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 c85339b03a0ca2..0f425fddec00af 100644 --- a/deps/openssl/config/archs/linux-aarch64/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux-aarch64/no-asm/configdata.pm @@ -115,6 +115,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -191,9 +192,7 @@ our %config = ( "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -224,9 +223,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -235,17 +232,22 @@ our %config = ( ], "openssl_sys_defines" => [], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-asm no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "no-asm", "linux-aarch64" ], @@ -328,7 +330,10 @@ our %target = ( "cppflags" => "", "cxxflags" => "-std=c++11 -pthread", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_ldflags" => "-Wl,-z,defs", @@ -336,8 +341,12 @@ our %target = ( "enable" => [ "afalgeng" ], - "ex_libs" => "-ldl -pthread", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd -ldl -pthread", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "", "lib_cflags" => "", "lib_cppflags" => "-DOPENSSL_USE_NODELETE", @@ -516,10 +525,8 @@ our %disabled = ( "afalgeng" => "option", "asan" => "default", "asm" => "option", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -552,12 +559,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1045,6 +1054,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1312,6 +1324,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8313,6 +8328,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10069,6 +10088,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12014,6 +12047,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12075,6 +12109,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21219,6 +21254,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21804,6 +21843,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23532,6 +23575,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23621,6 +23665,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -24865,6 +24910,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -27789,6 +27849,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30302,6 +30367,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -30847,6 +30918,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31272,6 +31350,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32498,18 +32579,9 @@ my %disabled_info = ( "asm" => { "macro" => "OPENSSL_NO_ASM" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32606,15 +32678,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 2bb20f876c4177..1692d583f786f0 100644 --- a/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-aarch64" -#define DATE "built on: Tue Jan 27 17:30:38 2026 UTC" +#define DATE "built on: Wed Mar 11 15:41:55 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -25,5 +25,10 @@ static const char compiler_flags[] = { '_','U','S','E','_','N','O','D','E','L','E','T','E',' ','-','D', 'O','P','E','N','S','S','L','_','P','I','C',' ','-','D','O','P', 'E','N','S','S','L','_','B','U','I','L','D','I','N','G','_','O', - 'P','E','N','S','S','L',' ','-','D','N','D','E','B','U','G','\0' + 'P','E','N','S','S','L',' ','-','D','B','R','O','T','L','I',' ', + '-','D','Z','L','I','B',' ','-','D','Z','S','T','D',' ','-','D', + 'N','D','E','B','U','G',' ','-','I','.','.','/','.','.','/','b', + 'r','o','t','l','i','/','c','/','i','n','c','l','u','d','e',' ', + '-','I','.','.','/','.','.','/','z','l','i','b',' ','-','I','.', + '.','/','.','.','/','z','s','t','d','/','l','i','b','\0' }; diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/configuration.h b/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/configuration.h index bc3a1462b437c8..811849a7a0152b 100644 --- a/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/configuration.h +++ b/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/configuration.h @@ -44,15 +44,9 @@ extern "C" { # ifndef OPENSSL_NO_ASM # define OPENSSL_NO_ASM # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -143,15 +137,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/openssl-cl.gypi b/deps/openssl/config/archs/linux-aarch64/no-asm/openssl-cl.gypi index 85332649d37671..0b7c9799b3a65c 100644 --- a/deps/openssl/config/archs/linux-aarch64/no-asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/linux-aarch64/no-asm/openssl-cl.gypi @@ -4,6 +4,9 @@ 'NDEBUG', 'OPENSSL_USE_NODELETE', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'OPENSSL_PIC', ], 'openssl_cflags_linux-aarch64': [ @@ -12,7 +15,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux-aarch64': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], 'openssl_cli_srcs_linux-aarch64': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/linux-aarch64/no-asm/openssl-fips.gypi index 61500a1667c8e5..1775e6dc832c0c 100644 --- a/deps/openssl/config/archs/linux-aarch64/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-aarch64/no-asm/openssl-fips.gypi @@ -333,6 +333,9 @@ 'NDEBUG', 'OPENSSL_USE_NODELETE', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'FIPS_MODULE', 'FIPS_MODULE', ], @@ -342,7 +345,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux-aarch64': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux-aarch64/no-asm/providers/fips.ld' }, diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/openssl.gypi b/deps/openssl/config/archs/linux-aarch64/no-asm/openssl.gypi index 65ea6085c2abc3..e8d8b2e9fc3ab1 100644 --- a/deps/openssl/config/archs/linux-aarch64/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-aarch64/no-asm/openssl.gypi @@ -286,6 +286,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1111,6 +1116,15 @@ './config/archs/linux-aarch64/no-asm/providers/fips.ld', ], 'openssl_defines_linux-aarch64': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_linux-aarch64': [ 'NDEBUG', 'OPENSSL_USE_NODELETE', 'OPENSSL_BUILDING_OPENSSL', @@ -1122,7 +1136,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux-aarch64': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], }, 'include_dirs': [ @@ -1138,6 +1152,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-aarch64)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_linux-aarch64)'], + 'defines': ['<@(openssl_defines_exported_linux-aarch64)'], }, } diff --git a/deps/openssl/config/archs/linux-armv4/asm/configdata.pm b/deps/openssl/config/archs/linux-armv4/asm/configdata.pm index 223cceec571793..a764a2a9bed0d5 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/configdata.pm +++ b/deps/openssl/config/archs/linux-armv4/asm/configdata.pm @@ -115,6 +115,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -192,9 +193,7 @@ our %config = ( "OPENSSL_THREADS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -225,9 +224,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -236,17 +233,22 @@ our %config = ( ], "openssl_sys_defines" => [], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "linux-armv4" ], "perlenv" => { @@ -328,7 +330,10 @@ our %target = ( "cppflags" => "", "cxxflags" => "-std=c++11 -pthread", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_ldflags" => "-Wl,-z,defs", @@ -336,8 +341,12 @@ our %target = ( "enable" => [ "afalgeng" ], - "ex_libs" => "-ldl -pthread -latomic", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd -ldl -pthread -latomic", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "", "lib_cflags" => "", "lib_cppflags" => "-DOPENSSL_USE_NODELETE", @@ -515,10 +524,8 @@ our @disablables_int = ( our %disabled = ( "afalgeng" => "option", "asan" => "default", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -551,12 +558,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1044,6 +1053,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1311,6 +1323,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8353,6 +8368,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10119,6 +10138,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12079,6 +12112,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12140,6 +12174,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21371,6 +21406,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21956,6 +21995,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23684,6 +23727,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23773,6 +23817,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -25041,6 +25086,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -28020,6 +28080,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30554,6 +30619,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -31099,6 +31170,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31524,6 +31602,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32747,18 +32828,9 @@ my %disabled_info = ( "asan" => { "macro" => "OPENSSL_NO_ASAN" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32855,15 +32927,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 c3eb6402fbe4a9..e530853ac3a286 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-armv4/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-armv4" -#define DATE "built on: Tue Jan 27 17:30:54 2026 UTC" +#define DATE "built on: Wed Mar 11 15:42:07 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -26,6 +26,10 @@ static const char compiler_flags[] = { 'S','L','_','U','S','E','_','N','O','D','E','L','E','T','E',' ', '-','D','O','P','E','N','S','S','L','_','P','I','C',' ','-','D', 'O','P','E','N','S','S','L','_','B','U','I','L','D','I','N','G', - '_','O','P','E','N','S','S','L',' ','-','D','N','D','E','B','U', - 'G','\0' + '_','O','P','E','N','S','S','L',' ','-','D','B','R','O','T','L', + 'I',' ','-','D','Z','L','I','B',' ','-','D','Z','S','T','D',' ', + '-','D','N','D','E','B','U','G',' ','-','I','.','.','/','.','.', + '/','b','r','o','t','l','i','/','c','/','i','n','c','l','u','d', + 'e',' ','-','I','.','.','/','.','.','/','z','l','i','b',' ','-', + 'I','.','.','/','.','.','/','z','s','t','d','/','l','i','b','\0' }; diff --git a/deps/openssl/config/archs/linux-armv4/asm/include/openssl/configuration.h b/deps/openssl/config/archs/linux-armv4/asm/include/openssl/configuration.h index 89221822d10e12..d83ab09218ef05 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/include/openssl/configuration.h +++ b/deps/openssl/config/archs/linux-armv4/asm/include/openssl/configuration.h @@ -41,15 +41,9 @@ extern "C" { # ifndef OPENSSL_NO_ASAN # define OPENSSL_NO_ASAN # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -140,15 +134,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/linux-armv4/asm/openssl-cl.gypi b/deps/openssl/config/archs/linux-armv4/asm/openssl-cl.gypi index fa39659907c624..2017f98bccdc88 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/linux-armv4/asm/openssl-cl.gypi @@ -4,6 +4,9 @@ 'NDEBUG', 'OPENSSL_USE_NODELETE', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'BSAES_ASM', 'ECP_NISTZ256_ASM', @@ -25,7 +28,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux-armv4': [ - '-ldl -pthread -latomic', + '-lm -ldl -pthread -latomic', ], 'openssl_cli_srcs_linux-armv4': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/linux-armv4/asm/openssl-fips.gypi b/deps/openssl/config/archs/linux-armv4/asm/openssl-fips.gypi index 0dcd7f9537f528..d502d9aab4a048 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-armv4/asm/openssl-fips.gypi @@ -347,6 +347,9 @@ 'NDEBUG', 'OPENSSL_USE_NODELETE', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'BSAES_ASM', 'ECP_NISTZ256_ASM', @@ -368,7 +371,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux-armv4': [ - '-ldl -pthread -latomic', + '-lm -ldl -pthread -latomic', ], 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux-armv4/asm/providers/fips.ld' }, diff --git a/deps/openssl/config/archs/linux-armv4/asm/openssl.gypi b/deps/openssl/config/archs/linux-armv4/asm/openssl.gypi index 7e164a7b1b14a2..4b0780fea5928c 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-armv4/asm/openssl.gypi @@ -284,6 +284,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1124,6 +1129,27 @@ './config/archs/linux-armv4/asm/providers/fips.ld', ], 'openssl_defines_linux-armv4': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'AES_ASM', + 'BSAES_ASM', + 'ECP_NISTZ256_ASM', + 'GHASH_ASM', + 'KECCAK1600_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_CPUID_OBJ', + 'POLY1305_ASM', + 'SHA1_ASM', + 'SHA256_ASM', + 'SHA512_ASM', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_linux-armv4': [ 'NDEBUG', 'OPENSSL_USE_NODELETE', 'OPENSSL_BUILDING_OPENSSL', @@ -1148,7 +1174,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux-armv4': [ - '-ldl -pthread -latomic', + '-lm -ldl -pthread -latomic', ], }, 'include_dirs': [ @@ -1164,6 +1190,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-armv4)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_linux-armv4)'], + 'defines': ['<@(openssl_defines_exported_linux-armv4)'], }, } 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 85b110f31e9aa6..e76803cdf92fa1 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/configdata.pm @@ -115,6 +115,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -192,9 +193,7 @@ our %config = ( "OPENSSL_THREADS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -225,9 +224,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -236,17 +233,22 @@ our %config = ( ], "openssl_sys_defines" => [], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "linux-armv4" ], "perlenv" => { @@ -328,7 +330,10 @@ our %target = ( "cppflags" => "", "cxxflags" => "-std=c++11 -pthread", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_ldflags" => "-Wl,-z,defs", @@ -336,8 +341,12 @@ our %target = ( "enable" => [ "afalgeng" ], - "ex_libs" => "-ldl -pthread -latomic", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd -ldl -pthread -latomic", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "", "lib_cflags" => "", "lib_cppflags" => "-DOPENSSL_USE_NODELETE", @@ -515,10 +524,8 @@ our @disablables_int = ( our %disabled = ( "afalgeng" => "option", "asan" => "default", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -551,12 +558,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1044,6 +1053,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1311,6 +1323,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8353,6 +8368,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10119,6 +10138,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12079,6 +12112,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12140,6 +12174,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21371,6 +21406,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21956,6 +21995,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23684,6 +23727,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23773,6 +23817,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -25041,6 +25086,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -28020,6 +28080,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30554,6 +30619,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -31099,6 +31170,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31524,6 +31602,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32747,18 +32828,9 @@ my %disabled_info = ( "asan" => { "macro" => "OPENSSL_NO_ASAN" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32855,15 +32927,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 90d9c773b9f67a..6280215058161b 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-armv4" -#define DATE "built on: Tue Jan 27 17:31:10 2026 UTC" +#define DATE "built on: Wed Mar 11 15:42:20 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -27,6 +27,11 @@ static const char compiler_flags[] = { 'N','S','S','L','_','U','S','E','_','N','O','D','E','L','E','T', 'E',' ','-','D','O','P','E','N','S','S','L','_','P','I','C',' ', '-','D','O','P','E','N','S','S','L','_','B','U','I','L','D','I', - 'N','G','_','O','P','E','N','S','S','L',' ','-','D','N','D','E', - 'B','U','G','\0' + 'N','G','_','O','P','E','N','S','S','L',' ','-','D','B','R','O', + 'T','L','I',' ','-','D','Z','L','I','B',' ','-','D','Z','S','T', + 'D',' ','-','D','N','D','E','B','U','G',' ','-','I','.','.','/', + '.','.','/','b','r','o','t','l','i','/','c','/','i','n','c','l', + 'u','d','e',' ','-','I','.','.','/','.','.','/','z','l','i','b', + ' ','-','I','.','.','/','.','.','/','z','s','t','d','/','l','i', + 'b','\0' }; diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/configuration.h b/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/configuration.h index 89221822d10e12..d83ab09218ef05 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/configuration.h +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/configuration.h @@ -41,15 +41,9 @@ extern "C" { # ifndef OPENSSL_NO_ASAN # define OPENSSL_NO_ASAN # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -140,15 +134,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/linux-armv4/asm_avx2/openssl-cl.gypi index b75143f55774af..f23322b6f18eb9 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/openssl-cl.gypi +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/openssl-cl.gypi @@ -4,6 +4,9 @@ 'NDEBUG', 'OPENSSL_USE_NODELETE', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'BSAES_ASM', 'ECP_NISTZ256_ASM', @@ -25,7 +28,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux-armv4': [ - '-ldl -pthread -latomic', + '-lm -ldl -pthread -latomic', ], 'openssl_cli_srcs_linux-armv4': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/linux-armv4/asm_avx2/openssl-fips.gypi index 81458de554dfbf..5fc24f10546166 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/openssl-fips.gypi @@ -347,6 +347,9 @@ 'NDEBUG', 'OPENSSL_USE_NODELETE', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'BSAES_ASM', 'ECP_NISTZ256_ASM', @@ -368,7 +371,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux-armv4': [ - '-ldl -pthread -latomic', + '-lm -ldl -pthread -latomic', ], 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux-armv4/asm_avx2/providers/fips.ld' }, diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux-armv4/asm_avx2/openssl.gypi index 87400e0c816132..d2f870181353ec 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/openssl.gypi @@ -284,6 +284,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1124,6 +1129,27 @@ './config/archs/linux-armv4/asm_avx2/providers/fips.ld', ], 'openssl_defines_linux-armv4': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'AES_ASM', + 'BSAES_ASM', + 'ECP_NISTZ256_ASM', + 'GHASH_ASM', + 'KECCAK1600_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_CPUID_OBJ', + 'POLY1305_ASM', + 'SHA1_ASM', + 'SHA256_ASM', + 'SHA512_ASM', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_linux-armv4': [ 'NDEBUG', 'OPENSSL_USE_NODELETE', 'OPENSSL_BUILDING_OPENSSL', @@ -1148,7 +1174,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux-armv4': [ - '-ldl -pthread -latomic', + '-lm -ldl -pthread -latomic', ], }, 'include_dirs': [ @@ -1164,6 +1190,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-armv4)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_linux-armv4)'], + 'defines': ['<@(openssl_defines_exported_linux-armv4)'], }, } 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 61afcf2f942ec9..82a4dcfaa6a69d 100644 --- a/deps/openssl/config/archs/linux-armv4/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux-armv4/no-asm/configdata.pm @@ -115,6 +115,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -191,9 +192,7 @@ our %config = ( "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -224,9 +223,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -235,17 +232,22 @@ our %config = ( ], "openssl_sys_defines" => [], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-asm no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "no-asm", "linux-armv4" ], @@ -328,7 +330,10 @@ our %target = ( "cppflags" => "", "cxxflags" => "-std=c++11 -pthread", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_ldflags" => "-Wl,-z,defs", @@ -336,8 +341,12 @@ our %target = ( "enable" => [ "afalgeng" ], - "ex_libs" => "-ldl -pthread -latomic", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd -ldl -pthread -latomic", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "", "lib_cflags" => "", "lib_cppflags" => "-DOPENSSL_USE_NODELETE", @@ -516,10 +525,8 @@ our %disabled = ( "afalgeng" => "option", "asan" => "default", "asm" => "option", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -552,12 +559,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1045,6 +1054,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1312,6 +1324,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8313,6 +8328,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10069,6 +10088,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12014,6 +12047,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12075,6 +12109,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21219,6 +21254,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21804,6 +21843,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23532,6 +23575,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23621,6 +23665,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -24865,6 +24910,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -27789,6 +27849,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30302,6 +30367,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -30847,6 +30918,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31272,6 +31350,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32498,18 +32579,9 @@ my %disabled_info = ( "asm" => { "macro" => "OPENSSL_NO_ASM" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32606,15 +32678,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 15aea0559d9f30..1ffd2d89803504 100644 --- a/deps/openssl/config/archs/linux-armv4/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-armv4/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-armv4" -#define DATE "built on: Tue Jan 27 17:31:27 2026 UTC" +#define DATE "built on: Wed Mar 11 15:42:32 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -25,5 +25,10 @@ static const char compiler_flags[] = { '_','U','S','E','_','N','O','D','E','L','E','T','E',' ','-','D', 'O','P','E','N','S','S','L','_','P','I','C',' ','-','D','O','P', 'E','N','S','S','L','_','B','U','I','L','D','I','N','G','_','O', - 'P','E','N','S','S','L',' ','-','D','N','D','E','B','U','G','\0' + 'P','E','N','S','S','L',' ','-','D','B','R','O','T','L','I',' ', + '-','D','Z','L','I','B',' ','-','D','Z','S','T','D',' ','-','D', + 'N','D','E','B','U','G',' ','-','I','.','.','/','.','.','/','b', + 'r','o','t','l','i','/','c','/','i','n','c','l','u','d','e',' ', + '-','I','.','.','/','.','.','/','z','l','i','b',' ','-','I','.', + '.','/','.','.','/','z','s','t','d','/','l','i','b','\0' }; diff --git a/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/configuration.h b/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/configuration.h index 75358cb908adec..2d101256e43d23 100644 --- a/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/configuration.h +++ b/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/configuration.h @@ -44,15 +44,9 @@ extern "C" { # ifndef OPENSSL_NO_ASM # define OPENSSL_NO_ASM # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -143,15 +137,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/linux-armv4/no-asm/openssl-cl.gypi b/deps/openssl/config/archs/linux-armv4/no-asm/openssl-cl.gypi index c7dd26e3512cf7..93870116bc8556 100644 --- a/deps/openssl/config/archs/linux-armv4/no-asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/linux-armv4/no-asm/openssl-cl.gypi @@ -4,6 +4,9 @@ 'NDEBUG', 'OPENSSL_USE_NODELETE', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'OPENSSL_PIC', ], 'openssl_cflags_linux-armv4': [ @@ -12,7 +15,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux-armv4': [ - '-ldl -pthread -latomic', + '-lm -ldl -pthread -latomic', ], 'openssl_cli_srcs_linux-armv4': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/linux-armv4/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/linux-armv4/no-asm/openssl-fips.gypi index a0b929afc151e7..7e255089e957a0 100644 --- a/deps/openssl/config/archs/linux-armv4/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-armv4/no-asm/openssl-fips.gypi @@ -333,6 +333,9 @@ 'NDEBUG', 'OPENSSL_USE_NODELETE', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'FIPS_MODULE', 'FIPS_MODULE', ], @@ -342,7 +345,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux-armv4': [ - '-ldl -pthread -latomic', + '-lm -ldl -pthread -latomic', ], 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux-armv4/no-asm/providers/fips.ld' }, diff --git a/deps/openssl/config/archs/linux-armv4/no-asm/openssl.gypi b/deps/openssl/config/archs/linux-armv4/no-asm/openssl.gypi index f2dc7f57872519..dca24c0f425008 100644 --- a/deps/openssl/config/archs/linux-armv4/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-armv4/no-asm/openssl.gypi @@ -286,6 +286,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1111,6 +1116,15 @@ './config/archs/linux-armv4/no-asm/providers/fips.ld', ], 'openssl_defines_linux-armv4': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_linux-armv4': [ 'NDEBUG', 'OPENSSL_USE_NODELETE', 'OPENSSL_BUILDING_OPENSSL', @@ -1122,7 +1136,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux-armv4': [ - '-ldl -pthread -latomic', + '-lm -ldl -pthread -latomic', ], }, 'include_dirs': [ @@ -1138,6 +1152,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-armv4)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_linux-armv4)'], + 'defines': ['<@(openssl_defines_exported_linux-armv4)'], }, } diff --git a/deps/openssl/config/archs/linux-elf/asm/configdata.pm b/deps/openssl/config/archs/linux-elf/asm/configdata.pm index 206fe8984058cf..3f2747139081c7 100644 --- a/deps/openssl/config/archs/linux-elf/asm/configdata.pm +++ b/deps/openssl/config/archs/linux-elf/asm/configdata.pm @@ -115,6 +115,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -192,9 +193,7 @@ our %config = ( "OPENSSL_THREADS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -225,9 +224,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -236,17 +233,22 @@ our %config = ( ], "openssl_sys_defines" => [], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "linux-elf" ], "perlenv" => { @@ -327,7 +329,10 @@ our %target = ( "cppflags" => "", "cxxflags" => "-std=c++11 -pthread", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_ldflags" => "-Wl,-z,defs", @@ -335,8 +340,12 @@ our %target = ( "enable" => [ "afalgeng" ], - "ex_libs" => "-ldl -pthread", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd -ldl -pthread", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "", "lib_cflags" => "", "lib_cppflags" => "-DOPENSSL_USE_NODELETE -DL_ENDIAN", @@ -514,10 +523,8 @@ our @disablables_int = ( our %disabled = ( "afalgeng" => "option", "asan" => "default", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -550,12 +557,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1043,6 +1052,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1310,6 +1322,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8370,6 +8385,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10132,6 +10151,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12093,6 +12126,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12154,6 +12188,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21301,6 +21336,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21886,6 +21925,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23614,6 +23657,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23703,6 +23747,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -24965,6 +25010,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -27939,6 +27999,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30472,6 +30537,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -31017,6 +31088,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31442,6 +31520,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32665,18 +32746,9 @@ my %disabled_info = ( "asan" => { "macro" => "OPENSSL_NO_ASAN" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32773,15 +32845,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 124c1e5ee396c4..8c456475d8329f 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-elf" -#define DATE "built on: Tue Jan 27 17:31:42 2026 UTC" +#define DATE "built on: Wed Mar 11 15:42:43 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -28,6 +28,10 @@ static const char compiler_flags[] = { 'L','E','T','E',' ','-','D','L','_','E','N','D','I','A','N',' ', '-','D','O','P','E','N','S','S','L','_','P','I','C',' ','-','D', 'O','P','E','N','S','S','L','_','B','U','I','L','D','I','N','G', - '_','O','P','E','N','S','S','L',' ','-','D','N','D','E','B','U', - 'G','\0' + '_','O','P','E','N','S','S','L',' ','-','D','B','R','O','T','L', + 'I',' ','-','D','Z','L','I','B',' ','-','D','Z','S','T','D',' ', + '-','D','N','D','E','B','U','G',' ','-','I','.','.','/','.','.', + '/','b','r','o','t','l','i','/','c','/','i','n','c','l','u','d', + 'e',' ','-','I','.','.','/','.','.','/','z','l','i','b',' ','-', + 'I','.','.','/','.','.','/','z','s','t','d','/','l','i','b','\0' }; diff --git a/deps/openssl/config/archs/linux-elf/asm/include/openssl/configuration.h b/deps/openssl/config/archs/linux-elf/asm/include/openssl/configuration.h index 17d10a6e748caf..d00dd12e9c1ac9 100644 --- a/deps/openssl/config/archs/linux-elf/asm/include/openssl/configuration.h +++ b/deps/openssl/config/archs/linux-elf/asm/include/openssl/configuration.h @@ -41,15 +41,9 @@ extern "C" { # ifndef OPENSSL_NO_ASAN # define OPENSSL_NO_ASAN # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -140,15 +134,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/linux-elf/asm/openssl-cl.gypi b/deps/openssl/config/archs/linux-elf/asm/openssl-cl.gypi index 7a0bd76c374682..b9e4ea6c632fea 100644 --- a/deps/openssl/config/archs/linux-elf/asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/linux-elf/asm/openssl-cl.gypi @@ -5,6 +5,9 @@ 'OPENSSL_USE_NODELETE', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'CMLL_ASM', 'DES_ASM', @@ -34,7 +37,7 @@ '-Wall -O3 -fomit-frame-pointer', ], 'openssl_ex_libs_linux-elf': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], 'openssl_cli_srcs_linux-elf': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/linux-elf/asm/openssl-fips.gypi b/deps/openssl/config/archs/linux-elf/asm/openssl-fips.gypi index 45a0cc5134c474..190301772f342f 100644 --- a/deps/openssl/config/archs/linux-elf/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-elf/asm/openssl-fips.gypi @@ -353,6 +353,9 @@ 'OPENSSL_USE_NODELETE', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'DES_ASM', 'ECP_NISTZ256_ASM', @@ -376,7 +379,7 @@ '-Wall -O3 -fomit-frame-pointer', ], 'openssl_ex_libs_linux-elf': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux-elf/asm/providers/fips.ld' }, diff --git a/deps/openssl/config/archs/linux-elf/asm/openssl.gypi b/deps/openssl/config/archs/linux-elf/asm/openssl.gypi index b3f4737899ee99..d8cbe1ff57bb48 100644 --- a/deps/openssl/config/archs/linux-elf/asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-elf/asm/openssl.gypi @@ -278,6 +278,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1123,6 +1128,36 @@ './config/archs/linux-elf/asm/providers/fips.ld', ], 'openssl_defines_linux-elf': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'AES_ASM', + 'CMLL_ASM', + 'DES_ASM', + 'ECP_NISTZ256_ASM', + 'GHASH_ASM', + 'MD5_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_BN_ASM_PART_WORDS', + 'OPENSSL_CPUID_OBJ', + 'OPENSSL_IA32_SSE2', + 'PADLOCK_ASM', + 'POLY1305_ASM', + 'RC4_ASM', + 'RMD160_ASM', + 'SHA1_ASM', + 'SHA256_ASM', + 'SHA512_ASM', + 'VPAES_ASM', + 'WHIRLPOOL_ASM', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_linux-elf': [ 'NDEBUG', 'OPENSSL_USE_NODELETE', 'L_ENDIAN', @@ -1156,7 +1191,7 @@ '-Wall -O3 -fomit-frame-pointer', ], 'openssl_ex_libs_linux-elf': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], }, 'include_dirs': [ @@ -1172,6 +1207,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-elf)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_linux-elf)'], + 'defines': ['<@(openssl_defines_exported_linux-elf)'], }, } 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 646acc4ae1318e..a808f919beaf03 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/configdata.pm @@ -115,6 +115,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -192,9 +193,7 @@ our %config = ( "OPENSSL_THREADS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -225,9 +224,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -236,17 +233,22 @@ our %config = ( ], "openssl_sys_defines" => [], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "linux-elf" ], "perlenv" => { @@ -327,7 +329,10 @@ our %target = ( "cppflags" => "", "cxxflags" => "-std=c++11 -pthread", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_ldflags" => "-Wl,-z,defs", @@ -335,8 +340,12 @@ our %target = ( "enable" => [ "afalgeng" ], - "ex_libs" => "-ldl -pthread", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd -ldl -pthread", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "", "lib_cflags" => "", "lib_cppflags" => "-DOPENSSL_USE_NODELETE -DL_ENDIAN", @@ -514,10 +523,8 @@ our @disablables_int = ( our %disabled = ( "afalgeng" => "option", "asan" => "default", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -550,12 +557,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1043,6 +1052,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1310,6 +1322,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8370,6 +8385,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10132,6 +10151,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12093,6 +12126,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12154,6 +12188,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21301,6 +21336,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21886,6 +21925,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23614,6 +23657,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23703,6 +23747,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -24965,6 +25010,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -27939,6 +27999,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30472,6 +30537,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -31017,6 +31088,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31442,6 +31520,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32665,18 +32746,9 @@ my %disabled_info = ( "asan" => { "macro" => "OPENSSL_NO_ASAN" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32773,15 +32845,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 58146a1131842d..682290f7451131 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-elf" -#define DATE "built on: Tue Jan 27 17:32:00 2026 UTC" +#define DATE "built on: Wed Mar 11 15:42:56 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -29,6 +29,11 @@ static const char compiler_flags[] = { 'D','E','L','E','T','E',' ','-','D','L','_','E','N','D','I','A', 'N',' ','-','D','O','P','E','N','S','S','L','_','P','I','C',' ', '-','D','O','P','E','N','S','S','L','_','B','U','I','L','D','I', - 'N','G','_','O','P','E','N','S','S','L',' ','-','D','N','D','E', - 'B','U','G','\0' + 'N','G','_','O','P','E','N','S','S','L',' ','-','D','B','R','O', + 'T','L','I',' ','-','D','Z','L','I','B',' ','-','D','Z','S','T', + 'D',' ','-','D','N','D','E','B','U','G',' ','-','I','.','.','/', + '.','.','/','b','r','o','t','l','i','/','c','/','i','n','c','l', + 'u','d','e',' ','-','I','.','.','/','.','.','/','z','l','i','b', + ' ','-','I','.','.','/','.','.','/','z','s','t','d','/','l','i', + 'b','\0' }; diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/configuration.h b/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/configuration.h index 17d10a6e748caf..d00dd12e9c1ac9 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/configuration.h +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/configuration.h @@ -41,15 +41,9 @@ extern "C" { # ifndef OPENSSL_NO_ASAN # define OPENSSL_NO_ASAN # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -140,15 +134,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/linux-elf/asm_avx2/openssl-cl.gypi index e6a3ba9e938de5..694232771682fe 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/openssl-cl.gypi +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/openssl-cl.gypi @@ -5,6 +5,9 @@ 'OPENSSL_USE_NODELETE', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'CMLL_ASM', 'DES_ASM', @@ -34,7 +37,7 @@ '-Wall -O3 -fomit-frame-pointer', ], 'openssl_ex_libs_linux-elf': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], 'openssl_cli_srcs_linux-elf': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/linux-elf/asm_avx2/openssl-fips.gypi index eebbb61741603d..9c397eb5ab81a6 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/openssl-fips.gypi @@ -353,6 +353,9 @@ 'OPENSSL_USE_NODELETE', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'DES_ASM', 'ECP_NISTZ256_ASM', @@ -376,7 +379,7 @@ '-Wall -O3 -fomit-frame-pointer', ], 'openssl_ex_libs_linux-elf': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux-elf/asm_avx2/providers/fips.ld' }, diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux-elf/asm_avx2/openssl.gypi index 2b023fa95d57be..03ac64aafcded1 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/openssl.gypi @@ -278,6 +278,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1123,6 +1128,36 @@ './config/archs/linux-elf/asm_avx2/providers/fips.ld', ], 'openssl_defines_linux-elf': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'AES_ASM', + 'CMLL_ASM', + 'DES_ASM', + 'ECP_NISTZ256_ASM', + 'GHASH_ASM', + 'MD5_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_BN_ASM_PART_WORDS', + 'OPENSSL_CPUID_OBJ', + 'OPENSSL_IA32_SSE2', + 'PADLOCK_ASM', + 'POLY1305_ASM', + 'RC4_ASM', + 'RMD160_ASM', + 'SHA1_ASM', + 'SHA256_ASM', + 'SHA512_ASM', + 'VPAES_ASM', + 'WHIRLPOOL_ASM', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_linux-elf': [ 'NDEBUG', 'OPENSSL_USE_NODELETE', 'L_ENDIAN', @@ -1156,7 +1191,7 @@ '-Wall -O3 -fomit-frame-pointer', ], 'openssl_ex_libs_linux-elf': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], }, 'include_dirs': [ @@ -1172,6 +1207,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-elf)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_linux-elf)'], + 'defines': ['<@(openssl_defines_exported_linux-elf)'], }, } 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 bec6a2c5c780da..2206088327a73f 100644 --- a/deps/openssl/config/archs/linux-elf/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux-elf/no-asm/configdata.pm @@ -115,6 +115,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -191,9 +192,7 @@ our %config = ( "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -224,9 +223,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -235,17 +232,22 @@ our %config = ( ], "openssl_sys_defines" => [], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-asm no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "no-asm", "linux-elf" ], @@ -327,7 +329,10 @@ our %target = ( "cppflags" => "", "cxxflags" => "-std=c++11 -pthread", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_ldflags" => "-Wl,-z,defs", @@ -335,8 +340,12 @@ our %target = ( "enable" => [ "afalgeng" ], - "ex_libs" => "-ldl -pthread", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd -ldl -pthread", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "", "lib_cflags" => "", "lib_cppflags" => "-DOPENSSL_USE_NODELETE -DL_ENDIAN", @@ -515,10 +524,8 @@ our %disabled = ( "afalgeng" => "option", "asan" => "default", "asm" => "option", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -551,12 +558,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1044,6 +1053,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1311,6 +1323,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8312,6 +8327,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10068,6 +10087,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12013,6 +12046,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12074,6 +12108,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21218,6 +21253,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21803,6 +21842,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23531,6 +23574,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23620,6 +23664,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -24864,6 +24909,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -27788,6 +27848,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30301,6 +30366,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -30846,6 +30917,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31271,6 +31349,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32497,18 +32578,9 @@ my %disabled_info = ( "asm" => { "macro" => "OPENSSL_NO_ASM" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32605,15 +32677,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 16d317d328f465..64a41b09c4f160 100644 --- a/deps/openssl/config/archs/linux-elf/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-elf/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-elf" -#define DATE "built on: Tue Jan 27 17:32:16 2026 UTC" +#define DATE "built on: Wed Mar 11 15:43:09 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -27,5 +27,10 @@ static const char compiler_flags[] = { 'T','E',' ','-','D','L','_','E','N','D','I','A','N',' ','-','D', 'O','P','E','N','S','S','L','_','P','I','C',' ','-','D','O','P', 'E','N','S','S','L','_','B','U','I','L','D','I','N','G','_','O', - 'P','E','N','S','S','L',' ','-','D','N','D','E','B','U','G','\0' + 'P','E','N','S','S','L',' ','-','D','B','R','O','T','L','I',' ', + '-','D','Z','L','I','B',' ','-','D','Z','S','T','D',' ','-','D', + 'N','D','E','B','U','G',' ','-','I','.','.','/','.','.','/','b', + 'r','o','t','l','i','/','c','/','i','n','c','l','u','d','e',' ', + '-','I','.','.','/','.','.','/','z','l','i','b',' ','-','I','.', + '.','/','.','.','/','z','s','t','d','/','l','i','b','\0' }; diff --git a/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/configuration.h b/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/configuration.h index 434d536f1b42c6..9f969024d9b634 100644 --- a/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/configuration.h +++ b/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/configuration.h @@ -44,15 +44,9 @@ extern "C" { # ifndef OPENSSL_NO_ASM # define OPENSSL_NO_ASM # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -143,15 +137,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/linux-elf/no-asm/openssl-cl.gypi b/deps/openssl/config/archs/linux-elf/no-asm/openssl-cl.gypi index 6fcfff4583abba..3aab1c9476a8e9 100644 --- a/deps/openssl/config/archs/linux-elf/no-asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/linux-elf/no-asm/openssl-cl.gypi @@ -5,6 +5,9 @@ 'OPENSSL_USE_NODELETE', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'OPENSSL_PIC', ], 'openssl_cflags_linux-elf': [ @@ -13,7 +16,7 @@ '-Wall -O3 -fomit-frame-pointer', ], 'openssl_ex_libs_linux-elf': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], 'openssl_cli_srcs_linux-elf': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/linux-elf/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/linux-elf/no-asm/openssl-fips.gypi index 99d056338860ff..1278138c8988e9 100644 --- a/deps/openssl/config/archs/linux-elf/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-elf/no-asm/openssl-fips.gypi @@ -334,6 +334,9 @@ 'OPENSSL_USE_NODELETE', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'FIPS_MODULE', 'FIPS_MODULE', ], @@ -343,7 +346,7 @@ '-Wall -O3 -fomit-frame-pointer', ], 'openssl_ex_libs_linux-elf': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux-elf/no-asm/providers/fips.ld' }, diff --git a/deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi b/deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi index 92626ae6f6a49d..5000338805d54e 100644 --- a/deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi @@ -286,6 +286,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1111,6 +1116,16 @@ './config/archs/linux-elf/no-asm/providers/fips.ld', ], 'openssl_defines_linux-elf': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_linux-elf': [ 'NDEBUG', 'OPENSSL_USE_NODELETE', 'L_ENDIAN', @@ -1123,7 +1138,7 @@ '-Wall -O3 -fomit-frame-pointer', ], 'openssl_ex_libs_linux-elf': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], }, 'include_dirs': [ @@ -1139,6 +1154,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-elf)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_linux-elf)'], + 'defines': ['<@(openssl_defines_exported_linux-elf)'], }, } diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/configdata.pm b/deps/openssl/config/archs/linux-ppc64le/asm/configdata.pm index e30041bb7dc374..57dd1bb4703a3f 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm/configdata.pm +++ b/deps/openssl/config/archs/linux-ppc64le/asm/configdata.pm @@ -115,6 +115,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -192,9 +193,7 @@ our %config = ( "OPENSSL_THREADS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -225,9 +224,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -236,17 +233,22 @@ our %config = ( ], "openssl_sys_defines" => [], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "linux-ppc64le" ], "perlenv" => { @@ -328,7 +330,10 @@ our %target = ( "cppflags" => "", "cxxflags" => "-std=c++11 -pthread -m64", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_ldflags" => "-Wl,-z,defs", @@ -336,8 +341,12 @@ our %target = ( "enable" => [ "afalgeng" ], - "ex_libs" => "-ldl -pthread", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd -ldl -pthread", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "", "lib_cflags" => "", "lib_cppflags" => "-DOPENSSL_USE_NODELETE -DL_ENDIAN", @@ -515,10 +524,8 @@ our @disablables_int = ( our %disabled = ( "afalgeng" => "option", "asan" => "default", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -551,12 +558,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1044,6 +1053,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1311,6 +1323,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8350,6 +8365,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10122,6 +10141,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12094,6 +12127,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12155,6 +12189,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21302,6 +21337,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21887,6 +21926,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23615,6 +23658,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23704,6 +23748,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -24990,6 +25035,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -28009,6 +28069,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30557,6 +30622,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -31102,6 +31173,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31527,6 +31605,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32750,18 +32831,9 @@ my %disabled_info = ( "asan" => { "macro" => "OPENSSL_NO_ASAN" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32858,15 +32930,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 98640a95514a37..d5dbe1086efb5e 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-ppc64le/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-ppc64le" -#define DATE "built on: Tue Jan 27 17:33:32 2026 UTC" +#define DATE "built on: Wed Mar 11 15:44:06 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -27,6 +27,10 @@ static const char compiler_flags[] = { 'L','E','T','E',' ','-','D','L','_','E','N','D','I','A','N',' ', '-','D','O','P','E','N','S','S','L','_','P','I','C',' ','-','D', 'O','P','E','N','S','S','L','_','B','U','I','L','D','I','N','G', - '_','O','P','E','N','S','S','L',' ','-','D','N','D','E','B','U', - 'G','\0' + '_','O','P','E','N','S','S','L',' ','-','D','B','R','O','T','L', + 'I',' ','-','D','Z','L','I','B',' ','-','D','Z','S','T','D',' ', + '-','D','N','D','E','B','U','G',' ','-','I','.','.','/','.','.', + '/','b','r','o','t','l','i','/','c','/','i','n','c','l','u','d', + 'e',' ','-','I','.','.','/','.','.','/','z','l','i','b',' ','-', + 'I','.','.','/','.','.','/','z','s','t','d','/','l','i','b','\0' }; diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/configuration.h b/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/configuration.h index f7d23da524f1ee..72f598af52ae68 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/configuration.h +++ b/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/configuration.h @@ -41,15 +41,9 @@ extern "C" { # ifndef OPENSSL_NO_ASAN # define OPENSSL_NO_ASAN # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -140,15 +134,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/openssl-cl.gypi b/deps/openssl/config/archs/linux-ppc64le/asm/openssl-cl.gypi index 923a457d57fba1..0ef9670bac9b1b 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/linux-ppc64le/asm/openssl-cl.gypi @@ -5,6 +5,9 @@ 'OPENSSL_USE_NODELETE', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'ECP_NISTZ256_ASM', 'KECCAK1600_ASM', @@ -25,7 +28,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux-ppc64le': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], 'openssl_cli_srcs_linux-ppc64le': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/openssl-fips.gypi b/deps/openssl/config/archs/linux-ppc64le/asm/openssl-fips.gypi index a09c395730c90a..91e0dab98cdcca 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-ppc64le/asm/openssl-fips.gypi @@ -357,6 +357,9 @@ 'OPENSSL_USE_NODELETE', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'ECP_NISTZ256_ASM', 'FIPS_MODULE', @@ -377,7 +380,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux-ppc64le': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux-ppc64le/asm/providers/fips.ld' }, diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/openssl.gypi b/deps/openssl/config/archs/linux-ppc64le/asm/openssl.gypi index 6975751ce75944..6710cc4445c4db 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-ppc64le/asm/openssl.gypi @@ -286,6 +286,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1135,6 +1140,27 @@ './config/archs/linux-ppc64le/asm/providers/fips.ld', ], 'openssl_defines_linux-ppc64le': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'AES_ASM', + 'ECP_NISTZ256_ASM', + 'KECCAK1600_ASM', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_CPUID_OBJ', + 'POLY1305_ASM', + 'SHA1_ASM', + 'SHA256_ASM', + 'SHA512_ASM', + 'VPAES_ASM', + 'X25519_ASM', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_linux-ppc64le': [ 'NDEBUG', 'OPENSSL_USE_NODELETE', 'L_ENDIAN', @@ -1159,7 +1185,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux-ppc64le': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], }, 'include_dirs': [ @@ -1175,6 +1201,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-ppc64le)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_linux-ppc64le)'], + 'defines': ['<@(openssl_defines_exported_linux-ppc64le)'], }, } 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 4dbe3704cbf55d..c97b106dc04aa1 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/configdata.pm @@ -115,6 +115,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -192,9 +193,7 @@ our %config = ( "OPENSSL_THREADS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -225,9 +224,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -236,17 +233,22 @@ our %config = ( ], "openssl_sys_defines" => [], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "linux-ppc64le" ], "perlenv" => { @@ -328,7 +330,10 @@ our %target = ( "cppflags" => "", "cxxflags" => "-std=c++11 -pthread -m64", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_ldflags" => "-Wl,-z,defs", @@ -336,8 +341,12 @@ our %target = ( "enable" => [ "afalgeng" ], - "ex_libs" => "-ldl -pthread", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd -ldl -pthread", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "", "lib_cflags" => "", "lib_cppflags" => "-DOPENSSL_USE_NODELETE -DL_ENDIAN", @@ -515,10 +524,8 @@ our @disablables_int = ( our %disabled = ( "afalgeng" => "option", "asan" => "default", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -551,12 +558,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1044,6 +1053,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1311,6 +1323,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8350,6 +8365,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10122,6 +10141,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12094,6 +12127,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12155,6 +12189,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21302,6 +21337,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21887,6 +21926,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23615,6 +23658,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23704,6 +23748,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -24990,6 +25035,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -28009,6 +28069,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30557,6 +30622,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -31102,6 +31173,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31527,6 +31605,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32750,18 +32831,9 @@ my %disabled_info = ( "asan" => { "macro" => "OPENSSL_NO_ASAN" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32858,15 +32930,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 b08cdc7d0de775..a7a77799ea194a 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-ppc64le" -#define DATE "built on: Tue Jan 27 17:33:48 2026 UTC" +#define DATE "built on: Wed Mar 11 15:44:18 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -28,6 +28,11 @@ static const char compiler_flags[] = { 'D','E','L','E','T','E',' ','-','D','L','_','E','N','D','I','A', 'N',' ','-','D','O','P','E','N','S','S','L','_','P','I','C',' ', '-','D','O','P','E','N','S','S','L','_','B','U','I','L','D','I', - 'N','G','_','O','P','E','N','S','S','L',' ','-','D','N','D','E', - 'B','U','G','\0' + 'N','G','_','O','P','E','N','S','S','L',' ','-','D','B','R','O', + 'T','L','I',' ','-','D','Z','L','I','B',' ','-','D','Z','S','T', + 'D',' ','-','D','N','D','E','B','U','G',' ','-','I','.','.','/', + '.','.','/','b','r','o','t','l','i','/','c','/','i','n','c','l', + 'u','d','e',' ','-','I','.','.','/','.','.','/','z','l','i','b', + ' ','-','I','.','.','/','.','.','/','z','s','t','d','/','l','i', + 'b','\0' }; diff --git a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/configuration.h b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/configuration.h index f7d23da524f1ee..72f598af52ae68 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/configuration.h +++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/configuration.h @@ -41,15 +41,9 @@ extern "C" { # ifndef OPENSSL_NO_ASAN # define OPENSSL_NO_ASAN # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -140,15 +134,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/openssl-cl.gypi index a5611defd8e171..9173ddd29bc68c 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/openssl-cl.gypi +++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/openssl-cl.gypi @@ -5,6 +5,9 @@ 'OPENSSL_USE_NODELETE', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'ECP_NISTZ256_ASM', 'KECCAK1600_ASM', @@ -25,7 +28,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux-ppc64le': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], 'openssl_cli_srcs_linux-ppc64le': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/openssl-fips.gypi index b3d3a5ed986ba3..3ba43ccda51c70 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/openssl-fips.gypi @@ -357,6 +357,9 @@ 'OPENSSL_USE_NODELETE', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'ECP_NISTZ256_ASM', 'FIPS_MODULE', @@ -377,7 +380,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux-ppc64le': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux-ppc64le/asm_avx2/providers/fips.ld' }, diff --git a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/openssl.gypi index cb141ae2122bd7..b2eeaefd22087c 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/openssl.gypi @@ -286,6 +286,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1135,6 +1140,27 @@ './config/archs/linux-ppc64le/asm_avx2/providers/fips.ld', ], 'openssl_defines_linux-ppc64le': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'AES_ASM', + 'ECP_NISTZ256_ASM', + 'KECCAK1600_ASM', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_CPUID_OBJ', + 'POLY1305_ASM', + 'SHA1_ASM', + 'SHA256_ASM', + 'SHA512_ASM', + 'VPAES_ASM', + 'X25519_ASM', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_linux-ppc64le': [ 'NDEBUG', 'OPENSSL_USE_NODELETE', 'L_ENDIAN', @@ -1159,7 +1185,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux-ppc64le': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], }, 'include_dirs': [ @@ -1175,6 +1201,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-ppc64le)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_linux-ppc64le)'], + 'defines': ['<@(openssl_defines_exported_linux-ppc64le)'], }, } 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 94e94cb3138cf8..ad5bd17ed22b0b 100644 --- a/deps/openssl/config/archs/linux-ppc64le/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/configdata.pm @@ -115,6 +115,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -191,9 +192,7 @@ our %config = ( "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -224,9 +223,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -235,17 +232,22 @@ our %config = ( ], "openssl_sys_defines" => [], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-asm no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "no-asm", "linux-ppc64le" ], @@ -328,7 +330,10 @@ our %target = ( "cppflags" => "", "cxxflags" => "-std=c++11 -pthread -m64", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_ldflags" => "-Wl,-z,defs", @@ -336,8 +341,12 @@ our %target = ( "enable" => [ "afalgeng" ], - "ex_libs" => "-ldl -pthread", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd -ldl -pthread", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "", "lib_cflags" => "", "lib_cppflags" => "-DOPENSSL_USE_NODELETE -DL_ENDIAN", @@ -516,10 +525,8 @@ our %disabled = ( "afalgeng" => "option", "asan" => "default", "asm" => "option", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -552,12 +559,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1045,6 +1054,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1312,6 +1324,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8313,6 +8328,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10069,6 +10088,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12014,6 +12047,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12075,6 +12109,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21219,6 +21254,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21804,6 +21843,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23532,6 +23575,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23621,6 +23665,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -24865,6 +24910,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -27789,6 +27849,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30302,6 +30367,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -30847,6 +30918,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31272,6 +31350,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32498,18 +32579,9 @@ my %disabled_info = ( "asm" => { "macro" => "OPENSSL_NO_ASM" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32606,15 +32678,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 2c9b95b29285c2..10fcd6a0431eb9 100644 --- a/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-ppc64le" -#define DATE "built on: Tue Jan 27 17:34:05 2026 UTC" +#define DATE "built on: Wed Mar 11 15:44:31 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -26,5 +26,10 @@ static const char compiler_flags[] = { 'T','E',' ','-','D','L','_','E','N','D','I','A','N',' ','-','D', 'O','P','E','N','S','S','L','_','P','I','C',' ','-','D','O','P', 'E','N','S','S','L','_','B','U','I','L','D','I','N','G','_','O', - 'P','E','N','S','S','L',' ','-','D','N','D','E','B','U','G','\0' + 'P','E','N','S','S','L',' ','-','D','B','R','O','T','L','I',' ', + '-','D','Z','L','I','B',' ','-','D','Z','S','T','D',' ','-','D', + 'N','D','E','B','U','G',' ','-','I','.','.','/','.','.','/','b', + 'r','o','t','l','i','/','c','/','i','n','c','l','u','d','e',' ', + '-','I','.','.','/','.','.','/','z','l','i','b',' ','-','I','.', + '.','/','.','.','/','z','s','t','d','/','l','i','b','\0' }; diff --git a/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/configuration.h b/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/configuration.h index bc3a1462b437c8..811849a7a0152b 100644 --- a/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/configuration.h +++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/configuration.h @@ -44,15 +44,9 @@ extern "C" { # ifndef OPENSSL_NO_ASM # define OPENSSL_NO_ASM # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -143,15 +137,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl-cl.gypi b/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl-cl.gypi index 9760fd2c329aac..c0bd13b490bb45 100644 --- a/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl-cl.gypi @@ -5,6 +5,9 @@ 'OPENSSL_USE_NODELETE', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'OPENSSL_PIC', ], 'openssl_cflags_linux-ppc64le': [ @@ -13,7 +16,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux-ppc64le': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], 'openssl_cli_srcs_linux-ppc64le': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl-fips.gypi index 28398a6a4a853c..7392e1e2ac193e 100644 --- a/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl-fips.gypi @@ -334,6 +334,9 @@ 'OPENSSL_USE_NODELETE', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'FIPS_MODULE', 'FIPS_MODULE', ], @@ -343,7 +346,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux-ppc64le': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux-ppc64le/no-asm/providers/fips.ld' }, diff --git a/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl.gypi b/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl.gypi index 15606a07f26f57..a08fe33693c68a 100644 --- a/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl.gypi @@ -286,6 +286,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1111,6 +1116,16 @@ './config/archs/linux-ppc64le/no-asm/providers/fips.ld', ], 'openssl_defines_linux-ppc64le': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_linux-ppc64le': [ 'NDEBUG', 'OPENSSL_USE_NODELETE', 'L_ENDIAN', @@ -1123,7 +1138,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux-ppc64le': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], }, 'include_dirs': [ @@ -1139,6 +1154,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-ppc64le)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_linux-ppc64le)'], + 'defines': ['<@(openssl_defines_exported_linux-ppc64le)'], }, } 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 85274e2d27fce8..71ced25957fa73 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/configdata.pm +++ b/deps/openssl/config/archs/linux-x86_64/asm/configdata.pm @@ -115,6 +115,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -192,9 +193,7 @@ our %config = ( "OPENSSL_THREADS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -225,9 +224,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -236,17 +233,22 @@ our %config = ( ], "openssl_sys_defines" => [], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "linux-x86_64" ], "perlenv" => { @@ -328,7 +330,10 @@ our %target = ( "cppflags" => "", "cxxflags" => "-std=c++11 -pthread -m64", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_ldflags" => "-Wl,-z,defs", @@ -336,8 +341,12 @@ our %target = ( "enable" => [ "afalgeng" ], - "ex_libs" => "-ldl -pthread", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd -ldl -pthread", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "", "lib_cflags" => "", "lib_cppflags" => "-DOPENSSL_USE_NODELETE -DL_ENDIAN", @@ -516,10 +525,8 @@ our @disablables_int = ( our %disabled = ( "afalgeng" => "option", "asan" => "default", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -552,12 +559,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1045,6 +1054,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1312,6 +1324,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8378,6 +8393,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10181,6 +10200,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12151,6 +12184,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12212,6 +12246,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21359,6 +21394,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21944,6 +21983,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23672,6 +23715,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23761,6 +23805,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -25116,6 +25161,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -28133,6 +28193,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30690,6 +30755,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -31235,6 +31306,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31660,6 +31738,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32883,18 +32964,9 @@ my %disabled_info = ( "asan" => { "macro" => "OPENSSL_NO_ASAN" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32991,15 +33063,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 fc4e10a034e732..cc52bb38ece6ac 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-x86_64/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-x86_64" -#define DATE "built on: Tue Jan 27 17:32:32 2026 UTC" +#define DATE "built on: Wed Mar 11 15:43:21 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -27,6 +27,10 @@ static const char compiler_flags[] = { 'L','E','T','E',' ','-','D','L','_','E','N','D','I','A','N',' ', '-','D','O','P','E','N','S','S','L','_','P','I','C',' ','-','D', 'O','P','E','N','S','S','L','_','B','U','I','L','D','I','N','G', - '_','O','P','E','N','S','S','L',' ','-','D','N','D','E','B','U', - 'G','\0' + '_','O','P','E','N','S','S','L',' ','-','D','B','R','O','T','L', + 'I',' ','-','D','Z','L','I','B',' ','-','D','Z','S','T','D',' ', + '-','D','N','D','E','B','U','G',' ','-','I','.','.','/','.','.', + '/','b','r','o','t','l','i','/','c','/','i','n','c','l','u','d', + 'e',' ','-','I','.','.','/','.','.','/','z','l','i','b',' ','-', + 'I','.','.','/','.','.','/','z','s','t','d','/','l','i','b','\0' }; diff --git a/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/configuration.h b/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/configuration.h index 83c3b5466f0f4b..6a85ffac547cd5 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/configuration.h +++ b/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/configuration.h @@ -41,15 +41,9 @@ extern "C" { # ifndef OPENSSL_NO_ASAN # define OPENSSL_NO_ASAN # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -140,15 +134,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/linux-x86_64/asm/openssl-cl.gypi b/deps/openssl/config/archs/linux-x86_64/asm/openssl-cl.gypi index 72ca8b66cffa9c..360c8ea9b2701c 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/linux-x86_64/asm/openssl-cl.gypi @@ -5,6 +5,9 @@ 'OPENSSL_USE_NODELETE', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'BSAES_ASM', 'CMLL_ASM', @@ -35,7 +38,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux-x86_64': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], 'openssl_cli_srcs_linux-x86_64': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/linux-x86_64/asm/openssl-fips.gypi b/deps/openssl/config/archs/linux-x86_64/asm/openssl-fips.gypi index 1b87dbbd30ce65..3b555cbb740a3e 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-x86_64/asm/openssl-fips.gypi @@ -372,6 +372,9 @@ 'OPENSSL_USE_NODELETE', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'BSAES_ASM', 'ECP_NISTZ256_ASM', @@ -397,7 +400,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux-x86_64': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux-x86_64/asm/providers/fips.ld' }, diff --git a/deps/openssl/config/archs/linux-x86_64/asm/openssl.gypi b/deps/openssl/config/archs/linux-x86_64/asm/openssl.gypi index e2d1e5efe03aa9..2de57f36d73aa5 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-x86_64/asm/openssl.gypi @@ -283,6 +283,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1143,6 +1148,37 @@ './config/archs/linux-x86_64/asm/providers/fips.ld', ], 'openssl_defines_linux-x86_64': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'AES_ASM', + 'BSAES_ASM', + 'CMLL_ASM', + 'ECP_NISTZ256_ASM', + 'GHASH_ASM', + 'KECCAK1600_ASM', + 'MD5_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_BN_ASM_MONT5', + 'OPENSSL_CPUID_OBJ', + 'OPENSSL_IA32_SSE2', + 'PADLOCK_ASM', + 'POLY1305_ASM', + 'RC4_ASM', + 'SHA1_ASM', + 'SHA256_ASM', + 'SHA512_ASM', + 'VPAES_ASM', + 'WHIRLPOOL_ASM', + 'X25519_ASM', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_linux-x86_64': [ 'NDEBUG', 'OPENSSL_USE_NODELETE', 'L_ENDIAN', @@ -1177,7 +1213,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux-x86_64': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], }, 'include_dirs': [ @@ -1193,6 +1229,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-x86_64)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_linux-x86_64)'], + 'defines': ['<@(openssl_defines_exported_linux-x86_64)'], }, } 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 fccadf2e3cbd82..62d1cfd456c545 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 @@ -115,6 +115,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -192,9 +193,7 @@ our %config = ( "OPENSSL_THREADS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -225,9 +224,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -236,17 +233,22 @@ our %config = ( ], "openssl_sys_defines" => [], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "linux-x86_64" ], "perlenv" => { @@ -328,7 +330,10 @@ our %target = ( "cppflags" => "", "cxxflags" => "-std=c++11 -pthread -m64", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_ldflags" => "-Wl,-z,defs", @@ -336,8 +341,12 @@ our %target = ( "enable" => [ "afalgeng" ], - "ex_libs" => "-ldl -pthread", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd -ldl -pthread", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "", "lib_cflags" => "", "lib_cppflags" => "-DOPENSSL_USE_NODELETE -DL_ENDIAN", @@ -516,10 +525,8 @@ our @disablables_int = ( our %disabled = ( "afalgeng" => "option", "asan" => "default", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -552,12 +559,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1045,6 +1054,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1312,6 +1324,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8378,6 +8393,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10181,6 +10200,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12151,6 +12184,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12212,6 +12246,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21359,6 +21394,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21944,6 +21983,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23672,6 +23715,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23761,6 +23805,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -25116,6 +25161,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -28133,6 +28193,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30690,6 +30755,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -31235,6 +31306,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31660,6 +31738,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32883,18 +32964,9 @@ my %disabled_info = ( "asan" => { "macro" => "OPENSSL_NO_ASAN" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32991,15 +33063,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 f4e0d457d0d6be..55e0ac95fce5da 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-x86_64" -#define DATE "built on: Tue Jan 27 17:32:56 2026 UTC" +#define DATE "built on: Wed Mar 11 15:43:39 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -28,6 +28,11 @@ static const char compiler_flags[] = { 'D','E','L','E','T','E',' ','-','D','L','_','E','N','D','I','A', 'N',' ','-','D','O','P','E','N','S','S','L','_','P','I','C',' ', '-','D','O','P','E','N','S','S','L','_','B','U','I','L','D','I', - 'N','G','_','O','P','E','N','S','S','L',' ','-','D','N','D','E', - 'B','U','G','\0' + 'N','G','_','O','P','E','N','S','S','L',' ','-','D','B','R','O', + 'T','L','I',' ','-','D','Z','L','I','B',' ','-','D','Z','S','T', + 'D',' ','-','D','N','D','E','B','U','G',' ','-','I','.','.','/', + '.','.','/','b','r','o','t','l','i','/','c','/','i','n','c','l', + 'u','d','e',' ','-','I','.','.','/','.','.','/','z','l','i','b', + ' ','-','I','.','.','/','.','.','/','z','s','t','d','/','l','i', + 'b','\0' }; diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/configuration.h b/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/configuration.h index 83c3b5466f0f4b..6a85ffac547cd5 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/configuration.h +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/configuration.h @@ -41,15 +41,9 @@ extern "C" { # ifndef OPENSSL_NO_ASAN # define OPENSSL_NO_ASAN # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -140,15 +134,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl-cl.gypi index b9c7183a0c74b6..8d8c4d0f906386 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl-cl.gypi +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl-cl.gypi @@ -5,6 +5,9 @@ 'OPENSSL_USE_NODELETE', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'BSAES_ASM', 'CMLL_ASM', @@ -35,7 +38,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux-x86_64': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], 'openssl_cli_srcs_linux-x86_64': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl-fips.gypi index 242d41e3cced3e..5f208383f665c9 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl-fips.gypi @@ -372,6 +372,9 @@ 'OPENSSL_USE_NODELETE', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'BSAES_ASM', 'ECP_NISTZ256_ASM', @@ -397,7 +400,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux-x86_64': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux-x86_64/asm_avx2/providers/fips.ld' }, diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl.gypi index 0016fb1e601e28..bd77ad264b26c5 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl.gypi @@ -283,6 +283,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1143,6 +1148,37 @@ './config/archs/linux-x86_64/asm_avx2/providers/fips.ld', ], 'openssl_defines_linux-x86_64': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'AES_ASM', + 'BSAES_ASM', + 'CMLL_ASM', + 'ECP_NISTZ256_ASM', + 'GHASH_ASM', + 'KECCAK1600_ASM', + 'MD5_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_BN_ASM_MONT5', + 'OPENSSL_CPUID_OBJ', + 'OPENSSL_IA32_SSE2', + 'PADLOCK_ASM', + 'POLY1305_ASM', + 'RC4_ASM', + 'SHA1_ASM', + 'SHA256_ASM', + 'SHA512_ASM', + 'VPAES_ASM', + 'WHIRLPOOL_ASM', + 'X25519_ASM', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_linux-x86_64': [ 'NDEBUG', 'OPENSSL_USE_NODELETE', 'L_ENDIAN', @@ -1177,7 +1213,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux-x86_64': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], }, 'include_dirs': [ @@ -1193,6 +1229,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-x86_64)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_linux-x86_64)'], + 'defines': ['<@(openssl_defines_exported_linux-x86_64)'], }, } 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 baf6a56920ace0..b1e930d9f11914 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 @@ -115,6 +115,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -191,9 +192,7 @@ our %config = ( "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -224,9 +223,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -235,17 +232,22 @@ our %config = ( ], "openssl_sys_defines" => [], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-asm no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "no-asm", "linux-x86_64" ], @@ -328,7 +330,10 @@ our %target = ( "cppflags" => "", "cxxflags" => "-std=c++11 -pthread -m64", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_ldflags" => "-Wl,-z,defs", @@ -336,8 +341,12 @@ our %target = ( "enable" => [ "afalgeng" ], - "ex_libs" => "-ldl -pthread", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd -ldl -pthread", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "", "lib_cflags" => "", "lib_cppflags" => "-DOPENSSL_USE_NODELETE -DL_ENDIAN", @@ -517,10 +526,8 @@ our %disabled = ( "afalgeng" => "option", "asan" => "default", "asm" => "option", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -553,12 +560,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1046,6 +1055,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1313,6 +1325,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8314,6 +8329,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10070,6 +10089,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12015,6 +12048,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12076,6 +12110,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21220,6 +21255,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21805,6 +21844,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23533,6 +23576,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23622,6 +23666,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -24866,6 +24911,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -27790,6 +27850,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30303,6 +30368,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -30848,6 +30919,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31273,6 +31351,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32499,18 +32580,9 @@ my %disabled_info = ( "asm" => { "macro" => "OPENSSL_NO_ASM" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32607,15 +32679,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 2d933921f9f9a8..1853113939ad97 100644 --- a/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-x86_64" -#define DATE "built on: Tue Jan 27 17:33:16 2026 UTC" +#define DATE "built on: Wed Mar 11 15:43:54 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -26,5 +26,10 @@ static const char compiler_flags[] = { 'T','E',' ','-','D','L','_','E','N','D','I','A','N',' ','-','D', 'O','P','E','N','S','S','L','_','P','I','C',' ','-','D','O','P', 'E','N','S','S','L','_','B','U','I','L','D','I','N','G','_','O', - 'P','E','N','S','S','L',' ','-','D','N','D','E','B','U','G','\0' + 'P','E','N','S','S','L',' ','-','D','B','R','O','T','L','I',' ', + '-','D','Z','L','I','B',' ','-','D','Z','S','T','D',' ','-','D', + 'N','D','E','B','U','G',' ','-','I','.','.','/','.','.','/','b', + 'r','o','t','l','i','/','c','/','i','n','c','l','u','d','e',' ', + '-','I','.','.','/','.','.','/','z','l','i','b',' ','-','I','.', + '.','/','.','.','/','z','s','t','d','/','l','i','b','\0' }; diff --git a/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/configuration.h b/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/configuration.h index caeec5f1bbb78c..67195350e6935c 100644 --- a/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/configuration.h +++ b/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/configuration.h @@ -44,15 +44,9 @@ extern "C" { # ifndef OPENSSL_NO_ASM # define OPENSSL_NO_ASM # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -143,15 +137,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/linux-x86_64/no-asm/openssl-cl.gypi b/deps/openssl/config/archs/linux-x86_64/no-asm/openssl-cl.gypi index db9a77c59a5a0d..bdad2c864a3abe 100644 --- a/deps/openssl/config/archs/linux-x86_64/no-asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/linux-x86_64/no-asm/openssl-cl.gypi @@ -5,6 +5,9 @@ 'OPENSSL_USE_NODELETE', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'OPENSSL_PIC', ], 'openssl_cflags_linux-x86_64': [ @@ -13,7 +16,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux-x86_64': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], 'openssl_cli_srcs_linux-x86_64': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/linux-x86_64/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/linux-x86_64/no-asm/openssl-fips.gypi index f2121fe7b81109..a3a56e9a392f2f 100644 --- a/deps/openssl/config/archs/linux-x86_64/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-x86_64/no-asm/openssl-fips.gypi @@ -334,6 +334,9 @@ 'OPENSSL_USE_NODELETE', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'FIPS_MODULE', 'FIPS_MODULE', ], @@ -343,7 +346,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux-x86_64': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux-x86_64/no-asm/providers/fips.ld' }, diff --git a/deps/openssl/config/archs/linux-x86_64/no-asm/openssl.gypi b/deps/openssl/config/archs/linux-x86_64/no-asm/openssl.gypi index 0ca2902fd672ab..7ac2679cd62168 100644 --- a/deps/openssl/config/archs/linux-x86_64/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-x86_64/no-asm/openssl.gypi @@ -286,6 +286,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1111,6 +1116,16 @@ './config/archs/linux-x86_64/no-asm/providers/fips.ld', ], 'openssl_defines_linux-x86_64': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_linux-x86_64': [ 'NDEBUG', 'OPENSSL_USE_NODELETE', 'L_ENDIAN', @@ -1123,7 +1138,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux-x86_64': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], }, 'include_dirs': [ @@ -1139,6 +1154,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-x86_64)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_linux-x86_64)'], + 'defines': ['<@(openssl_defines_exported_linux-x86_64)'], }, } diff --git a/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm b/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm index 7de859892b7645..2e78234171ffdd 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm +++ b/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm @@ -115,6 +115,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -192,9 +193,7 @@ our %config = ( "OPENSSL_THREADS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -225,9 +224,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -236,17 +233,22 @@ our %config = ( ], "openssl_sys_defines" => [], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "linux32-s390x" ], "perlenv" => { @@ -327,7 +329,10 @@ our %target = ( "cppflags" => "", "cxxflags" => "-std=c++11 -pthread -m31 -Wa,-mzarch", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_ldflags" => "-Wl,-z,defs", @@ -335,8 +340,12 @@ our %target = ( "enable" => [ "afalgeng" ], - "ex_libs" => "-ldl -pthread", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd -ldl -pthread", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "", "lib_cflags" => "", "lib_cppflags" => "-DOPENSSL_USE_NODELETE -DB_ENDIAN", @@ -515,10 +524,8 @@ our @disablables_int = ( our %disabled = ( "afalgeng" => "option", "asan" => "default", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -551,12 +558,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1044,6 +1053,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1311,6 +1323,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8360,6 +8375,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10120,6 +10139,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12077,6 +12110,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12138,6 +12172,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21339,6 +21374,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21924,6 +21963,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23652,6 +23695,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23741,6 +23785,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -24991,6 +25036,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -27958,6 +28018,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30486,6 +30551,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -31031,6 +31102,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31456,6 +31534,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32679,18 +32760,9 @@ my %disabled_info = ( "asan" => { "macro" => "OPENSSL_NO_ASAN" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32787,15 +32859,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 3470be7b84152f..91e4f060420fb5 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux32-s390x/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux32-s390x" -#define DATE "built on: Tue Jan 27 17:34:21 2026 UTC" +#define DATE "built on: Wed Mar 11 15:44:42 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -28,5 +28,10 @@ static const char compiler_flags[] = { ' ','-','D','B','_','E','N','D','I','A','N',' ','-','D','O','P', 'E','N','S','S','L','_','P','I','C',' ','-','D','O','P','E','N', 'S','S','L','_','B','U','I','L','D','I','N','G','_','O','P','E', - 'N','S','S','L',' ','-','D','N','D','E','B','U','G','\0' + 'N','S','S','L',' ','-','D','B','R','O','T','L','I',' ','-','D', + 'Z','L','I','B',' ','-','D','Z','S','T','D',' ','-','D','N','D', + 'E','B','U','G',' ','-','I','.','.','/','.','.','/','b','r','o', + 't','l','i','/','c','/','i','n','c','l','u','d','e',' ','-','I', + '.','.','/','.','.','/','z','l','i','b',' ','-','I','.','.','/', + '.','.','/','z','s','t','d','/','l','i','b','\0' }; diff --git a/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/configuration.h b/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/configuration.h index 89221822d10e12..d83ab09218ef05 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/configuration.h +++ b/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/configuration.h @@ -41,15 +41,9 @@ extern "C" { # ifndef OPENSSL_NO_ASAN # define OPENSSL_NO_ASAN # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -140,15 +134,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/linux32-s390x/asm/openssl-cl.gypi b/deps/openssl/config/archs/linux32-s390x/asm/openssl-cl.gypi index adf586dde0ca36..27a7b539d339b5 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/linux32-s390x/asm/openssl-cl.gypi @@ -5,6 +5,9 @@ 'OPENSSL_USE_NODELETE', 'B_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'AES_CTR_ASM', 'AES_XTS_ASM', @@ -28,7 +31,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux32-s390x': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], 'openssl_cli_srcs_linux32-s390x': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/linux32-s390x/asm/openssl-fips.gypi b/deps/openssl/config/archs/linux32-s390x/asm/openssl-fips.gypi index c523e1ceff785b..56279c80689923 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux32-s390x/asm/openssl-fips.gypi @@ -345,6 +345,9 @@ 'OPENSSL_USE_NODELETE', 'B_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'AES_CTR_ASM', 'AES_XTS_ASM', @@ -367,7 +370,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux32-s390x': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux32-s390x/asm/providers/fips.ld' }, diff --git a/deps/openssl/config/archs/linux32-s390x/asm/openssl.gypi b/deps/openssl/config/archs/linux32-s390x/asm/openssl.gypi index e029b77cf34812..3a63ccf6a9dfee 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/openssl.gypi +++ b/deps/openssl/config/archs/linux32-s390x/asm/openssl.gypi @@ -283,6 +283,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1120,6 +1125,30 @@ './config/archs/linux32-s390x/asm/providers/fips.ld', ], 'openssl_defines_linux32-s390x': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'B_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'AES_ASM', + 'AES_CTR_ASM', + 'AES_XTS_ASM', + 'GHASH_ASM', + 'KECCAK1600_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_CPUID_OBJ', + 'POLY1305_ASM', + 'RC4_ASM', + 'S390X_EC_ASM', + 'SHA1_ASM', + 'SHA256_ASM', + 'SHA512_ASM', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_linux32-s390x': [ 'NDEBUG', 'OPENSSL_USE_NODELETE', 'B_ENDIAN', @@ -1147,7 +1176,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux32-s390x': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], }, 'include_dirs': [ @@ -1163,6 +1192,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux32-s390x)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_linux32-s390x)'], + 'defines': ['<@(openssl_defines_exported_linux32-s390x)'], }, } 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 5f40976d40f264..23a529303870ee 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/configdata.pm @@ -115,6 +115,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -192,9 +193,7 @@ our %config = ( "OPENSSL_THREADS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -225,9 +224,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -236,17 +233,22 @@ our %config = ( ], "openssl_sys_defines" => [], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "linux32-s390x" ], "perlenv" => { @@ -327,7 +329,10 @@ our %target = ( "cppflags" => "", "cxxflags" => "-std=c++11 -pthread -m31 -Wa,-mzarch", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_ldflags" => "-Wl,-z,defs", @@ -335,8 +340,12 @@ our %target = ( "enable" => [ "afalgeng" ], - "ex_libs" => "-ldl -pthread", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd -ldl -pthread", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "", "lib_cflags" => "", "lib_cppflags" => "-DOPENSSL_USE_NODELETE -DB_ENDIAN", @@ -515,10 +524,8 @@ our @disablables_int = ( our %disabled = ( "afalgeng" => "option", "asan" => "default", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -551,12 +558,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1044,6 +1053,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1311,6 +1323,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8360,6 +8375,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10120,6 +10139,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12077,6 +12110,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12138,6 +12172,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21339,6 +21374,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21924,6 +21963,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23652,6 +23695,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23741,6 +23785,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -24991,6 +25036,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -27958,6 +28018,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30486,6 +30551,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -31031,6 +31102,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31456,6 +31534,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32679,18 +32760,9 @@ my %disabled_info = ( "asan" => { "macro" => "OPENSSL_NO_ASAN" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32787,15 +32859,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 28edaa10ca1bca..fb51298a3ef74e 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux32-s390x" -#define DATE "built on: Tue Jan 27 17:34:38 2026 UTC" +#define DATE "built on: Wed Mar 11 15:44:54 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -29,5 +29,10 @@ static const char compiler_flags[] = { 'T','E',' ','-','D','B','_','E','N','D','I','A','N',' ','-','D', 'O','P','E','N','S','S','L','_','P','I','C',' ','-','D','O','P', 'E','N','S','S','L','_','B','U','I','L','D','I','N','G','_','O', - 'P','E','N','S','S','L',' ','-','D','N','D','E','B','U','G','\0' + 'P','E','N','S','S','L',' ','-','D','B','R','O','T','L','I',' ', + '-','D','Z','L','I','B',' ','-','D','Z','S','T','D',' ','-','D', + 'N','D','E','B','U','G',' ','-','I','.','.','/','.','.','/','b', + 'r','o','t','l','i','/','c','/','i','n','c','l','u','d','e',' ', + '-','I','.','.','/','.','.','/','z','l','i','b',' ','-','I','.', + '.','/','.','.','/','z','s','t','d','/','l','i','b','\0' }; diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/configuration.h b/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/configuration.h index 89221822d10e12..d83ab09218ef05 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/configuration.h +++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/configuration.h @@ -41,15 +41,9 @@ extern "C" { # ifndef OPENSSL_NO_ASAN # define OPENSSL_NO_ASAN # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -140,15 +134,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/linux32-s390x/asm_avx2/openssl-cl.gypi index 0bfb83b4c1a7f1..8d53f4fff7963d 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/openssl-cl.gypi +++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/openssl-cl.gypi @@ -5,6 +5,9 @@ 'OPENSSL_USE_NODELETE', 'B_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'AES_CTR_ASM', 'AES_XTS_ASM', @@ -28,7 +31,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux32-s390x': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], 'openssl_cli_srcs_linux32-s390x': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/linux32-s390x/asm_avx2/openssl-fips.gypi index 5b6ce2ff344d96..a32d8bb653dd96 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/openssl-fips.gypi @@ -345,6 +345,9 @@ 'OPENSSL_USE_NODELETE', 'B_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'AES_CTR_ASM', 'AES_XTS_ASM', @@ -367,7 +370,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux32-s390x': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux32-s390x/asm_avx2/providers/fips.ld' }, diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux32-s390x/asm_avx2/openssl.gypi index 41d8e82a7eeef6..e4d8e0098b5a1c 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/openssl.gypi @@ -283,6 +283,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1120,6 +1125,30 @@ './config/archs/linux32-s390x/asm_avx2/providers/fips.ld', ], 'openssl_defines_linux32-s390x': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'B_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'AES_ASM', + 'AES_CTR_ASM', + 'AES_XTS_ASM', + 'GHASH_ASM', + 'KECCAK1600_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_CPUID_OBJ', + 'POLY1305_ASM', + 'RC4_ASM', + 'S390X_EC_ASM', + 'SHA1_ASM', + 'SHA256_ASM', + 'SHA512_ASM', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_linux32-s390x': [ 'NDEBUG', 'OPENSSL_USE_NODELETE', 'B_ENDIAN', @@ -1147,7 +1176,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux32-s390x': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], }, 'include_dirs': [ @@ -1163,6 +1192,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux32-s390x)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_linux32-s390x)'], + 'defines': ['<@(openssl_defines_exported_linux32-s390x)'], }, } 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 abf158780b3cbc..a823e137a34d99 100644 --- a/deps/openssl/config/archs/linux32-s390x/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux32-s390x/no-asm/configdata.pm @@ -115,6 +115,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -191,9 +192,7 @@ our %config = ( "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -224,9 +223,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -235,17 +232,22 @@ our %config = ( ], "openssl_sys_defines" => [], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-asm no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "no-asm", "linux32-s390x" ], @@ -327,7 +329,10 @@ our %target = ( "cppflags" => "", "cxxflags" => "-std=c++11 -pthread -m31 -Wa,-mzarch", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_ldflags" => "-Wl,-z,defs", @@ -335,8 +340,12 @@ our %target = ( "enable" => [ "afalgeng" ], - "ex_libs" => "-ldl -pthread", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd -ldl -pthread", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "", "lib_cflags" => "", "lib_cppflags" => "-DOPENSSL_USE_NODELETE -DB_ENDIAN", @@ -516,10 +525,8 @@ our %disabled = ( "afalgeng" => "option", "asan" => "default", "asm" => "option", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -552,12 +559,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1045,6 +1054,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1312,6 +1324,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8313,6 +8328,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10069,6 +10088,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12014,6 +12047,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12075,6 +12109,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21219,6 +21254,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21804,6 +21843,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23532,6 +23575,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23621,6 +23665,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -24865,6 +24910,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -27789,6 +27849,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30302,6 +30367,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -30847,6 +30918,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31272,6 +31350,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32498,18 +32579,9 @@ my %disabled_info = ( "asm" => { "macro" => "OPENSSL_NO_ASM" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32606,15 +32678,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 600638f1c588c9..48c10761e556e5 100644 --- a/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux32-s390x" -#define DATE "built on: Tue Jan 27 17:34:55 2026 UTC" +#define DATE "built on: Wed Mar 11 15:45:06 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -27,5 +27,10 @@ static const char compiler_flags[] = { 'D','B','_','E','N','D','I','A','N',' ','-','D','O','P','E','N', 'S','S','L','_','P','I','C',' ','-','D','O','P','E','N','S','S', 'L','_','B','U','I','L','D','I','N','G','_','O','P','E','N','S', - 'S','L',' ','-','D','N','D','E','B','U','G','\0' + 'S','L',' ','-','D','B','R','O','T','L','I',' ','-','D','Z','L', + 'I','B',' ','-','D','Z','S','T','D',' ','-','D','N','D','E','B', + 'U','G',' ','-','I','.','.','/','.','.','/','b','r','o','t','l', + 'i','/','c','/','i','n','c','l','u','d','e',' ','-','I','.','.', + '/','.','.','/','z','l','i','b',' ','-','I','.','.','/','.','.', + '/','z','s','t','d','/','l','i','b','\0' }; diff --git a/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/configuration.h b/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/configuration.h index 75358cb908adec..2d101256e43d23 100644 --- a/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/configuration.h +++ b/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/configuration.h @@ -44,15 +44,9 @@ extern "C" { # ifndef OPENSSL_NO_ASM # define OPENSSL_NO_ASM # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -143,15 +137,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/linux32-s390x/no-asm/openssl-cl.gypi b/deps/openssl/config/archs/linux32-s390x/no-asm/openssl-cl.gypi index 163cf454b610fa..ea213ab1d9e65e 100644 --- a/deps/openssl/config/archs/linux32-s390x/no-asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/linux32-s390x/no-asm/openssl-cl.gypi @@ -5,6 +5,9 @@ 'OPENSSL_USE_NODELETE', 'B_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'OPENSSL_PIC', ], 'openssl_cflags_linux32-s390x': [ @@ -13,7 +16,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux32-s390x': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], 'openssl_cli_srcs_linux32-s390x': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/linux32-s390x/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/linux32-s390x/no-asm/openssl-fips.gypi index ac972c95b585e9..50e723ff10741c 100644 --- a/deps/openssl/config/archs/linux32-s390x/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux32-s390x/no-asm/openssl-fips.gypi @@ -334,6 +334,9 @@ 'OPENSSL_USE_NODELETE', 'B_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'FIPS_MODULE', 'FIPS_MODULE', ], @@ -343,7 +346,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux32-s390x': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux32-s390x/no-asm/providers/fips.ld' }, diff --git a/deps/openssl/config/archs/linux32-s390x/no-asm/openssl.gypi b/deps/openssl/config/archs/linux32-s390x/no-asm/openssl.gypi index 02e8ed27d9ed14..3891facaa4e97f 100644 --- a/deps/openssl/config/archs/linux32-s390x/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux32-s390x/no-asm/openssl.gypi @@ -286,6 +286,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1112,6 +1117,16 @@ './config/archs/linux32-s390x/no-asm/providers/fips.ld', ], 'openssl_defines_linux32-s390x': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'B_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_linux32-s390x': [ 'NDEBUG', 'OPENSSL_USE_NODELETE', 'B_ENDIAN', @@ -1124,7 +1139,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux32-s390x': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], }, 'include_dirs': [ @@ -1140,6 +1155,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux32-s390x)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_linux32-s390x)'], + 'defines': ['<@(openssl_defines_exported_linux32-s390x)'], }, } diff --git a/deps/openssl/config/archs/linux64-loongarch64/no-asm/configdata.pm b/deps/openssl/config/archs/linux64-loongarch64/no-asm/configdata.pm index 2481e514a5a791..101ff2f5c80e19 100644 --- a/deps/openssl/config/archs/linux64-loongarch64/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux64-loongarch64/no-asm/configdata.pm @@ -115,6 +115,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -191,9 +192,7 @@ our %config = ( "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -224,9 +223,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -235,17 +232,22 @@ our %config = ( ], "openssl_sys_defines" => [], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-asm no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "no-asm", "linux64-loongarch64" ], @@ -328,7 +330,10 @@ our %target = ( "cppflags" => "", "cxxflags" => "-std=c++11 -pthread", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_ldflags" => "-Wl,-z,defs", @@ -336,8 +341,12 @@ our %target = ( "enable" => [ "afalgeng" ], - "ex_libs" => "-ldl -pthread", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd -ldl -pthread", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "", "lib_cflags" => "", "lib_cppflags" => "-DOPENSSL_USE_NODELETE -DL_ENDIAN", @@ -516,10 +525,8 @@ our %disabled = ( "afalgeng" => "option", "asan" => "default", "asm" => "option", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -552,12 +559,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1045,6 +1054,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1312,6 +1324,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8313,6 +8328,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10069,6 +10088,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12014,6 +12047,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12075,6 +12109,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21219,6 +21254,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21804,6 +21843,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23532,6 +23575,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23621,6 +23665,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -24865,6 +24910,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -27789,6 +27849,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30302,6 +30367,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -30847,6 +30918,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31272,6 +31350,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32498,18 +32579,9 @@ my %disabled_info = ( "asm" => { "macro" => "OPENSSL_NO_ASM" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32606,15 +32678,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } diff --git a/deps/openssl/config/archs/linux64-loongarch64/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux64-loongarch64/no-asm/crypto/buildinf.h index 52b30a10aeb920..92e583e50e2627 100644 --- a/deps/openssl/config/archs/linux64-loongarch64/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux64-loongarch64/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux64-loongarch64" -#define DATE "built on: Tue Jan 27 17:40:49 2026 UTC" +#define DATE "built on: Wed Mar 11 15:49:21 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -26,5 +26,10 @@ static const char compiler_flags[] = { 'L','_','E','N','D','I','A','N',' ','-','D','O','P','E','N','S', 'S','L','_','P','I','C',' ','-','D','O','P','E','N','S','S','L', '_','B','U','I','L','D','I','N','G','_','O','P','E','N','S','S', - 'L',' ','-','D','N','D','E','B','U','G','\0' + 'L',' ','-','D','B','R','O','T','L','I',' ','-','D','Z','L','I', + 'B',' ','-','D','Z','S','T','D',' ','-','D','N','D','E','B','U', + 'G',' ','-','I','.','.','/','.','.','/','b','r','o','t','l','i', + '/','c','/','i','n','c','l','u','d','e',' ','-','I','.','.','/', + '.','.','/','z','l','i','b',' ','-','I','.','.','/','.','.','/', + 'z','s','t','d','/','l','i','b','\0' }; diff --git a/deps/openssl/config/archs/linux64-loongarch64/no-asm/include/openssl/configuration.h b/deps/openssl/config/archs/linux64-loongarch64/no-asm/include/openssl/configuration.h index bc3a1462b437c8..811849a7a0152b 100644 --- a/deps/openssl/config/archs/linux64-loongarch64/no-asm/include/openssl/configuration.h +++ b/deps/openssl/config/archs/linux64-loongarch64/no-asm/include/openssl/configuration.h @@ -44,15 +44,9 @@ extern "C" { # ifndef OPENSSL_NO_ASM # define OPENSSL_NO_ASM # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -143,15 +137,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/linux64-loongarch64/no-asm/openssl-cl.gypi b/deps/openssl/config/archs/linux64-loongarch64/no-asm/openssl-cl.gypi index 9145a0f3092758..8ccae8301edf7b 100644 --- a/deps/openssl/config/archs/linux64-loongarch64/no-asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/linux64-loongarch64/no-asm/openssl-cl.gypi @@ -5,6 +5,9 @@ 'OPENSSL_USE_NODELETE', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'OPENSSL_PIC', ], 'openssl_cflags_linux64-loongarch64': [ @@ -13,7 +16,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux64-loongarch64': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], 'openssl_cli_srcs_linux64-loongarch64': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/linux64-loongarch64/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/linux64-loongarch64/no-asm/openssl-fips.gypi index 4a23a9cefb1698..8eff0518945143 100644 --- a/deps/openssl/config/archs/linux64-loongarch64/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux64-loongarch64/no-asm/openssl-fips.gypi @@ -334,6 +334,9 @@ 'OPENSSL_USE_NODELETE', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'FIPS_MODULE', 'FIPS_MODULE', ], @@ -343,7 +346,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux64-loongarch64': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux64-loongarch64/no-asm/providers/fips.ld' }, diff --git a/deps/openssl/config/archs/linux64-loongarch64/no-asm/openssl.gypi b/deps/openssl/config/archs/linux64-loongarch64/no-asm/openssl.gypi index 64498e49e24081..762eb3fb61e0ad 100644 --- a/deps/openssl/config/archs/linux64-loongarch64/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux64-loongarch64/no-asm/openssl.gypi @@ -286,6 +286,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1111,6 +1116,16 @@ './config/archs/linux64-loongarch64/no-asm/providers/fips.ld', ], 'openssl_defines_linux64-loongarch64': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_linux64-loongarch64': [ 'NDEBUG', 'OPENSSL_USE_NODELETE', 'L_ENDIAN', @@ -1123,7 +1138,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux64-loongarch64': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], }, 'include_dirs': [ @@ -1139,6 +1154,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux64-loongarch64)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_linux64-loongarch64)'], + 'defines': ['<@(openssl_defines_exported_linux64-loongarch64)'], }, } diff --git a/deps/openssl/config/archs/linux64-mips64/asm/configdata.pm b/deps/openssl/config/archs/linux64-mips64/asm/configdata.pm index 122ac1ff7ca7a1..c43bba96f1f2fc 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm/configdata.pm +++ b/deps/openssl/config/archs/linux64-mips64/asm/configdata.pm @@ -115,6 +115,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -195,9 +196,7 @@ our %config = ( "OPENSSL_THREADS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -228,9 +227,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -239,17 +236,22 @@ our %config = ( ], "openssl_sys_defines" => [], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "linux64-mips64" ], "perlenv" => { @@ -331,7 +333,10 @@ our %target = ( "cppflags" => "", "cxxflags" => "-std=c++11 -pthread -mabi=64", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_ldflags" => "-Wl,-z,defs", @@ -339,8 +344,12 @@ our %target = ( "enable" => [ "afalgeng" ], - "ex_libs" => "-ldl -pthread", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd -ldl -pthread", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "", "lib_cflags" => "", "lib_cppflags" => "-DOPENSSL_USE_NODELETE", @@ -519,10 +528,8 @@ our @disablables_int = ( our %disabled = ( "afalgeng" => "option", "asan" => "default", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -555,12 +562,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1048,6 +1057,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1315,6 +1327,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8338,6 +8353,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10096,6 +10115,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12048,6 +12081,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12109,6 +12143,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21295,6 +21330,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21880,6 +21919,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23608,6 +23651,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23697,6 +23741,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -24947,6 +24992,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -27893,6 +27953,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30414,6 +30479,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -30959,6 +31030,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31384,6 +31462,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32607,18 +32688,9 @@ my %disabled_info = ( "asan" => { "macro" => "OPENSSL_NO_ASAN" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32715,15 +32787,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 4b723329e359a7..323af6f35b3cc7 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux64-mips64/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux64-mips64" -#define DATE "built on: Tue Jan 27 17:35:59 2026 UTC" +#define DATE "built on: Wed Mar 11 15:45:51 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -27,6 +27,10 @@ static const char compiler_flags[] = { 'S','L','_','U','S','E','_','N','O','D','E','L','E','T','E',' ', '-','D','O','P','E','N','S','S','L','_','P','I','C',' ','-','D', 'O','P','E','N','S','S','L','_','B','U','I','L','D','I','N','G', - '_','O','P','E','N','S','S','L',' ','-','D','N','D','E','B','U', - 'G','\0' + '_','O','P','E','N','S','S','L',' ','-','D','B','R','O','T','L', + 'I',' ','-','D','Z','L','I','B',' ','-','D','Z','S','T','D',' ', + '-','D','N','D','E','B','U','G',' ','-','I','.','.','/','.','.', + '/','b','r','o','t','l','i','/','c','/','i','n','c','l','u','d', + 'e',' ','-','I','.','.','/','.','.','/','z','l','i','b',' ','-', + 'I','.','.','/','.','.','/','z','s','t','d','/','l','i','b','\0' }; diff --git a/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/configuration.h b/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/configuration.h index f7d23da524f1ee..72f598af52ae68 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/configuration.h +++ b/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/configuration.h @@ -41,15 +41,9 @@ extern "C" { # ifndef OPENSSL_NO_ASAN # define OPENSSL_NO_ASAN # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -140,15 +134,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/linux64-mips64/asm/openssl-cl.gypi b/deps/openssl/config/archs/linux64-mips64/asm/openssl-cl.gypi index dd63e7a82c1391..e61db4b90c448c 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/linux64-mips64/asm/openssl-cl.gypi @@ -4,6 +4,9 @@ 'NDEBUG', 'OPENSSL_USE_NODELETE', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'OPENSSL_BN_ASM_MONT', 'POLY1305_ASM', @@ -20,7 +23,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux64-mips64': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], 'openssl_cli_srcs_linux64-mips64': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/linux64-mips64/asm/openssl-fips.gypi b/deps/openssl/config/archs/linux64-mips64/asm/openssl-fips.gypi index 5b2ffa296a5a60..c15e651c20b3a1 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux64-mips64/asm/openssl-fips.gypi @@ -338,6 +338,9 @@ 'NDEBUG', 'OPENSSL_USE_NODELETE', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'FIPS_MODULE', 'OPENSSL_BN_ASM_MONT', @@ -354,7 +357,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux64-mips64': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux64-mips64/asm/providers/fips.ld' }, diff --git a/deps/openssl/config/archs/linux64-mips64/asm/openssl.gypi b/deps/openssl/config/archs/linux64-mips64/asm/openssl.gypi index 8630f5fa7dab23..8bdeb8eab57dc5 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm/openssl.gypi +++ b/deps/openssl/config/archs/linux64-mips64/asm/openssl.gypi @@ -284,6 +284,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1116,6 +1121,21 @@ './config/archs/linux64-mips64/asm/providers/fips.ld', ], 'openssl_defines_linux64-mips64': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'AES_ASM', + 'OPENSSL_BN_ASM_MONT', + 'POLY1305_ASM', + 'SHA1_ASM', + 'SHA256_ASM', + 'SHA512_ASM', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_linux64-mips64': [ 'NDEBUG', 'OPENSSL_USE_NODELETE', 'OPENSSL_BUILDING_OPENSSL', @@ -1135,7 +1155,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux64-mips64': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], }, 'include_dirs': [ @@ -1151,6 +1171,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux64-mips64)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_linux64-mips64)'], + 'defines': ['<@(openssl_defines_exported_linux64-mips64)'], }, } 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 b55a7bc5230475..88d08039a6dbfc 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/configdata.pm @@ -115,6 +115,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -195,9 +196,7 @@ our %config = ( "OPENSSL_THREADS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -228,9 +227,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -239,17 +236,22 @@ our %config = ( ], "openssl_sys_defines" => [], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "linux64-mips64" ], "perlenv" => { @@ -331,7 +333,10 @@ our %target = ( "cppflags" => "", "cxxflags" => "-std=c++11 -pthread -mabi=64", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_ldflags" => "-Wl,-z,defs", @@ -339,8 +344,12 @@ our %target = ( "enable" => [ "afalgeng" ], - "ex_libs" => "-ldl -pthread", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd -ldl -pthread", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "", "lib_cflags" => "", "lib_cppflags" => "-DOPENSSL_USE_NODELETE", @@ -519,10 +528,8 @@ our @disablables_int = ( our %disabled = ( "afalgeng" => "option", "asan" => "default", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -555,12 +562,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1048,6 +1057,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1315,6 +1327,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8338,6 +8353,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10096,6 +10115,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12048,6 +12081,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12109,6 +12143,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21295,6 +21330,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21880,6 +21919,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23608,6 +23651,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23697,6 +23741,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -24947,6 +24992,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -27893,6 +27953,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30414,6 +30479,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -30959,6 +31030,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31384,6 +31462,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32607,18 +32688,9 @@ my %disabled_info = ( "asan" => { "macro" => "OPENSSL_NO_ASAN" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32715,15 +32787,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 adb2f7a5aa7113..3157e41379e195 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux64-mips64" -#define DATE "built on: Tue Jan 27 17:36:15 2026 UTC" +#define DATE "built on: Wed Mar 11 15:46:02 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -28,6 +28,11 @@ static const char compiler_flags[] = { 'N','S','S','L','_','U','S','E','_','N','O','D','E','L','E','T', 'E',' ','-','D','O','P','E','N','S','S','L','_','P','I','C',' ', '-','D','O','P','E','N','S','S','L','_','B','U','I','L','D','I', - 'N','G','_','O','P','E','N','S','S','L',' ','-','D','N','D','E', - 'B','U','G','\0' + 'N','G','_','O','P','E','N','S','S','L',' ','-','D','B','R','O', + 'T','L','I',' ','-','D','Z','L','I','B',' ','-','D','Z','S','T', + 'D',' ','-','D','N','D','E','B','U','G',' ','-','I','.','.','/', + '.','.','/','b','r','o','t','l','i','/','c','/','i','n','c','l', + 'u','d','e',' ','-','I','.','.','/','.','.','/','z','l','i','b', + ' ','-','I','.','.','/','.','.','/','z','s','t','d','/','l','i', + 'b','\0' }; diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/configuration.h b/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/configuration.h index f7d23da524f1ee..72f598af52ae68 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/configuration.h +++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/configuration.h @@ -41,15 +41,9 @@ extern "C" { # ifndef OPENSSL_NO_ASAN # define OPENSSL_NO_ASAN # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -140,15 +134,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/linux64-mips64/asm_avx2/openssl-cl.gypi index 3706b0ce07c972..4a1b0285157182 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/openssl-cl.gypi +++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/openssl-cl.gypi @@ -4,6 +4,9 @@ 'NDEBUG', 'OPENSSL_USE_NODELETE', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'OPENSSL_BN_ASM_MONT', 'POLY1305_ASM', @@ -20,7 +23,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux64-mips64': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], 'openssl_cli_srcs_linux64-mips64': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/linux64-mips64/asm_avx2/openssl-fips.gypi index 22a9ab7a5df52a..cd14808cdc6251 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/openssl-fips.gypi @@ -338,6 +338,9 @@ 'NDEBUG', 'OPENSSL_USE_NODELETE', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'FIPS_MODULE', 'OPENSSL_BN_ASM_MONT', @@ -354,7 +357,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux64-mips64': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux64-mips64/asm_avx2/providers/fips.ld' }, diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux64-mips64/asm_avx2/openssl.gypi index 913ac8de5d6d35..705f88fe37b516 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/openssl.gypi @@ -284,6 +284,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1116,6 +1121,21 @@ './config/archs/linux64-mips64/asm_avx2/providers/fips.ld', ], 'openssl_defines_linux64-mips64': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'AES_ASM', + 'OPENSSL_BN_ASM_MONT', + 'POLY1305_ASM', + 'SHA1_ASM', + 'SHA256_ASM', + 'SHA512_ASM', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_linux64-mips64': [ 'NDEBUG', 'OPENSSL_USE_NODELETE', 'OPENSSL_BUILDING_OPENSSL', @@ -1135,7 +1155,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux64-mips64': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], }, 'include_dirs': [ @@ -1151,6 +1171,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux64-mips64)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_linux64-mips64)'], + 'defines': ['<@(openssl_defines_exported_linux64-mips64)'], }, } 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 ef05948ef5a386..00bd3ebf48b906 100644 --- a/deps/openssl/config/archs/linux64-mips64/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux64-mips64/no-asm/configdata.pm @@ -115,6 +115,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -191,9 +192,7 @@ our %config = ( "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -224,9 +223,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -235,17 +232,22 @@ our %config = ( ], "openssl_sys_defines" => [], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-asm no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "no-asm", "linux64-mips64" ], @@ -328,7 +330,10 @@ our %target = ( "cppflags" => "", "cxxflags" => "-std=c++11 -pthread -mabi=64", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_ldflags" => "-Wl,-z,defs", @@ -336,8 +341,12 @@ our %target = ( "enable" => [ "afalgeng" ], - "ex_libs" => "-ldl -pthread", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd -ldl -pthread", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "", "lib_cflags" => "", "lib_cppflags" => "-DOPENSSL_USE_NODELETE", @@ -517,10 +526,8 @@ our %disabled = ( "afalgeng" => "option", "asan" => "default", "asm" => "option", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -553,12 +560,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1046,6 +1055,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1313,6 +1325,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8314,6 +8329,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10070,6 +10089,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12015,6 +12048,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12076,6 +12110,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21220,6 +21255,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21805,6 +21844,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23533,6 +23576,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23622,6 +23666,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -24866,6 +24911,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -27790,6 +27850,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30303,6 +30368,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -30848,6 +30919,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31273,6 +31351,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32499,18 +32580,9 @@ my %disabled_info = ( "asm" => { "macro" => "OPENSSL_NO_ASM" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32607,15 +32679,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 35e8b35d52d496..83dec4dfa97ea4 100644 --- a/deps/openssl/config/archs/linux64-mips64/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux64-mips64/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux64-mips64" -#define DATE "built on: Tue Jan 27 17:36:31 2026 UTC" +#define DATE "built on: Wed Mar 11 15:46:14 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -26,5 +26,10 @@ static const char compiler_flags[] = { 'D','E','L','E','T','E',' ','-','D','O','P','E','N','S','S','L', '_','P','I','C',' ','-','D','O','P','E','N','S','S','L','_','B', 'U','I','L','D','I','N','G','_','O','P','E','N','S','S','L',' ', - '-','D','N','D','E','B','U','G','\0' + '-','D','B','R','O','T','L','I',' ','-','D','Z','L','I','B',' ', + '-','D','Z','S','T','D',' ','-','D','N','D','E','B','U','G',' ', + '-','I','.','.','/','.','.','/','b','r','o','t','l','i','/','c', + '/','i','n','c','l','u','d','e',' ','-','I','.','.','/','.','.', + '/','z','l','i','b',' ','-','I','.','.','/','.','.','/','z','s', + 't','d','/','l','i','b','\0' }; diff --git a/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/configuration.h b/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/configuration.h index bc3a1462b437c8..811849a7a0152b 100644 --- a/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/configuration.h +++ b/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/configuration.h @@ -44,15 +44,9 @@ extern "C" { # ifndef OPENSSL_NO_ASM # define OPENSSL_NO_ASM # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -143,15 +137,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/linux64-mips64/no-asm/openssl-cl.gypi b/deps/openssl/config/archs/linux64-mips64/no-asm/openssl-cl.gypi index dbf1619cae1f0e..8985c6dbad5ffb 100644 --- a/deps/openssl/config/archs/linux64-mips64/no-asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/linux64-mips64/no-asm/openssl-cl.gypi @@ -4,6 +4,9 @@ 'NDEBUG', 'OPENSSL_USE_NODELETE', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'OPENSSL_PIC', ], 'openssl_cflags_linux64-mips64': [ @@ -12,7 +15,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux64-mips64': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], 'openssl_cli_srcs_linux64-mips64': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/linux64-mips64/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/linux64-mips64/no-asm/openssl-fips.gypi index 00fe93d45439ee..cda71ec577ecb8 100644 --- a/deps/openssl/config/archs/linux64-mips64/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux64-mips64/no-asm/openssl-fips.gypi @@ -333,6 +333,9 @@ 'NDEBUG', 'OPENSSL_USE_NODELETE', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'FIPS_MODULE', 'FIPS_MODULE', ], @@ -342,7 +345,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux64-mips64': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux64-mips64/no-asm/providers/fips.ld' }, diff --git a/deps/openssl/config/archs/linux64-mips64/no-asm/openssl.gypi b/deps/openssl/config/archs/linux64-mips64/no-asm/openssl.gypi index e010a3d594bd66..2582577c189d3a 100644 --- a/deps/openssl/config/archs/linux64-mips64/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux64-mips64/no-asm/openssl.gypi @@ -286,6 +286,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1111,6 +1116,15 @@ './config/archs/linux64-mips64/no-asm/providers/fips.ld', ], 'openssl_defines_linux64-mips64': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_linux64-mips64': [ 'NDEBUG', 'OPENSSL_USE_NODELETE', 'OPENSSL_BUILDING_OPENSSL', @@ -1122,7 +1136,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux64-mips64': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], }, 'include_dirs': [ @@ -1138,6 +1152,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux64-mips64)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_linux64-mips64)'], + 'defines': ['<@(openssl_defines_exported_linux64-mips64)'], }, } 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 a2910ad5f3983a..aca527e095a710 100644 --- a/deps/openssl/config/archs/linux64-riscv64/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux64-riscv64/no-asm/configdata.pm @@ -115,6 +115,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -191,9 +192,7 @@ our %config = ( "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -224,9 +223,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -235,17 +232,22 @@ our %config = ( ], "openssl_sys_defines" => [], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-asm no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "no-asm", "linux64-riscv64" ], @@ -328,7 +330,10 @@ our %target = ( "cppflags" => "", "cxxflags" => "-std=c++11 -pthread", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_ldflags" => "-Wl,-z,defs", @@ -336,8 +341,12 @@ our %target = ( "enable" => [ "afalgeng" ], - "ex_libs" => "-ldl -pthread", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd -ldl -pthread", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "", "lib_cflags" => "", "lib_cppflags" => "-DOPENSSL_USE_NODELETE", @@ -516,10 +525,8 @@ our %disabled = ( "afalgeng" => "option", "asan" => "default", "asm" => "option", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -552,12 +559,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1045,6 +1054,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1312,6 +1324,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8313,6 +8328,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10069,6 +10088,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12014,6 +12047,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12075,6 +12109,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21219,6 +21254,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21804,6 +21843,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23532,6 +23575,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23621,6 +23665,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -24865,6 +24910,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -27789,6 +27849,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30302,6 +30367,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -30847,6 +30918,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31272,6 +31350,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32498,18 +32579,9 @@ my %disabled_info = ( "asm" => { "macro" => "OPENSSL_NO_ASM" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32606,15 +32678,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 fbbfef9128b564..22ea967d59f801 100644 --- a/deps/openssl/config/archs/linux64-riscv64/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux64-riscv64/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux64-riscv64" -#define DATE "built on: Tue Jan 27 17:40:34 2026 UTC" +#define DATE "built on: Wed Mar 11 15:49:10 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -25,5 +25,10 @@ static const char compiler_flags[] = { '_','U','S','E','_','N','O','D','E','L','E','T','E',' ','-','D', 'O','P','E','N','S','S','L','_','P','I','C',' ','-','D','O','P', 'E','N','S','S','L','_','B','U','I','L','D','I','N','G','_','O', - 'P','E','N','S','S','L',' ','-','D','N','D','E','B','U','G','\0' + 'P','E','N','S','S','L',' ','-','D','B','R','O','T','L','I',' ', + '-','D','Z','L','I','B',' ','-','D','Z','S','T','D',' ','-','D', + 'N','D','E','B','U','G',' ','-','I','.','.','/','.','.','/','b', + 'r','o','t','l','i','/','c','/','i','n','c','l','u','d','e',' ', + '-','I','.','.','/','.','.','/','z','l','i','b',' ','-','I','.', + '.','/','.','.','/','z','s','t','d','/','l','i','b','\0' }; diff --git a/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/configuration.h b/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/configuration.h index bc3a1462b437c8..811849a7a0152b 100644 --- a/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/configuration.h +++ b/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/configuration.h @@ -44,15 +44,9 @@ extern "C" { # ifndef OPENSSL_NO_ASM # define OPENSSL_NO_ASM # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -143,15 +137,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/linux64-riscv64/no-asm/openssl-cl.gypi b/deps/openssl/config/archs/linux64-riscv64/no-asm/openssl-cl.gypi index 82627cc2383e41..b8644f3277fe4b 100644 --- a/deps/openssl/config/archs/linux64-riscv64/no-asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/linux64-riscv64/no-asm/openssl-cl.gypi @@ -4,6 +4,9 @@ 'NDEBUG', 'OPENSSL_USE_NODELETE', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'OPENSSL_PIC', ], 'openssl_cflags_linux64-riscv64': [ @@ -12,7 +15,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux64-riscv64': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], 'openssl_cli_srcs_linux64-riscv64': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/linux64-riscv64/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/linux64-riscv64/no-asm/openssl-fips.gypi index 87083d04cdc124..0715f7a95ae8f3 100644 --- a/deps/openssl/config/archs/linux64-riscv64/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux64-riscv64/no-asm/openssl-fips.gypi @@ -333,6 +333,9 @@ 'NDEBUG', 'OPENSSL_USE_NODELETE', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'FIPS_MODULE', 'FIPS_MODULE', ], @@ -342,7 +345,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux64-riscv64': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux64-riscv64/no-asm/providers/fips.ld' }, diff --git a/deps/openssl/config/archs/linux64-riscv64/no-asm/openssl.gypi b/deps/openssl/config/archs/linux64-riscv64/no-asm/openssl.gypi index dcd5fefb86341f..5f5433798fa12e 100644 --- a/deps/openssl/config/archs/linux64-riscv64/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux64-riscv64/no-asm/openssl.gypi @@ -286,6 +286,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1111,6 +1116,15 @@ './config/archs/linux64-riscv64/no-asm/providers/fips.ld', ], 'openssl_defines_linux64-riscv64': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_linux64-riscv64': [ 'NDEBUG', 'OPENSSL_USE_NODELETE', 'OPENSSL_BUILDING_OPENSSL', @@ -1122,7 +1136,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux64-riscv64': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], }, 'include_dirs': [ @@ -1138,6 +1152,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux64-riscv64)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_linux64-riscv64)'], + 'defines': ['<@(openssl_defines_exported_linux64-riscv64)'], }, } diff --git a/deps/openssl/config/archs/linux64-s390x/asm/configdata.pm b/deps/openssl/config/archs/linux64-s390x/asm/configdata.pm index 25f15f1bd57f18..4e9c90a389d45f 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/configdata.pm +++ b/deps/openssl/config/archs/linux64-s390x/asm/configdata.pm @@ -115,6 +115,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -192,9 +193,7 @@ our %config = ( "OPENSSL_THREADS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -225,9 +224,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -236,17 +233,22 @@ our %config = ( ], "openssl_sys_defines" => [], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "linux64-s390x" ], "perlenv" => { @@ -328,7 +330,10 @@ our %target = ( "cppflags" => "", "cxxflags" => "-std=c++11 -pthread -m64", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_ldflags" => "-Wl,-z,defs", @@ -336,8 +341,12 @@ our %target = ( "enable" => [ "afalgeng" ], - "ex_libs" => "-ldl -pthread", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd -ldl -pthread", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "", "lib_cflags" => "", "lib_cppflags" => "-DOPENSSL_USE_NODELETE -DB_ENDIAN", @@ -516,10 +525,8 @@ our @disablables_int = ( our %disabled = ( "afalgeng" => "option", "asan" => "default", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -552,12 +559,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1045,6 +1054,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1312,6 +1324,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8365,6 +8380,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10137,6 +10156,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12096,6 +12129,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12157,6 +12191,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21358,6 +21393,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21943,6 +21982,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23671,6 +23714,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23760,6 +23804,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -25016,6 +25061,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -27990,6 +28050,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30521,6 +30586,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -31066,6 +31137,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31491,6 +31569,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32714,18 +32795,9 @@ my %disabled_info = ( "asan" => { "macro" => "OPENSSL_NO_ASAN" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32822,15 +32894,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 efc8b6fe70f6b8..4017c5300d3ea4 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux64-s390x/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux64-s390x" -#define DATE "built on: Tue Jan 27 17:35:10 2026 UTC" +#define DATE "built on: Wed Mar 11 15:45:17 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -27,6 +27,10 @@ static const char compiler_flags[] = { 'L','E','T','E',' ','-','D','B','_','E','N','D','I','A','N',' ', '-','D','O','P','E','N','S','S','L','_','P','I','C',' ','-','D', 'O','P','E','N','S','S','L','_','B','U','I','L','D','I','N','G', - '_','O','P','E','N','S','S','L',' ','-','D','N','D','E','B','U', - 'G','\0' + '_','O','P','E','N','S','S','L',' ','-','D','B','R','O','T','L', + 'I',' ','-','D','Z','L','I','B',' ','-','D','Z','S','T','D',' ', + '-','D','N','D','E','B','U','G',' ','-','I','.','.','/','.','.', + '/','b','r','o','t','l','i','/','c','/','i','n','c','l','u','d', + 'e',' ','-','I','.','.','/','.','.','/','z','l','i','b',' ','-', + 'I','.','.','/','.','.','/','z','s','t','d','/','l','i','b','\0' }; diff --git a/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/configuration.h b/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/configuration.h index f7d23da524f1ee..72f598af52ae68 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/configuration.h +++ b/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/configuration.h @@ -41,15 +41,9 @@ extern "C" { # ifndef OPENSSL_NO_ASAN # define OPENSSL_NO_ASAN # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -140,15 +134,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/linux64-s390x/asm/openssl-cl.gypi b/deps/openssl/config/archs/linux64-s390x/asm/openssl-cl.gypi index 51a20a868d6c96..02dd33e7706ecd 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/linux64-s390x/asm/openssl-cl.gypi @@ -5,6 +5,9 @@ 'OPENSSL_USE_NODELETE', 'B_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'AES_CTR_ASM', 'AES_XTS_ASM', @@ -29,7 +32,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux64-s390x': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], 'openssl_cli_srcs_linux64-s390x': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/linux64-s390x/asm/openssl-fips.gypi b/deps/openssl/config/archs/linux64-s390x/asm/openssl-fips.gypi index 20f46b25332532..ff59a9523ec29c 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux64-s390x/asm/openssl-fips.gypi @@ -346,6 +346,9 @@ 'OPENSSL_USE_NODELETE', 'B_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'AES_CTR_ASM', 'AES_XTS_ASM', @@ -370,7 +373,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux64-s390x': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux64-s390x/asm/providers/fips.ld' }, diff --git a/deps/openssl/config/archs/linux64-s390x/asm/openssl.gypi b/deps/openssl/config/archs/linux64-s390x/asm/openssl.gypi index 7dc8939882851a..4ca7a457a89106 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/openssl.gypi +++ b/deps/openssl/config/archs/linux64-s390x/asm/openssl.gypi @@ -283,6 +283,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1121,6 +1126,31 @@ './config/archs/linux64-s390x/asm/providers/fips.ld', ], 'openssl_defines_linux64-s390x': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'B_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'AES_ASM', + 'AES_CTR_ASM', + 'AES_XTS_ASM', + 'GHASH_ASM', + 'KECCAK1600_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_CPUID_OBJ', + 'OPENSSL_HMAC_S390X', + 'POLY1305_ASM', + 'RC4_ASM', + 'S390X_EC_ASM', + 'SHA1_ASM', + 'SHA256_ASM', + 'SHA512_ASM', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_linux64-s390x': [ 'NDEBUG', 'OPENSSL_USE_NODELETE', 'B_ENDIAN', @@ -1149,7 +1179,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux64-s390x': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], }, 'include_dirs': [ @@ -1165,6 +1195,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux64-s390x)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_linux64-s390x)'], + 'defines': ['<@(openssl_defines_exported_linux64-s390x)'], }, } 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 b7b1db5b5f69be..a02dcc0d160d92 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/configdata.pm @@ -115,6 +115,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -192,9 +193,7 @@ our %config = ( "OPENSSL_THREADS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -225,9 +224,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -236,17 +233,22 @@ our %config = ( ], "openssl_sys_defines" => [], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "linux64-s390x" ], "perlenv" => { @@ -328,7 +330,10 @@ our %target = ( "cppflags" => "", "cxxflags" => "-std=c++11 -pthread -m64", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_ldflags" => "-Wl,-z,defs", @@ -336,8 +341,12 @@ our %target = ( "enable" => [ "afalgeng" ], - "ex_libs" => "-ldl -pthread", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd -ldl -pthread", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "", "lib_cflags" => "", "lib_cppflags" => "-DOPENSSL_USE_NODELETE -DB_ENDIAN", @@ -516,10 +525,8 @@ our @disablables_int = ( our %disabled = ( "afalgeng" => "option", "asan" => "default", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -552,12 +559,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1045,6 +1054,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1312,6 +1324,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8365,6 +8380,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10137,6 +10156,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12096,6 +12129,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12157,6 +12191,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21358,6 +21393,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21943,6 +21982,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23671,6 +23714,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23760,6 +23804,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -25016,6 +25061,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -27990,6 +28050,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30521,6 +30586,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -31066,6 +31137,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31491,6 +31569,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32714,18 +32795,9 @@ my %disabled_info = ( "asan" => { "macro" => "OPENSSL_NO_ASAN" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32822,15 +32894,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 6e4794f5b7dff4..6b04e8d7b537d1 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux64-s390x" -#define DATE "built on: Tue Jan 27 17:35:27 2026 UTC" +#define DATE "built on: Wed Mar 11 15:45:29 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -28,6 +28,11 @@ static const char compiler_flags[] = { 'D','E','L','E','T','E',' ','-','D','B','_','E','N','D','I','A', 'N',' ','-','D','O','P','E','N','S','S','L','_','P','I','C',' ', '-','D','O','P','E','N','S','S','L','_','B','U','I','L','D','I', - 'N','G','_','O','P','E','N','S','S','L',' ','-','D','N','D','E', - 'B','U','G','\0' + 'N','G','_','O','P','E','N','S','S','L',' ','-','D','B','R','O', + 'T','L','I',' ','-','D','Z','L','I','B',' ','-','D','Z','S','T', + 'D',' ','-','D','N','D','E','B','U','G',' ','-','I','.','.','/', + '.','.','/','b','r','o','t','l','i','/','c','/','i','n','c','l', + 'u','d','e',' ','-','I','.','.','/','.','.','/','z','l','i','b', + ' ','-','I','.','.','/','.','.','/','z','s','t','d','/','l','i', + 'b','\0' }; diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/configuration.h b/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/configuration.h index f7d23da524f1ee..72f598af52ae68 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/configuration.h +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/configuration.h @@ -41,15 +41,9 @@ extern "C" { # ifndef OPENSSL_NO_ASAN # define OPENSSL_NO_ASAN # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -140,15 +134,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/linux64-s390x/asm_avx2/openssl-cl.gypi index 881925bc452aa6..9f44d7db9c7f2a 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/openssl-cl.gypi +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/openssl-cl.gypi @@ -5,6 +5,9 @@ 'OPENSSL_USE_NODELETE', 'B_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'AES_CTR_ASM', 'AES_XTS_ASM', @@ -29,7 +32,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux64-s390x': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], 'openssl_cli_srcs_linux64-s390x': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/linux64-s390x/asm_avx2/openssl-fips.gypi index eb6c60e8d1b188..b8c066bb4a39ab 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/openssl-fips.gypi @@ -346,6 +346,9 @@ 'OPENSSL_USE_NODELETE', 'B_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'AES_CTR_ASM', 'AES_XTS_ASM', @@ -370,7 +373,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux64-s390x': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux64-s390x/asm_avx2/providers/fips.ld' }, diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux64-s390x/asm_avx2/openssl.gypi index ad61db7d8b5cde..e0eea4aded05a1 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/openssl.gypi @@ -283,6 +283,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1121,6 +1126,31 @@ './config/archs/linux64-s390x/asm_avx2/providers/fips.ld', ], 'openssl_defines_linux64-s390x': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'B_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'AES_ASM', + 'AES_CTR_ASM', + 'AES_XTS_ASM', + 'GHASH_ASM', + 'KECCAK1600_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_CPUID_OBJ', + 'OPENSSL_HMAC_S390X', + 'POLY1305_ASM', + 'RC4_ASM', + 'S390X_EC_ASM', + 'SHA1_ASM', + 'SHA256_ASM', + 'SHA512_ASM', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_linux64-s390x': [ 'NDEBUG', 'OPENSSL_USE_NODELETE', 'B_ENDIAN', @@ -1149,7 +1179,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux64-s390x': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], }, 'include_dirs': [ @@ -1165,6 +1195,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux64-s390x)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_linux64-s390x)'], + 'defines': ['<@(openssl_defines_exported_linux64-s390x)'], }, } 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 56adf229251f92..89288b91764201 100644 --- a/deps/openssl/config/archs/linux64-s390x/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux64-s390x/no-asm/configdata.pm @@ -115,6 +115,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -191,9 +192,7 @@ our %config = ( "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -224,9 +223,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -235,17 +232,22 @@ our %config = ( ], "openssl_sys_defines" => [], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-asm no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "no-asm", "linux64-s390x" ], @@ -328,7 +330,10 @@ our %target = ( "cppflags" => "", "cxxflags" => "-std=c++11 -pthread -m64", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_ldflags" => "-Wl,-z,defs", @@ -336,8 +341,12 @@ our %target = ( "enable" => [ "afalgeng" ], - "ex_libs" => "-ldl -pthread", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd -ldl -pthread", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "", "lib_cflags" => "", "lib_cppflags" => "-DOPENSSL_USE_NODELETE -DB_ENDIAN", @@ -517,10 +526,8 @@ our %disabled = ( "afalgeng" => "option", "asan" => "default", "asm" => "option", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -553,12 +560,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1046,6 +1055,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1313,6 +1325,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8314,6 +8329,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10070,6 +10089,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12015,6 +12048,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12076,6 +12110,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21220,6 +21255,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21805,6 +21844,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23533,6 +23576,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23622,6 +23666,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -24866,6 +24911,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -27790,6 +27850,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30303,6 +30368,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -30848,6 +30919,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31273,6 +31351,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32499,18 +32580,9 @@ my %disabled_info = ( "asm" => { "macro" => "OPENSSL_NO_ASM" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32607,15 +32679,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 8727d3480a87fb..77947a02d6397a 100644 --- a/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux64-s390x" -#define DATE "built on: Tue Jan 27 17:35:43 2026 UTC" +#define DATE "built on: Wed Mar 11 15:45:40 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -26,5 +26,10 @@ static const char compiler_flags[] = { 'T','E',' ','-','D','B','_','E','N','D','I','A','N',' ','-','D', 'O','P','E','N','S','S','L','_','P','I','C',' ','-','D','O','P', 'E','N','S','S','L','_','B','U','I','L','D','I','N','G','_','O', - 'P','E','N','S','S','L',' ','-','D','N','D','E','B','U','G','\0' + 'P','E','N','S','S','L',' ','-','D','B','R','O','T','L','I',' ', + '-','D','Z','L','I','B',' ','-','D','Z','S','T','D',' ','-','D', + 'N','D','E','B','U','G',' ','-','I','.','.','/','.','.','/','b', + 'r','o','t','l','i','/','c','/','i','n','c','l','u','d','e',' ', + '-','I','.','.','/','.','.','/','z','l','i','b',' ','-','I','.', + '.','/','.','.','/','z','s','t','d','/','l','i','b','\0' }; diff --git a/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/configuration.h b/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/configuration.h index bc3a1462b437c8..811849a7a0152b 100644 --- a/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/configuration.h +++ b/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/configuration.h @@ -44,15 +44,9 @@ extern "C" { # ifndef OPENSSL_NO_ASM # define OPENSSL_NO_ASM # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -143,15 +137,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/linux64-s390x/no-asm/openssl-cl.gypi b/deps/openssl/config/archs/linux64-s390x/no-asm/openssl-cl.gypi index 81a0dad0cca7e2..2e1f0612ae35e7 100644 --- a/deps/openssl/config/archs/linux64-s390x/no-asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/linux64-s390x/no-asm/openssl-cl.gypi @@ -5,6 +5,9 @@ 'OPENSSL_USE_NODELETE', 'B_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'OPENSSL_PIC', ], 'openssl_cflags_linux64-s390x': [ @@ -13,7 +16,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux64-s390x': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], 'openssl_cli_srcs_linux64-s390x': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/linux64-s390x/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/linux64-s390x/no-asm/openssl-fips.gypi index 45f0e93de0e37f..d0408d633a069c 100644 --- a/deps/openssl/config/archs/linux64-s390x/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux64-s390x/no-asm/openssl-fips.gypi @@ -334,6 +334,9 @@ 'OPENSSL_USE_NODELETE', 'B_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'FIPS_MODULE', 'FIPS_MODULE', ], @@ -343,7 +346,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux64-s390x': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux64-s390x/no-asm/providers/fips.ld' }, diff --git a/deps/openssl/config/archs/linux64-s390x/no-asm/openssl.gypi b/deps/openssl/config/archs/linux64-s390x/no-asm/openssl.gypi index 197a6e2f05fed1..71b3a7f432f9ec 100644 --- a/deps/openssl/config/archs/linux64-s390x/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux64-s390x/no-asm/openssl.gypi @@ -286,6 +286,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1112,6 +1117,16 @@ './config/archs/linux64-s390x/no-asm/providers/fips.ld', ], 'openssl_defines_linux64-s390x': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'B_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_linux64-s390x': [ 'NDEBUG', 'OPENSSL_USE_NODELETE', 'B_ENDIAN', @@ -1124,7 +1139,7 @@ '-Wall -O3', ], 'openssl_ex_libs_linux64-s390x': [ - '-ldl -pthread', + '-lm -ldl -pthread', ], }, 'include_dirs': [ @@ -1140,6 +1155,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux64-s390x)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_linux64-s390x)'], + 'defines': ['<@(openssl_defines_exported_linux64-s390x)'], }, } 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 cd0615821bb151..9679e70d62658b 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/configdata.pm +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/configdata.pm @@ -112,6 +112,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -189,9 +190,7 @@ our %config = ( "OPENSSL_THREADS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -222,9 +221,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -233,17 +230,22 @@ our %config = ( ], "openssl_sys_defines" => [], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "solaris-x86-gcc" ], "perlenv" => { @@ -322,14 +324,21 @@ our %target = ( "cflags" => "", "cppflags" => "", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_ldflags" => "-Wl,-z,defs", "dso_scheme" => "dlfcn", "enable" => [], - "ex_libs" => "-lsocket -lnsl -ldl", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd -lsocket -lnsl -ldl", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "", "lib_cflags" => "", "lib_cppflags" => "-DFILIO_H -DL_ENDIAN", @@ -507,10 +516,8 @@ our @disablables_int = ( our %disabled = ( "afalgeng" => "option", "asan" => "default", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -543,12 +550,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1036,6 +1045,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1303,6 +1315,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8363,6 +8378,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10125,6 +10144,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12086,6 +12119,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12147,6 +12181,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21294,6 +21329,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21879,6 +21918,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23607,6 +23650,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23696,6 +23740,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -24958,6 +25003,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -27932,6 +27992,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30465,6 +30530,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -31010,6 +31081,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31435,6 +31513,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32658,18 +32739,9 @@ my %disabled_info = ( "asan" => { "macro" => "OPENSSL_NO_ASAN" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32766,15 +32838,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 7e76ec6fb8f79c..97c6cb07d1120a 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: solaris-x86-gcc" -#define DATE "built on: Tue Jan 27 17:36:47 2026 UTC" +#define DATE "built on: Wed Mar 11 15:46:25 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -27,5 +27,10 @@ static const char compiler_flags[] = { 'D','L','_','E','N','D','I','A','N',' ','-','D','O','P','E','N', 'S','S','L','_','P','I','C',' ','-','D','O','P','E','N','S','S', 'L','_','B','U','I','L','D','I','N','G','_','O','P','E','N','S', - 'S','L',' ','-','D','N','D','E','B','U','G','\0' + 'S','L',' ','-','D','B','R','O','T','L','I',' ','-','D','Z','L', + 'I','B',' ','-','D','Z','S','T','D',' ','-','D','N','D','E','B', + 'U','G',' ','-','I','.','.','/','.','.','/','b','r','o','t','l', + 'i','/','c','/','i','n','c','l','u','d','e',' ','-','I','.','.', + '/','.','.','/','z','l','i','b',' ','-','I','.','.','/','.','.', + '/','z','s','t','d','/','l','i','b','\0' }; diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/configuration.h b/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/configuration.h index 17d10a6e748caf..d00dd12e9c1ac9 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/configuration.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/configuration.h @@ -41,15 +41,9 @@ extern "C" { # ifndef OPENSSL_NO_ASAN # define OPENSSL_NO_ASAN # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -140,15 +134,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl-cl.gypi b/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl-cl.gypi index 59f6ddbc3cd067..1d7df976ce923c 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl-cl.gypi @@ -5,6 +5,9 @@ 'FILIO_H', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'CMLL_ASM', 'DES_ASM', @@ -34,7 +37,7 @@ '-Wall -O3 -fomit-frame-pointer', ], 'openssl_ex_libs_solaris-x86-gcc': [ - '-lsocket -lnsl -ldl', + '-lm -lsocket -lnsl -ldl', ], 'openssl_cli_srcs_solaris-x86-gcc': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl-fips.gypi b/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl-fips.gypi index 7d96cf10f74f26..d9e89248fb22e9 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl-fips.gypi @@ -353,6 +353,9 @@ 'FILIO_H', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'DES_ASM', 'ECP_NISTZ256_ASM', @@ -376,7 +379,7 @@ '-Wall -O3 -fomit-frame-pointer', ], 'openssl_ex_libs_solaris-x86-gcc': [ - '-lsocket -lnsl -ldl', + '-lm -lsocket -lnsl -ldl', ], 'linker_script': '' }, diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl.gypi b/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl.gypi index 084f586a5521ff..6ed0503dd90c2e 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl.gypi +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl.gypi @@ -278,6 +278,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1123,6 +1128,36 @@ './config/archs/solaris-x86-gcc/asm/providers/fips.ld', ], 'openssl_defines_solaris-x86-gcc': [ + 'NDEBUG', + 'FILIO_H', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'AES_ASM', + 'CMLL_ASM', + 'DES_ASM', + 'ECP_NISTZ256_ASM', + 'GHASH_ASM', + 'MD5_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_BN_ASM_PART_WORDS', + 'OPENSSL_CPUID_OBJ', + 'OPENSSL_IA32_SSE2', + 'PADLOCK_ASM', + 'POLY1305_ASM', + 'RC4_ASM', + 'RMD160_ASM', + 'SHA1_ASM', + 'SHA256_ASM', + 'SHA512_ASM', + 'VPAES_ASM', + 'WHIRLPOOL_ASM', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_solaris-x86-gcc': [ 'NDEBUG', 'FILIO_H', 'L_ENDIAN', @@ -1156,7 +1191,7 @@ '-Wall -O3 -fomit-frame-pointer', ], 'openssl_ex_libs_solaris-x86-gcc': [ - '-lsocket -lnsl -ldl', + '-lm -lsocket -lnsl -ldl', ], }, 'include_dirs': [ @@ -1172,6 +1207,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_solaris-x86-gcc)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_solaris-x86-gcc)'], + 'defines': ['<@(openssl_defines_exported_solaris-x86-gcc)'], }, } 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 97deb65cb60908..8c023eaeee4ab7 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 @@ -112,6 +112,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -189,9 +190,7 @@ our %config = ( "OPENSSL_THREADS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -222,9 +221,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -233,17 +230,22 @@ our %config = ( ], "openssl_sys_defines" => [], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "solaris-x86-gcc" ], "perlenv" => { @@ -322,14 +324,21 @@ our %target = ( "cflags" => "", "cppflags" => "", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_ldflags" => "-Wl,-z,defs", "dso_scheme" => "dlfcn", "enable" => [], - "ex_libs" => "-lsocket -lnsl -ldl", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd -lsocket -lnsl -ldl", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "", "lib_cflags" => "", "lib_cppflags" => "-DFILIO_H -DL_ENDIAN", @@ -507,10 +516,8 @@ our @disablables_int = ( our %disabled = ( "afalgeng" => "option", "asan" => "default", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -543,12 +550,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1036,6 +1045,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1303,6 +1315,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8363,6 +8378,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10125,6 +10144,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12086,6 +12119,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12147,6 +12181,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21294,6 +21329,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21879,6 +21918,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23607,6 +23650,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23696,6 +23740,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -24958,6 +25003,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -27932,6 +27992,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30465,6 +30530,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -31010,6 +31081,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31435,6 +31513,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32658,18 +32739,9 @@ my %disabled_info = ( "asan" => { "macro" => "OPENSSL_NO_ASAN" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32766,15 +32838,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 230afaed4114ad..c01b0d1140214e 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: solaris-x86-gcc" -#define DATE "built on: Tue Jan 27 17:37:04 2026 UTC" +#define DATE "built on: Wed Mar 11 15:46:38 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -28,5 +28,10 @@ static const char compiler_flags[] = { ' ','-','D','L','_','E','N','D','I','A','N',' ','-','D','O','P', 'E','N','S','S','L','_','P','I','C',' ','-','D','O','P','E','N', 'S','S','L','_','B','U','I','L','D','I','N','G','_','O','P','E', - 'N','S','S','L',' ','-','D','N','D','E','B','U','G','\0' + 'N','S','S','L',' ','-','D','B','R','O','T','L','I',' ','-','D', + 'Z','L','I','B',' ','-','D','Z','S','T','D',' ','-','D','N','D', + 'E','B','U','G',' ','-','I','.','.','/','.','.','/','b','r','o', + 't','l','i','/','c','/','i','n','c','l','u','d','e',' ','-','I', + '.','.','/','.','.','/','z','l','i','b',' ','-','I','.','.','/', + '.','.','/','z','s','t','d','/','l','i','b','\0' }; diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/configuration.h b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/configuration.h index 17d10a6e748caf..d00dd12e9c1ac9 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/configuration.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/configuration.h @@ -41,15 +41,9 @@ extern "C" { # ifndef OPENSSL_NO_ASAN # define OPENSSL_NO_ASAN # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -140,15 +134,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl-cl.gypi index db858b8bea4e08..6341faebec561f 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl-cl.gypi +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl-cl.gypi @@ -5,6 +5,9 @@ 'FILIO_H', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'CMLL_ASM', 'DES_ASM', @@ -34,7 +37,7 @@ '-Wall -O3 -fomit-frame-pointer', ], 'openssl_ex_libs_solaris-x86-gcc': [ - '-lsocket -lnsl -ldl', + '-lm -lsocket -lnsl -ldl', ], 'openssl_cli_srcs_solaris-x86-gcc': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl-fips.gypi index b0bbd7fdf3ff5e..2ae5e76d7907d0 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl-fips.gypi @@ -353,6 +353,9 @@ 'FILIO_H', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'DES_ASM', 'ECP_NISTZ256_ASM', @@ -376,7 +379,7 @@ '-Wall -O3 -fomit-frame-pointer', ], 'openssl_ex_libs_solaris-x86-gcc': [ - '-lsocket -lnsl -ldl', + '-lm -lsocket -lnsl -ldl', ], 'linker_script': '' }, diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl.gypi b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl.gypi index 6c9782005044c4..40bcfc529bfad2 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl.gypi @@ -278,6 +278,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1123,6 +1128,36 @@ './config/archs/solaris-x86-gcc/asm_avx2/providers/fips.ld', ], 'openssl_defines_solaris-x86-gcc': [ + 'NDEBUG', + 'FILIO_H', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'AES_ASM', + 'CMLL_ASM', + 'DES_ASM', + 'ECP_NISTZ256_ASM', + 'GHASH_ASM', + 'MD5_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_BN_ASM_PART_WORDS', + 'OPENSSL_CPUID_OBJ', + 'OPENSSL_IA32_SSE2', + 'PADLOCK_ASM', + 'POLY1305_ASM', + 'RC4_ASM', + 'RMD160_ASM', + 'SHA1_ASM', + 'SHA256_ASM', + 'SHA512_ASM', + 'VPAES_ASM', + 'WHIRLPOOL_ASM', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_solaris-x86-gcc': [ 'NDEBUG', 'FILIO_H', 'L_ENDIAN', @@ -1156,7 +1191,7 @@ '-Wall -O3 -fomit-frame-pointer', ], 'openssl_ex_libs_solaris-x86-gcc': [ - '-lsocket -lnsl -ldl', + '-lm -lsocket -lnsl -ldl', ], }, 'include_dirs': [ @@ -1172,6 +1207,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_solaris-x86-gcc)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_solaris-x86-gcc)'], + 'defines': ['<@(openssl_defines_exported_solaris-x86-gcc)'], }, } 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 3c2ed0242488d2..9c500354135cc7 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 @@ -112,6 +112,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -188,9 +189,7 @@ our %config = ( "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -221,9 +220,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -232,17 +229,22 @@ our %config = ( ], "openssl_sys_defines" => [], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-asm no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "no-asm", "solaris-x86-gcc" ], @@ -322,14 +324,21 @@ our %target = ( "cflags" => "", "cppflags" => "", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_ldflags" => "-Wl,-z,defs", "dso_scheme" => "dlfcn", "enable" => [], - "ex_libs" => "-lsocket -lnsl -ldl", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd -lsocket -lnsl -ldl", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "", "lib_cflags" => "", "lib_cppflags" => "-DFILIO_H -DL_ENDIAN", @@ -508,10 +517,8 @@ our %disabled = ( "afalgeng" => "option", "asan" => "default", "asm" => "option", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -544,12 +551,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1037,6 +1046,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1304,6 +1316,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8305,6 +8320,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10061,6 +10080,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12006,6 +12039,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12067,6 +12101,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21211,6 +21246,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21796,6 +21835,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23524,6 +23567,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23613,6 +23657,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -24857,6 +24902,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -27781,6 +27841,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30294,6 +30359,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -30839,6 +30910,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31264,6 +31342,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32490,18 +32571,9 @@ my %disabled_info = ( "asm" => { "macro" => "OPENSSL_NO_ASM" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32598,15 +32670,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 ecac83bd33e217..78bfbb8c32ab62 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: solaris-x86-gcc" -#define DATE "built on: Tue Jan 27 17:37:21 2026 UTC" +#define DATE "built on: Wed Mar 11 15:46:51 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -26,5 +26,10 @@ static const char compiler_flags[] = { 'L','_','E','N','D','I','A','N',' ','-','D','O','P','E','N','S', 'S','L','_','P','I','C',' ','-','D','O','P','E','N','S','S','L', '_','B','U','I','L','D','I','N','G','_','O','P','E','N','S','S', - 'L',' ','-','D','N','D','E','B','U','G','\0' + 'L',' ','-','D','B','R','O','T','L','I',' ','-','D','Z','L','I', + 'B',' ','-','D','Z','S','T','D',' ','-','D','N','D','E','B','U', + 'G',' ','-','I','.','.','/','.','.','/','b','r','o','t','l','i', + '/','c','/','i','n','c','l','u','d','e',' ','-','I','.','.','/', + '.','.','/','z','l','i','b',' ','-','I','.','.','/','.','.','/', + 'z','s','t','d','/','l','i','b','\0' }; diff --git a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/configuration.h b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/configuration.h index 434d536f1b42c6..9f969024d9b634 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/configuration.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/configuration.h @@ -44,15 +44,9 @@ extern "C" { # ifndef OPENSSL_NO_ASM # define OPENSSL_NO_ASM # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -143,15 +137,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/openssl-cl.gypi b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/openssl-cl.gypi index 1826d1bf89b1e4..45c7da01c4c404 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/openssl-cl.gypi @@ -5,6 +5,9 @@ 'FILIO_H', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'OPENSSL_PIC', ], 'openssl_cflags_solaris-x86-gcc': [ @@ -13,7 +16,7 @@ '-Wall -O3 -fomit-frame-pointer', ], 'openssl_ex_libs_solaris-x86-gcc': [ - '-lsocket -lnsl -ldl', + '-lm -lsocket -lnsl -ldl', ], 'openssl_cli_srcs_solaris-x86-gcc': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/openssl-fips.gypi index 8aaf67650f33d7..e0be98276a8e43 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/openssl-fips.gypi @@ -334,6 +334,9 @@ 'FILIO_H', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'FIPS_MODULE', 'FIPS_MODULE', ], @@ -343,7 +346,7 @@ '-Wall -O3 -fomit-frame-pointer', ], 'openssl_ex_libs_solaris-x86-gcc': [ - '-lsocket -lnsl -ldl', + '-lm -lsocket -lnsl -ldl', ], 'linker_script': '' }, diff --git a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/openssl.gypi b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/openssl.gypi index bf64c72642d0dd..a96a6fd8bf62b2 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/openssl.gypi @@ -286,6 +286,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1111,6 +1116,16 @@ './config/archs/solaris-x86-gcc/no-asm/providers/fips.ld', ], 'openssl_defines_solaris-x86-gcc': [ + 'NDEBUG', + 'FILIO_H', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_solaris-x86-gcc': [ 'NDEBUG', 'FILIO_H', 'L_ENDIAN', @@ -1123,7 +1138,7 @@ '-Wall -O3 -fomit-frame-pointer', ], 'openssl_ex_libs_solaris-x86-gcc': [ - '-lsocket -lnsl -ldl', + '-lm -lsocket -lnsl -ldl', ], }, 'include_dirs': [ @@ -1139,6 +1154,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_solaris-x86-gcc)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_solaris-x86-gcc)'], + 'defines': ['<@(openssl_defines_exported_solaris-x86-gcc)'], }, } 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 4fc49bc1b055c2..8ab26b582cfec3 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 @@ -112,6 +112,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -189,9 +190,7 @@ our %config = ( "OPENSSL_THREADS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -222,9 +221,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -233,17 +230,22 @@ our %config = ( ], "openssl_sys_defines" => [], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "solaris64-x86_64-gcc" ], "perlenv" => { @@ -322,14 +324,21 @@ our %target = ( "cflags" => "-m64", "cppflags" => "", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_ldflags" => "-Wl,-z,defs", "dso_scheme" => "dlfcn", "enable" => [], - "ex_libs" => "-lsocket -lnsl -ldl", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd -lsocket -lnsl -ldl", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "", "lib_cflags" => "", "lib_cppflags" => "-DFILIO_H -DL_ENDIAN", @@ -508,10 +517,8 @@ our @disablables_int = ( our %disabled = ( "afalgeng" => "option", "asan" => "default", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -544,12 +551,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1037,6 +1046,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1304,6 +1316,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8370,6 +8385,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10173,6 +10192,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12143,6 +12176,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12204,6 +12238,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21351,6 +21386,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21936,6 +21975,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23664,6 +23707,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23753,6 +23797,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -25108,6 +25153,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -28125,6 +28185,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30682,6 +30747,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -31227,6 +31298,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31652,6 +31730,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32875,18 +32956,9 @@ my %disabled_info = ( "asan" => { "macro" => "OPENSSL_NO_ASAN" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32983,15 +33055,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 d9ade2f1ea032e..a5110b7e241218 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: solaris64-x86_64-gcc" -#define DATE "built on: Tue Jan 27 17:37:37 2026 UTC" +#define DATE "built on: Wed Mar 11 15:47:02 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -26,5 +26,10 @@ static const char compiler_flags[] = { 'D','L','_','E','N','D','I','A','N',' ','-','D','O','P','E','N', 'S','S','L','_','P','I','C',' ','-','D','O','P','E','N','S','S', 'L','_','B','U','I','L','D','I','N','G','_','O','P','E','N','S', - 'S','L',' ','-','D','N','D','E','B','U','G','\0' + 'S','L',' ','-','D','B','R','O','T','L','I',' ','-','D','Z','L', + 'I','B',' ','-','D','Z','S','T','D',' ','-','D','N','D','E','B', + 'U','G',' ','-','I','.','.','/','.','.','/','b','r','o','t','l', + 'i','/','c','/','i','n','c','l','u','d','e',' ','-','I','.','.', + '/','.','.','/','z','l','i','b',' ','-','I','.','.','/','.','.', + '/','z','s','t','d','/','l','i','b','\0' }; diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/configuration.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/configuration.h index 83c3b5466f0f4b..6a85ffac547cd5 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/configuration.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/configuration.h @@ -41,15 +41,9 @@ extern "C" { # ifndef OPENSSL_NO_ASAN # define OPENSSL_NO_ASAN # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -140,15 +134,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl-cl.gypi b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl-cl.gypi index f049f2c6df2aa2..d06e2a122a7f52 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl-cl.gypi @@ -5,6 +5,9 @@ 'FILIO_H', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'BSAES_ASM', 'CMLL_ASM', @@ -35,7 +38,7 @@ '-Wall -O3', ], 'openssl_ex_libs_solaris64-x86_64-gcc': [ - '-lsocket -lnsl -ldl', + '-lm -lsocket -lnsl -ldl', ], 'openssl_cli_srcs_solaris64-x86_64-gcc': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl-fips.gypi b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl-fips.gypi index b509b4a64c9636..a81d8825aa1368 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl-fips.gypi @@ -372,6 +372,9 @@ 'FILIO_H', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'BSAES_ASM', 'ECP_NISTZ256_ASM', @@ -397,7 +400,7 @@ '-Wall -O3', ], 'openssl_ex_libs_solaris64-x86_64-gcc': [ - '-lsocket -lnsl -ldl', + '-lm -lsocket -lnsl -ldl', ], 'linker_script': '' }, diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl.gypi b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl.gypi index 64612aba839b9f..baaa70398a5680 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl.gypi +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl.gypi @@ -283,6 +283,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1143,6 +1148,37 @@ './config/archs/solaris64-x86_64-gcc/asm/providers/fips.ld', ], 'openssl_defines_solaris64-x86_64-gcc': [ + 'NDEBUG', + 'FILIO_H', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'AES_ASM', + 'BSAES_ASM', + 'CMLL_ASM', + 'ECP_NISTZ256_ASM', + 'GHASH_ASM', + 'KECCAK1600_ASM', + 'MD5_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_BN_ASM_MONT5', + 'OPENSSL_CPUID_OBJ', + 'OPENSSL_IA32_SSE2', + 'PADLOCK_ASM', + 'POLY1305_ASM', + 'RC4_ASM', + 'SHA1_ASM', + 'SHA256_ASM', + 'SHA512_ASM', + 'VPAES_ASM', + 'WHIRLPOOL_ASM', + 'X25519_ASM', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_solaris64-x86_64-gcc': [ 'NDEBUG', 'FILIO_H', 'L_ENDIAN', @@ -1177,7 +1213,7 @@ '-Wall -O3', ], 'openssl_ex_libs_solaris64-x86_64-gcc': [ - '-lsocket -lnsl -ldl', + '-lm -lsocket -lnsl -ldl', ], }, 'include_dirs': [ @@ -1193,6 +1229,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_solaris64-x86_64-gcc)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_solaris64-x86_64-gcc)'], + 'defines': ['<@(openssl_defines_exported_solaris64-x86_64-gcc)'], }, } 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 2e968665976899..d9ef76db0d962f 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 @@ -112,6 +112,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -189,9 +190,7 @@ our %config = ( "OPENSSL_THREADS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -222,9 +221,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -233,17 +230,22 @@ our %config = ( ], "openssl_sys_defines" => [], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "solaris64-x86_64-gcc" ], "perlenv" => { @@ -322,14 +324,21 @@ our %target = ( "cflags" => "-m64", "cppflags" => "", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_ldflags" => "-Wl,-z,defs", "dso_scheme" => "dlfcn", "enable" => [], - "ex_libs" => "-lsocket -lnsl -ldl", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd -lsocket -lnsl -ldl", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "", "lib_cflags" => "", "lib_cppflags" => "-DFILIO_H -DL_ENDIAN", @@ -508,10 +517,8 @@ our @disablables_int = ( our %disabled = ( "afalgeng" => "option", "asan" => "default", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -544,12 +551,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1037,6 +1046,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1304,6 +1316,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8370,6 +8385,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10173,6 +10192,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12143,6 +12176,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12204,6 +12238,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21351,6 +21386,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21936,6 +21975,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23664,6 +23707,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23753,6 +23797,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -25108,6 +25153,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -28125,6 +28185,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30682,6 +30747,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -31227,6 +31298,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31652,6 +31730,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32875,18 +32956,9 @@ my %disabled_info = ( "asan" => { "macro" => "OPENSSL_NO_ASAN" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32983,15 +33055,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 9ad5a2b7fbd5fc..f0063db0ca600e 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: solaris64-x86_64-gcc" -#define DATE "built on: Tue Jan 27 17:38:01 2026 UTC" +#define DATE "built on: Wed Mar 11 15:47:20 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -27,5 +27,10 @@ static const char compiler_flags[] = { ' ','-','D','L','_','E','N','D','I','A','N',' ','-','D','O','P', 'E','N','S','S','L','_','P','I','C',' ','-','D','O','P','E','N', 'S','S','L','_','B','U','I','L','D','I','N','G','_','O','P','E', - 'N','S','S','L',' ','-','D','N','D','E','B','U','G','\0' + 'N','S','S','L',' ','-','D','B','R','O','T','L','I',' ','-','D', + 'Z','L','I','B',' ','-','D','Z','S','T','D',' ','-','D','N','D', + 'E','B','U','G',' ','-','I','.','.','/','.','.','/','b','r','o', + 't','l','i','/','c','/','i','n','c','l','u','d','e',' ','-','I', + '.','.','/','.','.','/','z','l','i','b',' ','-','I','.','.','/', + '.','.','/','z','s','t','d','/','l','i','b','\0' }; diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/configuration.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/configuration.h index 83c3b5466f0f4b..6a85ffac547cd5 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/configuration.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/configuration.h @@ -41,15 +41,9 @@ extern "C" { # ifndef OPENSSL_NO_ASAN # define OPENSSL_NO_ASAN # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -140,15 +134,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl-cl.gypi index 040ac83b3a2c1e..56f45af4b7ce8a 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl-cl.gypi +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl-cl.gypi @@ -5,6 +5,9 @@ 'FILIO_H', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'BSAES_ASM', 'CMLL_ASM', @@ -35,7 +38,7 @@ '-Wall -O3', ], 'openssl_ex_libs_solaris64-x86_64-gcc': [ - '-lsocket -lnsl -ldl', + '-lm -lsocket -lnsl -ldl', ], 'openssl_cli_srcs_solaris64-x86_64-gcc': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl-fips.gypi index 7579e53ec87f38..4900d7ebc9b838 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl-fips.gypi @@ -372,6 +372,9 @@ 'FILIO_H', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'AES_ASM', 'BSAES_ASM', 'ECP_NISTZ256_ASM', @@ -397,7 +400,7 @@ '-Wall -O3', ], 'openssl_ex_libs_solaris64-x86_64-gcc': [ - '-lsocket -lnsl -ldl', + '-lm -lsocket -lnsl -ldl', ], 'linker_script': '' }, diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl.gypi b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl.gypi index ea7514ca34dfa6..9410434d5f1b48 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl.gypi @@ -283,6 +283,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1143,6 +1148,37 @@ './config/archs/solaris64-x86_64-gcc/asm_avx2/providers/fips.ld', ], 'openssl_defines_solaris64-x86_64-gcc': [ + 'NDEBUG', + 'FILIO_H', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'AES_ASM', + 'BSAES_ASM', + 'CMLL_ASM', + 'ECP_NISTZ256_ASM', + 'GHASH_ASM', + 'KECCAK1600_ASM', + 'MD5_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_BN_ASM_MONT5', + 'OPENSSL_CPUID_OBJ', + 'OPENSSL_IA32_SSE2', + 'PADLOCK_ASM', + 'POLY1305_ASM', + 'RC4_ASM', + 'SHA1_ASM', + 'SHA256_ASM', + 'SHA512_ASM', + 'VPAES_ASM', + 'WHIRLPOOL_ASM', + 'X25519_ASM', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_solaris64-x86_64-gcc': [ 'NDEBUG', 'FILIO_H', 'L_ENDIAN', @@ -1177,7 +1213,7 @@ '-Wall -O3', ], 'openssl_ex_libs_solaris64-x86_64-gcc': [ - '-lsocket -lnsl -ldl', + '-lm -lsocket -lnsl -ldl', ], }, 'include_dirs': [ @@ -1193,6 +1229,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_solaris64-x86_64-gcc)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_solaris64-x86_64-gcc)'], + 'defines': ['<@(openssl_defines_exported_solaris64-x86_64-gcc)'], }, } 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 5e38b637ee7d60..d0452b8f1cda07 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 @@ -112,6 +112,7 @@ our %config = ( "crypto/dso/build.info", "crypto/engine/build.info", "crypto/err/build.info", + "crypto/comp/build.info", "crypto/http/build.info", "crypto/ocsp/build.info", "crypto/cms/build.info", @@ -188,9 +189,7 @@ our %config = ( "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", - "OPENSSL_NO_BROTLI", "OPENSSL_NO_BROTLI_DYNAMIC", - "OPENSSL_NO_COMP", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEMOS", @@ -221,9 +220,7 @@ our %config = ( "OPENSSL_NO_UPLINK", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_WINSTORE", - "OPENSSL_NO_ZLIB", "OPENSSL_NO_ZLIB_DYNAMIC", - "OPENSSL_NO_ZSTD", "OPENSSL_NO_ZSTD_DYNAMIC", "OPENSSL_NO_DYNAMIC_ENGINE" ], @@ -232,17 +229,22 @@ our %config = ( ], "openssl_sys_defines" => [], "openssldir" => "", - "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-brotli no-brotli-dynamic no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", + "options" => "enable-ssl-trace enable-fips enable-zlib --with-zlib-include=../../zlib enable-brotli --with-brotli-include=../../brotli/c/include enable-zstd --with-zstd-include=../../zstd/lib no-afalgeng no-asan no-asm no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fips-jitter no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-jitter no-ktls no-loadereng no-md2 no-msan no-pie no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib-dynamic no-zstd-dynamic", "patch" => "5", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", "perl_version" => "5.34.0", "perlargv" => [ - "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "enable-fips", + "zlib", + "--with-zlib-include=../../zlib", + "enable-brotli", + "--with-brotli-include=../../brotli/c/include", + "enable-zstd", + "--with-zstd-include=../../zstd/lib", "no-asm", "solaris64-x86_64-gcc" ], @@ -322,14 +324,21 @@ our %target = ( "cflags" => "-m64", "cppflags" => "", "defines" => [ - "OPENSSL_BUILDING_OPENSSL" + "OPENSSL_BUILDING_OPENSSL", + "BROTLI", + "ZLIB", + "ZSTD" ], "disable" => [], "dso_ldflags" => "-Wl,-z,defs", "dso_scheme" => "dlfcn", "enable" => [], - "ex_libs" => "-lsocket -lnsl -ldl", - "includes" => [], + "ex_libs" => "-lz -lbrotlienc -lbrotlidec -lbrotlicommon -lm -lzstd -lsocket -lnsl -ldl", + "includes" => [ + "../../brotli/c/include", + "../../zlib", + "../../zstd/lib" + ], "lflags" => "", "lib_cflags" => "", "lib_cppflags" => "-DFILIO_H -DL_ENDIAN", @@ -509,10 +518,8 @@ our %disabled = ( "afalgeng" => "option", "asan" => "default", "asm" => "option", - "brotli" => "default", "brotli-dynamic" => "default", "buildtest-c++" => "default", - "comp" => "option", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", "demos" => "default", @@ -545,12 +552,14 @@ our %disabled = ( "uplink" => "no uplink_arch", "weak-ssl-ciphers" => "default", "winstore" => "not-windows", - "zlib" => "default", "zlib-dynamic" => "default", - "zstd" => "default", "zstd-dynamic" => "default" ); -our %withargs = (); +our %withargs = ( + "brotli_include" => "../../brotli/c/include", + "zlib_include" => "../../zlib", + "zstd_include" => "../../zstd/lib" +); our %unified_info = ( "attributes" => { "depends" => { @@ -1038,6 +1047,9 @@ our %unified_info = ( "test/bio_callback_test" => { "noinst" => "1" }, + "test/bio_comp_test" => { + "noinst" => "1" + }, "test/bio_core_test" => { "noinst" => "1" }, @@ -1305,6 +1317,9 @@ our %unified_info = ( "test/casttest" => { "noinst" => "1" }, + "test/cert_comp_test" => { + "noinst" => "1" + }, "test/chacha_internal_test" => { "noinst" => "1" }, @@ -8306,6 +8321,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_comp_test" => [ + "libcrypto.a", + "test/libtestutil.a" + ], "test/bio_core_test" => [ "libcrypto", "test/libtestutil.a" @@ -10062,6 +10081,20 @@ our %unified_info = ( ] } }, + "crypto/comp" => { + "deps" => [ + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o" + ], + "products" => { + "lib" => [ + "libcrypto" + ] + } + }, "crypto/conf" => { "deps" => [ "crypto/conf/libcrypto-lib-conf_api.o", @@ -12007,6 +12040,7 @@ our %unified_info = ( "test/helpers" => { "deps" => [ "test/helpers/asynciotest-bin-ssltestlib.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o", "test/helpers/cmp_asn_test-bin-cmp_testlib.o", "test/helpers/cmp_client_test-bin-cmp_testlib.o", "test/helpers/cmp_ctx_test-bin-cmp_testlib.o", @@ -12068,6 +12102,7 @@ our %unified_info = ( "products" => { "bin" => [ "test/asynciotest", + "test/cert_comp_test", "test/cmp_asn_test", "test/cmp_client_test", "test/cmp_ctx_test", @@ -21212,6 +21247,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_comp_test" => [ + "include", + "apps/include" + ], "test/bio_core_test" => [ "include", "apps/include" @@ -21797,6 +21836,10 @@ our %unified_info = ( ".", "include" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + ".", + "include" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ ".", "include", @@ -23525,6 +23568,7 @@ our %unified_info = ( "test/bio_addr_test", "test/bio_base64_test", "test/bio_callback_test", + "test/bio_comp_test", "test/bio_core_test", "test/bio_dgram_test", "test/bio_enc_test", @@ -23614,6 +23658,7 @@ our %unified_info = ( "test/byteorder_test", "test/ca_internals_test", "test/casttest", + "test/cert_comp_test", "test/chacha_internal_test", "test/cipher_overhead_test", "test/cipherbytes_test", @@ -24858,6 +24903,21 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_smime.o" => [ "crypto/cms/cms_smime.c" ], + "crypto/comp/libcrypto-lib-c_brotli.o" => [ + "crypto/comp/c_brotli.c" + ], + "crypto/comp/libcrypto-lib-c_zlib.o" => [ + "crypto/comp/c_zlib.c" + ], + "crypto/comp/libcrypto-lib-c_zstd.o" => [ + "crypto/comp/c_zstd.c" + ], + "crypto/comp/libcrypto-lib-comp_err.o" => [ + "crypto/comp/comp_err.c" + ], + "crypto/comp/libcrypto-lib-comp_lib.o" => [ + "crypto/comp/comp_lib.c" + ], "crypto/conf/libcrypto-lib-conf_api.o" => [ "crypto/conf/conf_api.c" ], @@ -27782,6 +27842,11 @@ our %unified_info = ( "crypto/cms/libcrypto-lib-cms_rsa.o", "crypto/cms/libcrypto-lib-cms_sd.o", "crypto/cms/libcrypto-lib-cms_smime.o", + "crypto/comp/libcrypto-lib-c_brotli.o", + "crypto/comp/libcrypto-lib-c_zlib.o", + "crypto/comp/libcrypto-lib-c_zstd.o", + "crypto/comp/libcrypto-lib-comp_err.o", + "crypto/comp/libcrypto-lib-comp_lib.o", "crypto/conf/libcrypto-lib-conf_api.o", "crypto/conf/libcrypto-lib-conf_def.o", "crypto/conf/libcrypto-lib-conf_err.o", @@ -30295,6 +30360,12 @@ our %unified_info = ( "test/bio_callback_test-bin-bio_callback_test.o" => [ "test/bio_callback_test.c" ], + "test/bio_comp_test" => [ + "test/bio_comp_test-bin-bio_comp_test.o" + ], + "test/bio_comp_test-bin-bio_comp_test.o" => [ + "test/bio_comp_test.c" + ], "test/bio_core_test" => [ "test/bio_core_test-bin-bio_core_test.o" ], @@ -30840,6 +30911,13 @@ our %unified_info = ( "test/casttest-bin-casttest.o" => [ "test/casttest.c" ], + "test/cert_comp_test" => [ + "test/cert_comp_test-bin-cert_comp_test.o", + "test/helpers/cert_comp_test-bin-ssltestlib.o" + ], + "test/cert_comp_test-bin-cert_comp_test.o" => [ + "test/cert_comp_test.c" + ], "test/chacha_internal_test" => [ "test/chacha_internal_test-bin-chacha_internal_test.o" ], @@ -31265,6 +31343,9 @@ our %unified_info = ( "test/helpers/asynciotest-bin-ssltestlib.o" => [ "test/helpers/ssltestlib.c" ], + "test/helpers/cert_comp_test-bin-ssltestlib.o" => [ + "test/helpers/ssltestlib.c" + ], "test/helpers/cmp_asn_test-bin-cmp_testlib.o" => [ "test/helpers/cmp_testlib.c" ], @@ -32491,18 +32572,9 @@ my %disabled_info = ( "asm" => { "macro" => "OPENSSL_NO_ASM" }, - "brotli" => { - "macro" => "OPENSSL_NO_BROTLI" - }, "brotli-dynamic" => { "macro" => "OPENSSL_NO_BROTLI_DYNAMIC" }, - "comp" => { - "macro" => "OPENSSL_NO_COMP", - "skipped" => [ - "crypto/comp" - ] - }, "crypto-mdebug" => { "macro" => "OPENSSL_NO_CRYPTO_MDEBUG" }, @@ -32599,15 +32671,9 @@ my %disabled_info = ( "winstore" => { "macro" => "OPENSSL_NO_WINSTORE" }, - "zlib" => { - "macro" => "OPENSSL_NO_ZLIB" - }, "zlib-dynamic" => { "macro" => "OPENSSL_NO_ZLIB_DYNAMIC" }, - "zstd" => { - "macro" => "OPENSSL_NO_ZSTD" - }, "zstd-dynamic" => { "macro" => "OPENSSL_NO_ZSTD_DYNAMIC" } 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 85ab5399f9d3b5..1bb89d94f406a9 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: solaris64-x86_64-gcc" -#define DATE "built on: Tue Jan 27 17:38:22 2026 UTC" +#define DATE "built on: Wed Mar 11 15:47:35 2026 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -25,5 +25,10 @@ static const char compiler_flags[] = { '_','E','N','D','I','A','N',' ','-','D','O','P','E','N','S','S', 'L','_','P','I','C',' ','-','D','O','P','E','N','S','S','L','_', 'B','U','I','L','D','I','N','G','_','O','P','E','N','S','S','L', - ' ','-','D','N','D','E','B','U','G','\0' + ' ','-','D','B','R','O','T','L','I',' ','-','D','Z','L','I','B', + ' ','-','D','Z','S','T','D',' ','-','D','N','D','E','B','U','G', + ' ','-','I','.','.','/','.','.','/','b','r','o','t','l','i','/', + 'c','/','i','n','c','l','u','d','e',' ','-','I','.','.','/','.', + '.','/','z','l','i','b',' ','-','I','.','.','/','.','.','/','z', + 's','t','d','/','l','i','b','\0' }; diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/configuration.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/configuration.h index caeec5f1bbb78c..67195350e6935c 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/configuration.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/configuration.h @@ -44,15 +44,9 @@ extern "C" { # ifndef OPENSSL_NO_ASM # define OPENSSL_NO_ASM # endif -# ifndef OPENSSL_NO_BROTLI -# define OPENSSL_NO_BROTLI -# endif # ifndef OPENSSL_NO_BROTLI_DYNAMIC # define OPENSSL_NO_BROTLI_DYNAMIC # endif -# ifndef OPENSSL_NO_COMP -# define OPENSSL_NO_COMP -# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -143,15 +137,9 @@ extern "C" { # ifndef OPENSSL_NO_WINSTORE # define OPENSSL_NO_WINSTORE # endif -# ifndef OPENSSL_NO_ZLIB -# define OPENSSL_NO_ZLIB -# endif # ifndef OPENSSL_NO_ZLIB_DYNAMIC # define OPENSSL_NO_ZLIB_DYNAMIC # endif -# ifndef OPENSSL_NO_ZSTD -# define OPENSSL_NO_ZSTD -# endif # ifndef OPENSSL_NO_ZSTD_DYNAMIC # define OPENSSL_NO_ZSTD_DYNAMIC # endif diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/openssl-cl.gypi b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/openssl-cl.gypi index 71f5fc0d1e1470..15dc9605f6cacc 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/openssl-cl.gypi @@ -5,6 +5,9 @@ 'FILIO_H', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'OPENSSL_PIC', ], 'openssl_cflags_solaris64-x86_64-gcc': [ @@ -13,7 +16,7 @@ '-Wall -O3', ], 'openssl_ex_libs_solaris64-x86_64-gcc': [ - '-lsocket -lnsl -ldl', + '-lm -lsocket -lnsl -ldl', ], 'openssl_cli_srcs_solaris64-x86_64-gcc': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/openssl-fips.gypi index b1e754b092284c..8bc03b64a2ed32 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/openssl-fips.gypi @@ -334,6 +334,9 @@ 'FILIO_H', 'L_ENDIAN', 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', 'FIPS_MODULE', 'FIPS_MODULE', ], @@ -343,7 +346,7 @@ '-Wall -O3', ], 'openssl_ex_libs_solaris64-x86_64-gcc': [ - '-lsocket -lnsl -ldl', + '-lm -lsocket -lnsl -ldl', ], 'linker_script': '' }, diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/openssl.gypi b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/openssl.gypi index 0e82d933f503c0..062cec1ec30a67 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/openssl.gypi @@ -286,6 +286,11 @@ 'openssl/crypto/cms/cms_rsa.c', 'openssl/crypto/cms/cms_sd.c', 'openssl/crypto/cms/cms_smime.c', + 'openssl/crypto/comp/c_brotli.c', + 'openssl/crypto/comp/c_zlib.c', + 'openssl/crypto/comp/c_zstd.c', + 'openssl/crypto/comp/comp_err.c', + 'openssl/crypto/comp/comp_lib.c', 'openssl/crypto/conf/conf_api.c', 'openssl/crypto/conf/conf_def.c', 'openssl/crypto/conf/conf_err.c', @@ -1111,6 +1116,16 @@ './config/archs/solaris64-x86_64-gcc/no-asm/providers/fips.ld', ], 'openssl_defines_solaris64-x86_64-gcc': [ + 'NDEBUG', + 'FILIO_H', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'BROTLI', + 'ZLIB', + 'ZSTD', + 'OPENSSL_PIC', + ], + 'openssl_defines_exported_solaris64-x86_64-gcc': [ 'NDEBUG', 'FILIO_H', 'L_ENDIAN', @@ -1123,7 +1138,7 @@ '-Wall -O3', ], 'openssl_ex_libs_solaris64-x86_64-gcc': [ - '-lsocket -lnsl -ldl', + '-lm -lsocket -lnsl -ldl', ], }, 'include_dirs': [ @@ -1139,6 +1154,6 @@ 'sources': ['<@(openssl_sources)', '<@(openssl_sources_solaris64-x86_64-gcc)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], - 'defines': ['<@(openssl_defines_solaris64-x86_64-gcc)'], + 'defines': ['<@(openssl_defines_exported_solaris64-x86_64-gcc)'], }, } From aee82a207bfabc5a60ae9adde538f6f20601e96b Mon Sep 17 00:00:00 2001 From: Tim Perry Date: Wed, 11 Mar 2026 17:20:36 +0100 Subject: [PATCH 3/4] tls: add certificateCompression option This changes enables compression within OpenSSL *without* enabling record compression, so this only affects compression of certificates delivered within the TLS handshake. This certificate compression remains disabled by default for now, but becomes available via the new certificateCompression option in TLS context APIs. Enabling this shrinks handshakes significantly, and also reduces fingerprintability of Node.js client handshakes, as these are enabled in all modern browsers by default. --- doc/api/tls.md | 10 + lib/internal/tls/secure-context.js | 12 ++ lib/internal/tls/wrap.js | 2 + src/crypto/crypto_context.cc | 89 ++++++++ src/crypto/crypto_context.h | 31 +++ src/crypto/crypto_tls.cc | 18 ++ .../test-tls-certificate-compression.js | 199 ++++++++++++++++++ 7 files changed, 361 insertions(+) create mode 100644 test/parallel/test-tls-certificate-compression.js diff --git a/doc/api/tls.md b/doc/api/tls.md index dc4719d391d003..35dbe4145e7be8 100644 --- a/doc/api/tls.md +++ b/doc/api/tls.md @@ -1895,6 +1895,9 @@ argument.