diff --git a/deps/openssl/config/archs/BSD-x86/asm/apps/progs.c b/deps/openssl/config/archs/BSD-x86/asm/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/apps/progs.c +++ b/deps/openssl/config/archs/BSD-x86/asm/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/BSD-x86/asm/configdata.pm b/deps/openssl/config/archs/BSD-x86/asm/configdata.pm index b4ff88112bd18d..5dda0f9080276b 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/configdata.pm +++ b/deps/openssl/config/archs/BSD-x86/asm/configdata.pm @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -203,10 +203,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -255,11 +255,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "BSD-x86", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -387,7 +387,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -889,6 +888,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1045,9 +1047,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3484,9 +3483,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5878,9 +5874,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7263,6 +7256,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7471,10 +7468,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10279,7 +10272,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10330,7 +10322,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12533,9 +12524,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14927,9 +14915,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16294,10 +16279,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16899,7 +16880,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18358,6 +18338,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18520,9 +18504,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19895,7 +19876,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20229,6 +20209,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20281,7 +20262,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24489,7 +24469,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24516,7 +24495,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25767,9 +25745,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25851,9 +25826,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25984,6 +25956,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26296,12 +26274,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27687,8 +27659,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27715,7 +27687,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27732,8 +27704,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27751,7 +27723,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27773,7 +27745,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/aes/aes-586.S b/deps/openssl/config/archs/BSD-x86/asm/crypto/aes/aes-586.S index 54ca918323b688..4654a1af9eb2c6 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/aes/aes-586.S +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/aes/aes-586.S @@ -2,10 +2,10 @@ .type __x86_AES_encrypt_compact,@function .align 4 __x86_AES_encrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -265,10 +265,10 @@ L000loop: .type __sse_AES_encrypt_compact,@function .align 4 __sse_AES_encrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pxor (%edi),%mm0 pxor 8(%edi),%mm4 @@ -426,10 +426,10 @@ L002out: .type __x86_AES_encrypt,@function .align 4 __x86_AES_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -980,10 +980,10 @@ LAES_Te: .align 4 _AES_encrypt: L_AES_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1048,10 +1048,10 @@ L005x86: .type __x86_AES_decrypt_compact,@function .align 4 __x86_AES_decrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -1407,10 +1407,10 @@ L006loop: .type __sse_AES_decrypt_compact,@function .align 4 __sse_AES_decrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pxor (%edi),%mm0 pxor 8(%edi),%mm4 @@ -1627,10 +1627,10 @@ L008out: .type __x86_AES_decrypt,@function .align 4 __x86_AES_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -2185,10 +2185,10 @@ LAES_Td: .align 4 _AES_decrypt: L_AES_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2255,10 +2255,10 @@ L011x86: .align 4 _AES_cbc_encrypt: L_AES_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2791,10 +2791,10 @@ L039slow_dec_partial_x86: .type __x86_AES_set_encrypt_key,@function .align 4 __x86_AES_set_encrypt_key: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3027,10 +3027,10 @@ L045exit: .align 4 _AES_set_encrypt_key: L_AES_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call __x86_AES_set_encrypt_key ret @@ -3039,10 +3039,10 @@ L_AES_set_encrypt_key_begin: .align 4 _AES_set_decrypt_key: L_AES_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call __x86_AES_set_encrypt_key cmpl $0,%eax diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/aes/aesni-x86.S b/deps/openssl/config/archs/BSD-x86/asm/crypto/aes/aesni-x86.S index 0dfd8d39f9fb45..8866ea82e9ad36 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/aes/aesni-x86.S +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/aes/aesni-x86.S @@ -4,10 +4,10 @@ .align 4 _aesni_encrypt: L_aesni_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 12(%esp),%edx @@ -35,10 +35,10 @@ L000enc1_loop_1: .align 4 _aesni_decrypt: L_aesni_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 12(%esp),%edx @@ -64,10 +64,10 @@ L001dec1_loop_2: .type __aesni_encrypt2,@function .align 4 __aesni_encrypt2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -95,10 +95,10 @@ L002enc2_loop: .type __aesni_decrypt2,@function .align 4 __aesni_decrypt2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -126,10 +126,10 @@ L003dec2_loop: .type __aesni_encrypt3,@function .align 4 __aesni_encrypt3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -162,10 +162,10 @@ L004enc3_loop: .type __aesni_decrypt3,@function .align 4 __aesni_decrypt3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -198,10 +198,10 @@ L005dec3_loop: .type __aesni_encrypt4,@function .align 4 __aesni_encrypt4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 movups 16(%edx),%xmm1 @@ -240,10 +240,10 @@ L006enc4_loop: .type __aesni_decrypt4,@function .align 4 __aesni_decrypt4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 movups 16(%edx),%xmm1 @@ -282,10 +282,10 @@ L007dec4_loop: .type __aesni_encrypt6,@function .align 4 __aesni_encrypt6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -340,10 +340,10 @@ L_aesni_encrypt6_enter: .type __aesni_decrypt6,@function .align 4 __aesni_decrypt6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -400,10 +400,10 @@ L_aesni_decrypt6_enter: .align 4 _aesni_ecb_encrypt: L_aesni_ecb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -639,10 +639,10 @@ L012ecb_ret: .align 4 _aesni_ccm64_encrypt_blocks: L_aesni_ccm64_encrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -731,10 +731,10 @@ L031ccm64_enc2_loop: .align 4 _aesni_ccm64_decrypt_blocks: L_aesni_ccm64_decrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -858,10 +858,10 @@ L036enc1_loop_6: .align 4 _aesni_ctr32_encrypt_blocks: L_aesni_ctr32_encrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1100,10 +1100,10 @@ L040ctr32_ret: .align 4 _aesni_xts_encrypt: L_aesni_xts_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1464,10 +1464,10 @@ L056xts_enc_ret: .align 4 _aesni_xts_decrypt: L_aesni_xts_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1858,10 +1858,10 @@ L069xts_dec_ret: .align 4 _aesni_ocb_encrypt: L_aesni_ocb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2257,10 +2257,10 @@ L078done: .align 4 _aesni_ocb_decrypt: L_aesni_ocb_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2656,10 +2656,10 @@ L088done: .align 4 _aesni_cbc_encrypt: L_aesni_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2919,10 +2919,10 @@ L094cbc_abort: .type __aesni_set_encrypt_key,@function .align 4 __aesni_set_encrypt_key: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3259,10 +3259,10 @@ L115bad_keybits: .align 4 _aesni_set_encrypt_key: L_aesni_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%ecx @@ -3274,10 +3274,10 @@ L_aesni_set_encrypt_key_begin: .align 4 _aesni_set_decrypt_key: L_aesni_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%ecx diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/aes/vpaes-x86.S b/deps/openssl/config/archs/BSD-x86/asm/crypto/aes/vpaes-x86.S index ed3c31c5b4ce96..2ea0b6af42a24a 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/aes/vpaes-x86.S +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/aes/vpaes-x86.S @@ -59,10 +59,10 @@ L_vpaes_consts: .type __vpaes_preheat,@function .align 4 __vpaes_preheat: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%ebp movdqa -48(%ebp),%xmm7 @@ -71,10 +71,10 @@ __vpaes_preheat: .type __vpaes_encrypt_core,@function .align 4 __vpaes_encrypt_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $16,%ecx movl 240(%edx),%eax @@ -152,10 +152,10 @@ L000enc_entry: .type __vpaes_decrypt_core,@function .align 4 __vpaes_decrypt_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif leal 608(%ebp),%ebx movl 240(%edx),%eax @@ -244,10 +244,10 @@ L002dec_entry: .type __vpaes_schedule_core,@function .align 4 __vpaes_schedule_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%ebp movdqu (%esi),%xmm0 @@ -342,10 +342,10 @@ L013schedule_mangle_last_dec: .type __vpaes_schedule_192_smear,@function .align 4 __vpaes_schedule_192_smear: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pshufd $128,%xmm6,%xmm1 pshufd $254,%xmm7,%xmm0 @@ -358,10 +358,10 @@ __vpaes_schedule_192_smear: .type __vpaes_schedule_round,@function .align 4 __vpaes_schedule_round: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa 8(%esp),%xmm2 pxor %xmm1,%xmm1 @@ -411,10 +411,10 @@ L_vpaes_schedule_low_round: .type __vpaes_schedule_transform,@function .align 4 __vpaes_schedule_transform: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa -16(%ebp),%xmm2 movdqa %xmm2,%xmm1 @@ -430,10 +430,10 @@ __vpaes_schedule_transform: .type __vpaes_schedule_mangle,@function .align 4 __vpaes_schedule_mangle: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa %xmm0,%xmm4 movdqa 128(%ebp),%xmm5 @@ -495,10 +495,10 @@ L015schedule_mangle_both: .align 4 _vpaes_set_encrypt_key: L_vpaes_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -532,10 +532,10 @@ L016pic_point: .align 4 _vpaes_set_decrypt_key: L_vpaes_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -574,10 +574,10 @@ L017pic_point: .align 4 _vpaes_encrypt: L_vpaes_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -607,10 +607,10 @@ L018pic_point: .align 4 _vpaes_decrypt: L_vpaes_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -640,10 +640,10 @@ L019pic_point: .align 4 _vpaes_cbc_encrypt: L_vpaes_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/bf/bf-586.S b/deps/openssl/config/archs/BSD-x86/asm/crypto/bf/bf-586.S index 3b44e17cff7721..4f880742ce6cc0 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/bf/bf-586.S +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/bf/bf-586.S @@ -4,10 +4,10 @@ .align 4 _BF_encrypt: L_BF_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -358,10 +358,10 @@ L_BF_encrypt_begin: .align 4 _BF_decrypt: L_BF_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -712,10 +712,10 @@ L_BF_decrypt_begin: .align 4 _BF_cbc_encrypt: L_BF_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -780,55 +780,55 @@ L004PIC_point: xorl %edx,%edx jmp *%ebp L006ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx L007ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh L008ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl L009ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp L010ejend L011ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx L012ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch L013ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl L010ejend: diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/bn/bn-586.S b/deps/openssl/config/archs/BSD-x86/asm/crypto/bn/bn-586.S index 74f325b80bf104..75f99c13778115 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/bn/bn-586.S +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/bn/bn-586.S @@ -4,10 +4,10 @@ .align 4 _bn_mul_add_words: L_bn_mul_add_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L000PIC_me_up L000PIC_me_up: @@ -292,10 +292,10 @@ L009maw_end: .align 4 _bn_mul_words: L_bn_mul_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L010PIC_me_up L010PIC_me_up: @@ -479,10 +479,10 @@ L016mw_end: .align 4 _bn_sqr_words: L_bn_sqr_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L017PIC_me_up L017PIC_me_up: @@ -625,10 +625,10 @@ L022sw_end: .align 4 _bn_div_words: L_bn_div_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax @@ -640,10 +640,10 @@ L_bn_div_words_begin: .align 4 _bn_add_words: L_bn_add_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -826,10 +826,10 @@ L025aw_end: .align 4 _bn_sub_words: L_bn_sub_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1012,10 +1012,10 @@ L028aw_end: .align 4 _bn_sub_part_words: L_bn_sub_part_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/bn/co-586.S b/deps/openssl/config/archs/BSD-x86/asm/crypto/bn/co-586.S index 2acadf2414436e..92649ab1e0a77e 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/bn/co-586.S +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/bn/co-586.S @@ -4,10 +4,10 @@ .align 4 _bn_mul_comba8: L_bn_mul_comba8_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi movl 12(%esp),%esi @@ -552,10 +552,10 @@ L_bn_mul_comba8_begin: .align 4 _bn_mul_comba4: L_bn_mul_comba4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi movl 12(%esp),%esi @@ -724,10 +724,10 @@ L_bn_mul_comba4_begin: .align 4 _bn_sqr_comba8: L_bn_sqr_comba8_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1136,10 +1136,10 @@ L_bn_sqr_comba8_begin: .align 4 _bn_sqr_comba4: L_bn_sqr_comba4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/bn/x86-gf2m.S b/deps/openssl/config/archs/BSD-x86/asm/crypto/bn/x86-gf2m.S index 67ddae47d13912..b9fc9535eb7ea0 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/bn/x86-gf2m.S +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/bn/x86-gf2m.S @@ -2,10 +2,10 @@ .type __mul_1x1_mmx,@function .align 4 __mul_1x1_mmx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif subl $36,%esp movl %eax,%ecx @@ -109,10 +109,10 @@ __mul_1x1_mmx: .type __mul_1x1_ialu,@function .align 4 __mul_1x1_ialu: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif subl $36,%esp movl %eax,%ecx @@ -247,10 +247,10 @@ __mul_1x1_ialu: .align 4 _bn_GF2m_mul_2x2: L_bn_GF2m_mul_2x2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L000PIC_me_up L000PIC_me_up: diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/bn/x86-mont.S b/deps/openssl/config/archs/BSD-x86/asm/crypto/bn/x86-mont.S index 958fd5ceb507e6..50e1d46fb09ba4 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/bn/x86-mont.S +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/bn/x86-mont.S @@ -4,10 +4,10 @@ .align 4 _bn_mul_mont: L_bn_mul_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx 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 af438f4f0fa031..de4de8eda3ac76 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: BSD-x86" -#define DATE "built on: Mon Sep 30 17:05:30 2024 UTC" +#define DATE "built on: Mon Mar 3 17:38:40 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/camellia/cmll-x86.S b/deps/openssl/config/archs/BSD-x86/asm/crypto/camellia/cmll-x86.S index d3a60834208b05..d9e381a39fb9bb 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/camellia/cmll-x86.S +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/camellia/cmll-x86.S @@ -4,10 +4,10 @@ .align 4 _Camellia_EncryptBlock_Rounds: L_Camellia_EncryptBlock_Rounds_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -62,10 +62,10 @@ L000pic_point: .align 4 _Camellia_EncryptBlock: L_Camellia_EncryptBlock_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $128,%eax subl 4(%esp),%eax @@ -78,10 +78,10 @@ L_Camellia_EncryptBlock_begin: .align 4 _Camellia_encrypt: L_Camellia_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -134,10 +134,10 @@ L001pic_point: .type __x86_Camellia_encrypt,@function .align 4 __x86_Camellia_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl (%edi),%eax xorl 4(%edi),%ebx @@ -368,10 +368,10 @@ L003done: .align 4 _Camellia_DecryptBlock_Rounds: L_Camellia_DecryptBlock_Rounds_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -426,10 +426,10 @@ L004pic_point: .align 4 _Camellia_DecryptBlock: L_Camellia_DecryptBlock_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $128,%eax subl 4(%esp),%eax @@ -442,10 +442,10 @@ L_Camellia_DecryptBlock_begin: .align 4 _Camellia_decrypt: L_Camellia_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -498,10 +498,10 @@ L005pic_point: .type __x86_Camellia_decrypt,@function .align 4 __x86_Camellia_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl (%edi),%eax xorl 4(%edi),%ebx @@ -732,10 +732,10 @@ L007done: .align 4 _Camellia_Ekeygen: L_Camellia_Ekeygen_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1577,10 +1577,10 @@ L013done: .align 4 _Camellia_set_key: L_Camellia_set_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ecx @@ -2133,10 +2133,10 @@ LCamellia_SBOX: .align 4 _Camellia_cbc_encrypt: L_Camellia_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/chacha/chacha-x86.S b/deps/openssl/config/archs/BSD-x86/asm/crypto/chacha/chacha-x86.S index 43fb04a04b222e..de6c16532c9135 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/chacha/chacha-x86.S +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/chacha/chacha-x86.S @@ -4,10 +4,10 @@ .align 4 _ChaCha20_ctr32: L_ChaCha20_ctr32_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -382,10 +382,10 @@ L000no_data: .align 4 _ChaCha20_ssse3: L_ChaCha20_ssse3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -978,10 +978,10 @@ Lssse3_data: .align 4 _ChaCha20_xop: L_ChaCha20_xop_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/des/crypt586.S b/deps/openssl/config/archs/BSD-x86/asm/crypto/des/crypt586.S index 6d24c5d6a737e6..20cebb63022467 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/des/crypt586.S +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/des/crypt586.S @@ -4,10 +4,10 @@ .align 4 _fcrypt_body: L_fcrypt_body_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/des/des-586.S b/deps/openssl/config/archs/BSD-x86/asm/crypto/des/des-586.S index cdc186dff94aa1..9714ec62b06058 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/des/des-586.S +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/des/des-586.S @@ -3,10 +3,10 @@ .type __x86_DES_encrypt,@function .align 4 __x86_DES_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ecx # Round 0 @@ -478,10 +478,10 @@ __x86_DES_encrypt: .type __x86_DES_decrypt,@function .align 4 __x86_DES_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ecx # Round 15 @@ -955,10 +955,10 @@ __x86_DES_decrypt: .align 4 _DES_encrypt1: L_DES_encrypt1_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1072,10 +1072,10 @@ L002done: .align 4 _DES_encrypt2: L_DES_encrypt2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1119,10 +1119,10 @@ L005done: .align 4 _DES_encrypt3: L_DES_encrypt3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ebx @@ -1244,10 +1244,10 @@ L_DES_encrypt3_begin: .align 4 _DES_decrypt3: L_DES_decrypt3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ebx @@ -1369,10 +1369,10 @@ L_DES_decrypt3_begin: .align 4 _DES_ncbc_encrypt: L_DES_ncbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -1435,55 +1435,55 @@ L010PIC_point: xorl %edx,%edx jmp *%ebp L012ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx L013ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh L014ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl L015ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp L016ejend L017ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx L018ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch L019ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl L016ejend: @@ -1588,10 +1588,10 @@ L011cbc_enc_jmp_table: .align 4 _DES_ede3_cbc_encrypt: L_DES_ede3_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -1658,55 +1658,55 @@ L034PIC_point: xorl %edx,%edx jmp *%ebp L036ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx L037ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh L038ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl L039ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp L040ejend L041ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx L042ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch L043ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl L040ejend: diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/ec/ecp_nistz256-x86.S b/deps/openssl/config/archs/BSD-x86/asm/crypto/ec/ecp_nistz256-x86.S index 44d644b785db3c..592bd5d4ccadcd 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/ec/ecp_nistz256-x86.S +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/ec/ecp_nistz256-x86.S @@ -2387,10 +2387,10 @@ LONE: .align 4 _ecp_nistz256_mul_by_2: L_ecp_nistz256_mul_by_2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2410,10 +2410,10 @@ L_ecp_nistz256_mul_by_2_begin: .align 4 _ecp_nistz256_mul_by_3: L_ecp_nistz256_mul_by_3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2439,10 +2439,10 @@ L_ecp_nistz256_mul_by_3_begin: .align 4 _ecp_nistz256_div_by_2: L_ecp_nistz256_div_by_2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2459,10 +2459,10 @@ L_ecp_nistz256_div_by_2_begin: .type __ecp_nistz256_div_by_2,@function .align 4 __ecp_nistz256_div_by_2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ebp xorl %edx,%edx @@ -2546,10 +2546,10 @@ __ecp_nistz256_div_by_2: .align 4 _ecp_nistz256_add: L_ecp_nistz256_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2567,10 +2567,10 @@ L_ecp_nistz256_add_begin: .type __ecp_nistz256_add,@function .align 4 __ecp_nistz256_add: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%eax movl 4(%esi),%ebx @@ -2648,10 +2648,10 @@ __ecp_nistz256_add: .align 4 _ecp_nistz256_sub: L_ecp_nistz256_sub_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2669,10 +2669,10 @@ L_ecp_nistz256_sub_begin: .type __ecp_nistz256_sub,@function .align 4 __ecp_nistz256_sub: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%eax movl 4(%esi),%ebx @@ -2731,10 +2731,10 @@ __ecp_nistz256_sub: .align 4 _ecp_nistz256_neg: L_ecp_nistz256_neg_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2763,10 +2763,10 @@ L_ecp_nistz256_neg_begin: .type __picup_eax,@function .align 4 __picup_eax: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esp),%eax ret @@ -2775,10 +2775,10 @@ __picup_eax: .align 4 _ecp_nistz256_to_mont: L_ecp_nistz256_to_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2803,10 +2803,10 @@ L000pic: .align 4 _ecp_nistz256_from_mont: L_ecp_nistz256_from_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2831,10 +2831,10 @@ L001pic: .align 4 _ecp_nistz256_mul_mont: L_ecp_nistz256_mul_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2859,10 +2859,10 @@ L002pic: .align 4 _ecp_nistz256_sqr_mont: L_ecp_nistz256_sqr_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2885,10 +2885,10 @@ L003pic: .type __ecp_nistz256_mul_mont,@function .align 4 __ecp_nistz256_mul_mont: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif andl $83886080,%eax cmpl $83886080,%eax @@ -3786,10 +3786,10 @@ L004mul_mont_ialu: .align 4 _ecp_nistz256_scatter_w5: L_ecp_nistz256_scatter_w5_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3823,10 +3823,10 @@ L006scatter_w5_loop: .align 4 _ecp_nistz256_gather_w5: L_ecp_nistz256_gather_w5_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3921,10 +3921,10 @@ L_ecp_nistz256_gather_w5_begin: .align 4 _ecp_nistz256_scatter_w7: L_ecp_nistz256_scatter_w7_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3956,10 +3956,10 @@ L007scatter_w7_loop: .align 4 _ecp_nistz256_gather_w7: L_ecp_nistz256_gather_w7_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4174,10 +4174,10 @@ L_ecp_nistz256_gather_w7_begin: .align 4 _ecp_nistz256_point_double: L_ecp_nistz256_point_double_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4305,10 +4305,10 @@ Lpoint_double_shortcut: .align 4 _ecp_nistz256_point_add: L_ecp_nistz256_point_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4823,10 +4823,10 @@ L012add_done: .align 4 _ecp_nistz256_point_add_affine: L_ecp_nistz256_point_add_affine_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/md5/md5-586.S b/deps/openssl/config/archs/BSD-x86/asm/crypto/md5/md5-586.S index 814822863d3aa3..5d340cc8df1a75 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/md5/md5-586.S +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/md5/md5-586.S @@ -4,10 +4,10 @@ .align 4 _ossl_md5_block_asm_data_order: L_ossl_md5_block_asm_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/modes/ghash-x86.S b/deps/openssl/config/archs/BSD-x86/asm/crypto/modes/ghash-x86.S index 808dc30797ead2..2cff65afd1bba6 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/modes/ghash-x86.S +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/modes/ghash-x86.S @@ -4,10 +4,10 @@ .align 4 _gcm_gmult_4bit_x86: L_gcm_gmult_4bit_x86_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -102,10 +102,10 @@ L001x86_break: .align 4 _gcm_ghash_4bit_x86: L_gcm_ghash_4bit_x86_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -215,10 +215,10 @@ L004x86_break: .align 4 _gcm_gmult_4bit_mmx: L_gcm_gmult_4bit_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -318,10 +318,10 @@ L007mmx_break: .align 4 _gcm_ghash_4bit_mmx: L_gcm_ghash_4bit_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -926,10 +926,10 @@ L009outer: .align 4 _gcm_init_clmul: L_gcm_init_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax @@ -999,10 +999,10 @@ L010pic: .align 4 _gcm_gmult_clmul: L_gcm_gmult_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%edx @@ -1056,10 +1056,10 @@ L011pic: .align 4 _gcm_ghash_clmul: L_gcm_ghash_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/poly1305/poly1305-x86.S b/deps/openssl/config/archs/BSD-x86/asm/crypto/poly1305/poly1305-x86.S index 6fd5469a571356..8466cccec20cc4 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/poly1305/poly1305-x86.S +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/poly1305/poly1305-x86.S @@ -5,10 +5,10 @@ .align 4 _poly1305_init: L_poly1305_init_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -71,10 +71,10 @@ L000nokey: .align 4 _poly1305_blocks: L_poly1305_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -243,10 +243,10 @@ L003nodata: .align 4 _poly1305_emit: L_poly1305_emit_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -306,10 +306,10 @@ Lenter_emit: .type __poly1305_init_sse2,@function .align 4 __poly1305_init_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqu 24(%edi),%xmm4 leal 48(%edi),%edi @@ -512,10 +512,10 @@ L006square_break: .type __poly1305_blocks_sse2,@function .align 4 __poly1305_blocks_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1277,10 +1277,10 @@ L007nodata: .type __poly1305_emit_sse2,@function .align 4 __poly1305_emit_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1374,10 +1374,10 @@ __poly1305_emit_sse2: .type __poly1305_init_avx2,@function .align 4 __poly1305_init_avx2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif vmovdqu 24(%edi),%xmm4 leal 48(%edi),%edi @@ -1549,10 +1549,10 @@ L019square_break: .type __poly1305_blocks_avx2,@function .align 4 __poly1305_blocks_avx2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/rc4/rc4-586.S b/deps/openssl/config/archs/BSD-x86/asm/crypto/rc4/rc4-586.S index 55215f177a9f84..ea14690ff8c824 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/rc4/rc4-586.S +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/rc4/rc4-586.S @@ -4,10 +4,10 @@ .align 4 _RC4: L_RC4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -275,10 +275,10 @@ L000abort: .align 4 _RC4_set_key: L_RC4_set_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -358,10 +358,10 @@ L015exit: .align 4 _RC4_options: L_RC4_options_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L018pic_point L018pic_point: diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/ripemd/rmd-586.S b/deps/openssl/config/archs/BSD-x86/asm/crypto/ripemd/rmd-586.S index 454c77c962a283..15b6985105d16d 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/ripemd/rmd-586.S +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/ripemd/rmd-586.S @@ -4,10 +4,10 @@ .align 4 _ripemd160_block_asm_data_order: L_ripemd160_block_asm_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/sha/sha1-586.S b/deps/openssl/config/archs/BSD-x86/asm/crypto/sha/sha1-586.S index 2e977b873bb848..0eaea0433b6c9c 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/sha/sha1-586.S +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/sha/sha1-586.S @@ -4,10 +4,10 @@ .align 4 _sha1_block_data_order: L_sha1_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1403,10 +1403,10 @@ L002loop: .type __sha1_block_data_order_shaext,@function .align 4 __sha1_block_data_order_shaext: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1577,10 +1577,10 @@ L004loop_shaext: .type __sha1_block_data_order_ssse3,@function .align 4 __sha1_block_data_order_ssse3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2800,10 +2800,10 @@ L007done: .type __sha1_block_data_order_avx,@function .align 4 __sha1_block_data_order_avx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/sha/sha256-586.S b/deps/openssl/config/archs/BSD-x86/asm/crypto/sha/sha256-586.S index ab935deb824c0a..5b9c8a197ef7b1 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/sha/sha256-586.S +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/sha/sha256-586.S @@ -4,10 +4,10 @@ .align 4 _sha256_block_data_order: L_sha256_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/sha/sha512-586.S b/deps/openssl/config/archs/BSD-x86/asm/crypto/sha/sha512-586.S index 0dea93b398287d..7be4ad8cd99cb1 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/sha/sha512-586.S +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/sha/sha512-586.S @@ -4,10 +4,10 @@ .align 4 _sha512_block_data_order: L_sha512_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/whrlpool/wp-mmx.S b/deps/openssl/config/archs/BSD-x86/asm/crypto/whrlpool/wp-mmx.S index 384b61736de7aa..b717addbd1995b 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/whrlpool/wp-mmx.S +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/whrlpool/wp-mmx.S @@ -4,10 +4,10 @@ .align 4 _whirlpool_block_mmx: L_whirlpool_block_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/x86cpuid.S b/deps/openssl/config/archs/BSD-x86/asm/crypto/x86cpuid.S index 39d138a7e345d6..e80a134a6902ac 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/x86cpuid.S +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/x86cpuid.S @@ -4,10 +4,10 @@ .align 4 _OPENSSL_ia32_cpuid: L_OPENSSL_ia32_cpuid_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -152,10 +152,10 @@ L000nocpuid: .align 4 _OPENSSL_rdtsc: L_OPENSSL_rdtsc_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl %eax,%eax xorl %edx,%edx @@ -174,10 +174,10 @@ L010notsc: .align 4 _OPENSSL_instrument_halt: L_OPENSSL_instrument_halt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L011PIC_me_up L011PIC_me_up: @@ -211,10 +211,10 @@ L012nohalt: .align 4 _OPENSSL_far_spin: L_OPENSSL_far_spin_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushfl popl %eax @@ -242,10 +242,10 @@ L013nospin: .align 4 _OPENSSL_wipe_cpu: L_OPENSSL_wipe_cpu_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl %eax,%eax xorl %edx,%edx @@ -278,10 +278,10 @@ L016no_x87: .align 4 _OPENSSL_atomic_add: L_OPENSSL_atomic_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%ecx @@ -301,10 +301,10 @@ L018spin: .align 4 _OPENSSL_cleanse: L_OPENSSL_cleanse_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%ecx @@ -342,10 +342,10 @@ L022aligned: .align 4 _CRYPTO_memcmp: L_CRYPTO_memcmp_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -375,10 +375,10 @@ L023no_data: .align 4 _OPENSSL_instrument_bus: L_OPENSSL_instrument_bus_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -428,10 +428,10 @@ L026nogo: .align 4 _OPENSSL_instrument_bus2: L_OPENSSL_instrument_bus2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -494,10 +494,10 @@ L029nogo: .align 4 _OPENSSL_ia32_rdrand_bytes: L_OPENSSL_ia32_rdrand_bytes_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %ebx @@ -541,10 +541,10 @@ L032done: .align 4 _OPENSSL_ia32_rdseed_bytes: L_OPENSSL_ia32_rdseed_bytes_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm/engines/e_padlock-x86.S b/deps/openssl/config/archs/BSD-x86/asm/engines/e_padlock-x86.S index fca7a343b6e704..1a973e23548f87 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/engines/e_padlock-x86.S +++ b/deps/openssl/config/archs/BSD-x86/asm/engines/e_padlock-x86.S @@ -4,10 +4,10 @@ .align 4 _padlock_capability: L_padlock_capability_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx pushfl @@ -68,10 +68,10 @@ L000noluck: .align 4 _padlock_key_bswap: L_padlock_key_bswap_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 240(%edx),%ecx @@ -90,10 +90,10 @@ L003bswap_loop: .align 4 _padlock_verify_context: L_padlock_verify_context_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx leal Lpadlock_saved_context-L004verify_pic_point,%eax @@ -105,10 +105,10 @@ L004verify_pic_point: .type __padlock_verify_ctx,@function .align 4 __padlock_verify_ctx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%eax btl $30,4(%esp) @@ -125,10 +125,10 @@ L005verified: .align 4 _padlock_reload_key: L_padlock_reload_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushfl popfl @@ -138,10 +138,10 @@ L_padlock_reload_key_begin: .align 4 _padlock_aes_block: L_padlock_aes_block_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -162,10 +162,10 @@ L_padlock_aes_block_begin: .align 4 _padlock_ecb_encrypt: L_padlock_ecb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -345,10 +345,10 @@ L006ecb_abort: .align 4 _padlock_cbc_encrypt: L_padlock_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -532,10 +532,10 @@ L018cbc_abort: .align 4 _padlock_cfb_encrypt: L_padlock_cfb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -658,10 +658,10 @@ L030cfb_abort: .align 4 _padlock_ofb_encrypt: L_padlock_ofb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -784,10 +784,10 @@ L039ofb_abort: .align 4 _padlock_ctr32_encrypt: L_padlock_ctr32_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -895,10 +895,10 @@ L048ctr32_abort: .align 4 _padlock_xstore: L_padlock_xstore_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi movl 8(%esp),%edi @@ -909,10 +909,10 @@ L_padlock_xstore_begin: .type __win32_segv_handler,@function .align 4 __win32_segv_handler: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $1,%eax movl 4(%esp),%edx @@ -928,10 +928,10 @@ L055ret: .align 4 _padlock_sha1_oneshot: L_padlock_sha1_oneshot_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -963,10 +963,10 @@ L_padlock_sha1_oneshot_begin: .align 4 _padlock_sha1_blocks: L_padlock_sha1_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -997,10 +997,10 @@ L_padlock_sha1_blocks_begin: .align 4 _padlock_sha256_oneshot: L_padlock_sha256_oneshot_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -1032,10 +1032,10 @@ L_padlock_sha256_oneshot_begin: .align 4 _padlock_sha256_blocks: L_padlock_sha256_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -1066,10 +1066,10 @@ L_padlock_sha256_blocks_begin: .align 4 _padlock_sha512_blocks: L_padlock_sha512_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi diff --git a/deps/openssl/config/archs/BSD-x86/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/BSD-x86/asm/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/BSD-x86/asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/BSD-x86/asm/include/openssl/ssl.h b/deps/openssl/config/archs/BSD-x86/asm/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/BSD-x86/asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/BSD-x86/asm/include/progs.h b/deps/openssl/config/archs/BSD-x86/asm/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/include/progs.h +++ b/deps/openssl/config/archs/BSD-x86/asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/BSD-x86/asm/openssl.gypi b/deps/openssl/config/archs/BSD-x86/asm/openssl.gypi index c984f3e0f752ca..dbe9034311729f 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/openssl.gypi +++ b/deps/openssl/config/archs/BSD-x86/asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/apps/progs.c b/deps/openssl/config/archs/BSD-x86/asm_avx2/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/apps/progs.c +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/configdata.pm b/deps/openssl/config/archs/BSD-x86/asm_avx2/configdata.pm index 058d8def744cbf..a3bc935d6d2b4e 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/configdata.pm @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -203,10 +203,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -255,11 +255,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "BSD-x86", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -387,7 +387,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -889,6 +888,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1045,9 +1047,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3484,9 +3483,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5878,9 +5874,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7263,6 +7256,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7471,10 +7468,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10279,7 +10272,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10330,7 +10322,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12533,9 +12524,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14927,9 +14915,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16294,10 +16279,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16899,7 +16880,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18358,6 +18338,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18520,9 +18504,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19895,7 +19876,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20229,6 +20209,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20281,7 +20262,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24489,7 +24469,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24516,7 +24495,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25767,9 +25745,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25851,9 +25826,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25984,6 +25956,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26296,12 +26274,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27687,8 +27659,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27715,7 +27687,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27732,8 +27704,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27751,7 +27723,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27773,7 +27745,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/aes/aes-586.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/aes/aes-586.S index 54ca918323b688..4654a1af9eb2c6 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/aes/aes-586.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/aes/aes-586.S @@ -2,10 +2,10 @@ .type __x86_AES_encrypt_compact,@function .align 4 __x86_AES_encrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -265,10 +265,10 @@ L000loop: .type __sse_AES_encrypt_compact,@function .align 4 __sse_AES_encrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pxor (%edi),%mm0 pxor 8(%edi),%mm4 @@ -426,10 +426,10 @@ L002out: .type __x86_AES_encrypt,@function .align 4 __x86_AES_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -980,10 +980,10 @@ LAES_Te: .align 4 _AES_encrypt: L_AES_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1048,10 +1048,10 @@ L005x86: .type __x86_AES_decrypt_compact,@function .align 4 __x86_AES_decrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -1407,10 +1407,10 @@ L006loop: .type __sse_AES_decrypt_compact,@function .align 4 __sse_AES_decrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pxor (%edi),%mm0 pxor 8(%edi),%mm4 @@ -1627,10 +1627,10 @@ L008out: .type __x86_AES_decrypt,@function .align 4 __x86_AES_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -2185,10 +2185,10 @@ LAES_Td: .align 4 _AES_decrypt: L_AES_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2255,10 +2255,10 @@ L011x86: .align 4 _AES_cbc_encrypt: L_AES_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2791,10 +2791,10 @@ L039slow_dec_partial_x86: .type __x86_AES_set_encrypt_key,@function .align 4 __x86_AES_set_encrypt_key: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3027,10 +3027,10 @@ L045exit: .align 4 _AES_set_encrypt_key: L_AES_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call __x86_AES_set_encrypt_key ret @@ -3039,10 +3039,10 @@ L_AES_set_encrypt_key_begin: .align 4 _AES_set_decrypt_key: L_AES_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call __x86_AES_set_encrypt_key cmpl $0,%eax diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/aes/aesni-x86.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/aes/aesni-x86.S index 0dfd8d39f9fb45..8866ea82e9ad36 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/aes/aesni-x86.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/aes/aesni-x86.S @@ -4,10 +4,10 @@ .align 4 _aesni_encrypt: L_aesni_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 12(%esp),%edx @@ -35,10 +35,10 @@ L000enc1_loop_1: .align 4 _aesni_decrypt: L_aesni_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 12(%esp),%edx @@ -64,10 +64,10 @@ L001dec1_loop_2: .type __aesni_encrypt2,@function .align 4 __aesni_encrypt2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -95,10 +95,10 @@ L002enc2_loop: .type __aesni_decrypt2,@function .align 4 __aesni_decrypt2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -126,10 +126,10 @@ L003dec2_loop: .type __aesni_encrypt3,@function .align 4 __aesni_encrypt3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -162,10 +162,10 @@ L004enc3_loop: .type __aesni_decrypt3,@function .align 4 __aesni_decrypt3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -198,10 +198,10 @@ L005dec3_loop: .type __aesni_encrypt4,@function .align 4 __aesni_encrypt4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 movups 16(%edx),%xmm1 @@ -240,10 +240,10 @@ L006enc4_loop: .type __aesni_decrypt4,@function .align 4 __aesni_decrypt4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 movups 16(%edx),%xmm1 @@ -282,10 +282,10 @@ L007dec4_loop: .type __aesni_encrypt6,@function .align 4 __aesni_encrypt6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -340,10 +340,10 @@ L_aesni_encrypt6_enter: .type __aesni_decrypt6,@function .align 4 __aesni_decrypt6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -400,10 +400,10 @@ L_aesni_decrypt6_enter: .align 4 _aesni_ecb_encrypt: L_aesni_ecb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -639,10 +639,10 @@ L012ecb_ret: .align 4 _aesni_ccm64_encrypt_blocks: L_aesni_ccm64_encrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -731,10 +731,10 @@ L031ccm64_enc2_loop: .align 4 _aesni_ccm64_decrypt_blocks: L_aesni_ccm64_decrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -858,10 +858,10 @@ L036enc1_loop_6: .align 4 _aesni_ctr32_encrypt_blocks: L_aesni_ctr32_encrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1100,10 +1100,10 @@ L040ctr32_ret: .align 4 _aesni_xts_encrypt: L_aesni_xts_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1464,10 +1464,10 @@ L056xts_enc_ret: .align 4 _aesni_xts_decrypt: L_aesni_xts_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1858,10 +1858,10 @@ L069xts_dec_ret: .align 4 _aesni_ocb_encrypt: L_aesni_ocb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2257,10 +2257,10 @@ L078done: .align 4 _aesni_ocb_decrypt: L_aesni_ocb_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2656,10 +2656,10 @@ L088done: .align 4 _aesni_cbc_encrypt: L_aesni_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2919,10 +2919,10 @@ L094cbc_abort: .type __aesni_set_encrypt_key,@function .align 4 __aesni_set_encrypt_key: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3259,10 +3259,10 @@ L115bad_keybits: .align 4 _aesni_set_encrypt_key: L_aesni_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%ecx @@ -3274,10 +3274,10 @@ L_aesni_set_encrypt_key_begin: .align 4 _aesni_set_decrypt_key: L_aesni_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%ecx diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/aes/vpaes-x86.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/aes/vpaes-x86.S index ed3c31c5b4ce96..2ea0b6af42a24a 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/aes/vpaes-x86.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/aes/vpaes-x86.S @@ -59,10 +59,10 @@ L_vpaes_consts: .type __vpaes_preheat,@function .align 4 __vpaes_preheat: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%ebp movdqa -48(%ebp),%xmm7 @@ -71,10 +71,10 @@ __vpaes_preheat: .type __vpaes_encrypt_core,@function .align 4 __vpaes_encrypt_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $16,%ecx movl 240(%edx),%eax @@ -152,10 +152,10 @@ L000enc_entry: .type __vpaes_decrypt_core,@function .align 4 __vpaes_decrypt_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif leal 608(%ebp),%ebx movl 240(%edx),%eax @@ -244,10 +244,10 @@ L002dec_entry: .type __vpaes_schedule_core,@function .align 4 __vpaes_schedule_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%ebp movdqu (%esi),%xmm0 @@ -342,10 +342,10 @@ L013schedule_mangle_last_dec: .type __vpaes_schedule_192_smear,@function .align 4 __vpaes_schedule_192_smear: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pshufd $128,%xmm6,%xmm1 pshufd $254,%xmm7,%xmm0 @@ -358,10 +358,10 @@ __vpaes_schedule_192_smear: .type __vpaes_schedule_round,@function .align 4 __vpaes_schedule_round: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa 8(%esp),%xmm2 pxor %xmm1,%xmm1 @@ -411,10 +411,10 @@ L_vpaes_schedule_low_round: .type __vpaes_schedule_transform,@function .align 4 __vpaes_schedule_transform: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa -16(%ebp),%xmm2 movdqa %xmm2,%xmm1 @@ -430,10 +430,10 @@ __vpaes_schedule_transform: .type __vpaes_schedule_mangle,@function .align 4 __vpaes_schedule_mangle: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa %xmm0,%xmm4 movdqa 128(%ebp),%xmm5 @@ -495,10 +495,10 @@ L015schedule_mangle_both: .align 4 _vpaes_set_encrypt_key: L_vpaes_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -532,10 +532,10 @@ L016pic_point: .align 4 _vpaes_set_decrypt_key: L_vpaes_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -574,10 +574,10 @@ L017pic_point: .align 4 _vpaes_encrypt: L_vpaes_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -607,10 +607,10 @@ L018pic_point: .align 4 _vpaes_decrypt: L_vpaes_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -640,10 +640,10 @@ L019pic_point: .align 4 _vpaes_cbc_encrypt: L_vpaes_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/bf/bf-586.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/bf/bf-586.S index 3b44e17cff7721..4f880742ce6cc0 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/bf/bf-586.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/bf/bf-586.S @@ -4,10 +4,10 @@ .align 4 _BF_encrypt: L_BF_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -358,10 +358,10 @@ L_BF_encrypt_begin: .align 4 _BF_decrypt: L_BF_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -712,10 +712,10 @@ L_BF_decrypt_begin: .align 4 _BF_cbc_encrypt: L_BF_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -780,55 +780,55 @@ L004PIC_point: xorl %edx,%edx jmp *%ebp L006ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx L007ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh L008ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl L009ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp L010ejend L011ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx L012ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch L013ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl L010ejend: diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/bn/bn-586.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/bn/bn-586.S index 74f325b80bf104..75f99c13778115 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/bn/bn-586.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/bn/bn-586.S @@ -4,10 +4,10 @@ .align 4 _bn_mul_add_words: L_bn_mul_add_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L000PIC_me_up L000PIC_me_up: @@ -292,10 +292,10 @@ L009maw_end: .align 4 _bn_mul_words: L_bn_mul_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L010PIC_me_up L010PIC_me_up: @@ -479,10 +479,10 @@ L016mw_end: .align 4 _bn_sqr_words: L_bn_sqr_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L017PIC_me_up L017PIC_me_up: @@ -625,10 +625,10 @@ L022sw_end: .align 4 _bn_div_words: L_bn_div_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax @@ -640,10 +640,10 @@ L_bn_div_words_begin: .align 4 _bn_add_words: L_bn_add_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -826,10 +826,10 @@ L025aw_end: .align 4 _bn_sub_words: L_bn_sub_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1012,10 +1012,10 @@ L028aw_end: .align 4 _bn_sub_part_words: L_bn_sub_part_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/bn/co-586.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/bn/co-586.S index 2acadf2414436e..92649ab1e0a77e 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/bn/co-586.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/bn/co-586.S @@ -4,10 +4,10 @@ .align 4 _bn_mul_comba8: L_bn_mul_comba8_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi movl 12(%esp),%esi @@ -552,10 +552,10 @@ L_bn_mul_comba8_begin: .align 4 _bn_mul_comba4: L_bn_mul_comba4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi movl 12(%esp),%esi @@ -724,10 +724,10 @@ L_bn_mul_comba4_begin: .align 4 _bn_sqr_comba8: L_bn_sqr_comba8_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1136,10 +1136,10 @@ L_bn_sqr_comba8_begin: .align 4 _bn_sqr_comba4: L_bn_sqr_comba4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/bn/x86-gf2m.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/bn/x86-gf2m.S index 67ddae47d13912..b9fc9535eb7ea0 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/bn/x86-gf2m.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/bn/x86-gf2m.S @@ -2,10 +2,10 @@ .type __mul_1x1_mmx,@function .align 4 __mul_1x1_mmx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif subl $36,%esp movl %eax,%ecx @@ -109,10 +109,10 @@ __mul_1x1_mmx: .type __mul_1x1_ialu,@function .align 4 __mul_1x1_ialu: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif subl $36,%esp movl %eax,%ecx @@ -247,10 +247,10 @@ __mul_1x1_ialu: .align 4 _bn_GF2m_mul_2x2: L_bn_GF2m_mul_2x2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L000PIC_me_up L000PIC_me_up: diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/bn/x86-mont.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/bn/x86-mont.S index 958fd5ceb507e6..50e1d46fb09ba4 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/bn/x86-mont.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/bn/x86-mont.S @@ -4,10 +4,10 @@ .align 4 _bn_mul_mont: L_bn_mul_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx 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 fce54a74f651f5..deac697044b948 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: BSD-x86" -#define DATE "built on: Mon Sep 30 17:05:44 2024 UTC" +#define DATE "built on: Mon Mar 3 17:38:49 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/camellia/cmll-x86.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/camellia/cmll-x86.S index d3a60834208b05..d9e381a39fb9bb 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/camellia/cmll-x86.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/camellia/cmll-x86.S @@ -4,10 +4,10 @@ .align 4 _Camellia_EncryptBlock_Rounds: L_Camellia_EncryptBlock_Rounds_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -62,10 +62,10 @@ L000pic_point: .align 4 _Camellia_EncryptBlock: L_Camellia_EncryptBlock_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $128,%eax subl 4(%esp),%eax @@ -78,10 +78,10 @@ L_Camellia_EncryptBlock_begin: .align 4 _Camellia_encrypt: L_Camellia_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -134,10 +134,10 @@ L001pic_point: .type __x86_Camellia_encrypt,@function .align 4 __x86_Camellia_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl (%edi),%eax xorl 4(%edi),%ebx @@ -368,10 +368,10 @@ L003done: .align 4 _Camellia_DecryptBlock_Rounds: L_Camellia_DecryptBlock_Rounds_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -426,10 +426,10 @@ L004pic_point: .align 4 _Camellia_DecryptBlock: L_Camellia_DecryptBlock_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $128,%eax subl 4(%esp),%eax @@ -442,10 +442,10 @@ L_Camellia_DecryptBlock_begin: .align 4 _Camellia_decrypt: L_Camellia_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -498,10 +498,10 @@ L005pic_point: .type __x86_Camellia_decrypt,@function .align 4 __x86_Camellia_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl (%edi),%eax xorl 4(%edi),%ebx @@ -732,10 +732,10 @@ L007done: .align 4 _Camellia_Ekeygen: L_Camellia_Ekeygen_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1577,10 +1577,10 @@ L013done: .align 4 _Camellia_set_key: L_Camellia_set_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ecx @@ -2133,10 +2133,10 @@ LCamellia_SBOX: .align 4 _Camellia_cbc_encrypt: L_Camellia_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/chacha/chacha-x86.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/chacha/chacha-x86.S index 43fb04a04b222e..de6c16532c9135 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/chacha/chacha-x86.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/chacha/chacha-x86.S @@ -4,10 +4,10 @@ .align 4 _ChaCha20_ctr32: L_ChaCha20_ctr32_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -382,10 +382,10 @@ L000no_data: .align 4 _ChaCha20_ssse3: L_ChaCha20_ssse3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -978,10 +978,10 @@ Lssse3_data: .align 4 _ChaCha20_xop: L_ChaCha20_xop_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/des/crypt586.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/des/crypt586.S index 6d24c5d6a737e6..20cebb63022467 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/des/crypt586.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/des/crypt586.S @@ -4,10 +4,10 @@ .align 4 _fcrypt_body: L_fcrypt_body_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/des/des-586.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/des/des-586.S index cdc186dff94aa1..9714ec62b06058 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/des/des-586.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/des/des-586.S @@ -3,10 +3,10 @@ .type __x86_DES_encrypt,@function .align 4 __x86_DES_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ecx # Round 0 @@ -478,10 +478,10 @@ __x86_DES_encrypt: .type __x86_DES_decrypt,@function .align 4 __x86_DES_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ecx # Round 15 @@ -955,10 +955,10 @@ __x86_DES_decrypt: .align 4 _DES_encrypt1: L_DES_encrypt1_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1072,10 +1072,10 @@ L002done: .align 4 _DES_encrypt2: L_DES_encrypt2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1119,10 +1119,10 @@ L005done: .align 4 _DES_encrypt3: L_DES_encrypt3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ebx @@ -1244,10 +1244,10 @@ L_DES_encrypt3_begin: .align 4 _DES_decrypt3: L_DES_decrypt3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ebx @@ -1369,10 +1369,10 @@ L_DES_decrypt3_begin: .align 4 _DES_ncbc_encrypt: L_DES_ncbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -1435,55 +1435,55 @@ L010PIC_point: xorl %edx,%edx jmp *%ebp L012ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx L013ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh L014ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl L015ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp L016ejend L017ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx L018ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch L019ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl L016ejend: @@ -1588,10 +1588,10 @@ L011cbc_enc_jmp_table: .align 4 _DES_ede3_cbc_encrypt: L_DES_ede3_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -1658,55 +1658,55 @@ L034PIC_point: xorl %edx,%edx jmp *%ebp L036ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx L037ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh L038ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl L039ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp L040ejend L041ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx L042ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch L043ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl L040ejend: diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/ec/ecp_nistz256-x86.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/ec/ecp_nistz256-x86.S index 44d644b785db3c..592bd5d4ccadcd 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/ec/ecp_nistz256-x86.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/ec/ecp_nistz256-x86.S @@ -2387,10 +2387,10 @@ LONE: .align 4 _ecp_nistz256_mul_by_2: L_ecp_nistz256_mul_by_2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2410,10 +2410,10 @@ L_ecp_nistz256_mul_by_2_begin: .align 4 _ecp_nistz256_mul_by_3: L_ecp_nistz256_mul_by_3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2439,10 +2439,10 @@ L_ecp_nistz256_mul_by_3_begin: .align 4 _ecp_nistz256_div_by_2: L_ecp_nistz256_div_by_2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2459,10 +2459,10 @@ L_ecp_nistz256_div_by_2_begin: .type __ecp_nistz256_div_by_2,@function .align 4 __ecp_nistz256_div_by_2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ebp xorl %edx,%edx @@ -2546,10 +2546,10 @@ __ecp_nistz256_div_by_2: .align 4 _ecp_nistz256_add: L_ecp_nistz256_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2567,10 +2567,10 @@ L_ecp_nistz256_add_begin: .type __ecp_nistz256_add,@function .align 4 __ecp_nistz256_add: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%eax movl 4(%esi),%ebx @@ -2648,10 +2648,10 @@ __ecp_nistz256_add: .align 4 _ecp_nistz256_sub: L_ecp_nistz256_sub_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2669,10 +2669,10 @@ L_ecp_nistz256_sub_begin: .type __ecp_nistz256_sub,@function .align 4 __ecp_nistz256_sub: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%eax movl 4(%esi),%ebx @@ -2731,10 +2731,10 @@ __ecp_nistz256_sub: .align 4 _ecp_nistz256_neg: L_ecp_nistz256_neg_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2763,10 +2763,10 @@ L_ecp_nistz256_neg_begin: .type __picup_eax,@function .align 4 __picup_eax: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esp),%eax ret @@ -2775,10 +2775,10 @@ __picup_eax: .align 4 _ecp_nistz256_to_mont: L_ecp_nistz256_to_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2803,10 +2803,10 @@ L000pic: .align 4 _ecp_nistz256_from_mont: L_ecp_nistz256_from_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2831,10 +2831,10 @@ L001pic: .align 4 _ecp_nistz256_mul_mont: L_ecp_nistz256_mul_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2859,10 +2859,10 @@ L002pic: .align 4 _ecp_nistz256_sqr_mont: L_ecp_nistz256_sqr_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2885,10 +2885,10 @@ L003pic: .type __ecp_nistz256_mul_mont,@function .align 4 __ecp_nistz256_mul_mont: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif andl $83886080,%eax cmpl $83886080,%eax @@ -3786,10 +3786,10 @@ L004mul_mont_ialu: .align 4 _ecp_nistz256_scatter_w5: L_ecp_nistz256_scatter_w5_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3823,10 +3823,10 @@ L006scatter_w5_loop: .align 4 _ecp_nistz256_gather_w5: L_ecp_nistz256_gather_w5_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3921,10 +3921,10 @@ L_ecp_nistz256_gather_w5_begin: .align 4 _ecp_nistz256_scatter_w7: L_ecp_nistz256_scatter_w7_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3956,10 +3956,10 @@ L007scatter_w7_loop: .align 4 _ecp_nistz256_gather_w7: L_ecp_nistz256_gather_w7_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4174,10 +4174,10 @@ L_ecp_nistz256_gather_w7_begin: .align 4 _ecp_nistz256_point_double: L_ecp_nistz256_point_double_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4305,10 +4305,10 @@ Lpoint_double_shortcut: .align 4 _ecp_nistz256_point_add: L_ecp_nistz256_point_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4823,10 +4823,10 @@ L012add_done: .align 4 _ecp_nistz256_point_add_affine: L_ecp_nistz256_point_add_affine_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/md5/md5-586.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/md5/md5-586.S index 814822863d3aa3..5d340cc8df1a75 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/md5/md5-586.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/md5/md5-586.S @@ -4,10 +4,10 @@ .align 4 _ossl_md5_block_asm_data_order: L_ossl_md5_block_asm_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/modes/ghash-x86.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/modes/ghash-x86.S index 808dc30797ead2..2cff65afd1bba6 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/modes/ghash-x86.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/modes/ghash-x86.S @@ -4,10 +4,10 @@ .align 4 _gcm_gmult_4bit_x86: L_gcm_gmult_4bit_x86_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -102,10 +102,10 @@ L001x86_break: .align 4 _gcm_ghash_4bit_x86: L_gcm_ghash_4bit_x86_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -215,10 +215,10 @@ L004x86_break: .align 4 _gcm_gmult_4bit_mmx: L_gcm_gmult_4bit_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -318,10 +318,10 @@ L007mmx_break: .align 4 _gcm_ghash_4bit_mmx: L_gcm_ghash_4bit_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -926,10 +926,10 @@ L009outer: .align 4 _gcm_init_clmul: L_gcm_init_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax @@ -999,10 +999,10 @@ L010pic: .align 4 _gcm_gmult_clmul: L_gcm_gmult_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%edx @@ -1056,10 +1056,10 @@ L011pic: .align 4 _gcm_ghash_clmul: L_gcm_ghash_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/poly1305/poly1305-x86.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/poly1305/poly1305-x86.S index 6fd5469a571356..8466cccec20cc4 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/poly1305/poly1305-x86.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/poly1305/poly1305-x86.S @@ -5,10 +5,10 @@ .align 4 _poly1305_init: L_poly1305_init_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -71,10 +71,10 @@ L000nokey: .align 4 _poly1305_blocks: L_poly1305_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -243,10 +243,10 @@ L003nodata: .align 4 _poly1305_emit: L_poly1305_emit_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -306,10 +306,10 @@ Lenter_emit: .type __poly1305_init_sse2,@function .align 4 __poly1305_init_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqu 24(%edi),%xmm4 leal 48(%edi),%edi @@ -512,10 +512,10 @@ L006square_break: .type __poly1305_blocks_sse2,@function .align 4 __poly1305_blocks_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1277,10 +1277,10 @@ L007nodata: .type __poly1305_emit_sse2,@function .align 4 __poly1305_emit_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1374,10 +1374,10 @@ __poly1305_emit_sse2: .type __poly1305_init_avx2,@function .align 4 __poly1305_init_avx2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif vmovdqu 24(%edi),%xmm4 leal 48(%edi),%edi @@ -1549,10 +1549,10 @@ L019square_break: .type __poly1305_blocks_avx2,@function .align 4 __poly1305_blocks_avx2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/rc4/rc4-586.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/rc4/rc4-586.S index 55215f177a9f84..ea14690ff8c824 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/rc4/rc4-586.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/rc4/rc4-586.S @@ -4,10 +4,10 @@ .align 4 _RC4: L_RC4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -275,10 +275,10 @@ L000abort: .align 4 _RC4_set_key: L_RC4_set_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -358,10 +358,10 @@ L015exit: .align 4 _RC4_options: L_RC4_options_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L018pic_point L018pic_point: diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/ripemd/rmd-586.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/ripemd/rmd-586.S index 454c77c962a283..15b6985105d16d 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/ripemd/rmd-586.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/ripemd/rmd-586.S @@ -4,10 +4,10 @@ .align 4 _ripemd160_block_asm_data_order: L_ripemd160_block_asm_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/sha/sha1-586.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/sha/sha1-586.S index 2e977b873bb848..0eaea0433b6c9c 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/sha/sha1-586.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/sha/sha1-586.S @@ -4,10 +4,10 @@ .align 4 _sha1_block_data_order: L_sha1_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1403,10 +1403,10 @@ L002loop: .type __sha1_block_data_order_shaext,@function .align 4 __sha1_block_data_order_shaext: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1577,10 +1577,10 @@ L004loop_shaext: .type __sha1_block_data_order_ssse3,@function .align 4 __sha1_block_data_order_ssse3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2800,10 +2800,10 @@ L007done: .type __sha1_block_data_order_avx,@function .align 4 __sha1_block_data_order_avx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/sha/sha256-586.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/sha/sha256-586.S index ab935deb824c0a..5b9c8a197ef7b1 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/sha/sha256-586.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/sha/sha256-586.S @@ -4,10 +4,10 @@ .align 4 _sha256_block_data_order: L_sha256_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/sha/sha512-586.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/sha/sha512-586.S index 0dea93b398287d..7be4ad8cd99cb1 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/sha/sha512-586.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/sha/sha512-586.S @@ -4,10 +4,10 @@ .align 4 _sha512_block_data_order: L_sha512_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/whrlpool/wp-mmx.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/whrlpool/wp-mmx.S index 384b61736de7aa..b717addbd1995b 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/whrlpool/wp-mmx.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/whrlpool/wp-mmx.S @@ -4,10 +4,10 @@ .align 4 _whirlpool_block_mmx: L_whirlpool_block_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/x86cpuid.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/x86cpuid.S index 39d138a7e345d6..e80a134a6902ac 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/x86cpuid.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/x86cpuid.S @@ -4,10 +4,10 @@ .align 4 _OPENSSL_ia32_cpuid: L_OPENSSL_ia32_cpuid_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -152,10 +152,10 @@ L000nocpuid: .align 4 _OPENSSL_rdtsc: L_OPENSSL_rdtsc_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl %eax,%eax xorl %edx,%edx @@ -174,10 +174,10 @@ L010notsc: .align 4 _OPENSSL_instrument_halt: L_OPENSSL_instrument_halt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L011PIC_me_up L011PIC_me_up: @@ -211,10 +211,10 @@ L012nohalt: .align 4 _OPENSSL_far_spin: L_OPENSSL_far_spin_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushfl popl %eax @@ -242,10 +242,10 @@ L013nospin: .align 4 _OPENSSL_wipe_cpu: L_OPENSSL_wipe_cpu_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl %eax,%eax xorl %edx,%edx @@ -278,10 +278,10 @@ L016no_x87: .align 4 _OPENSSL_atomic_add: L_OPENSSL_atomic_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%ecx @@ -301,10 +301,10 @@ L018spin: .align 4 _OPENSSL_cleanse: L_OPENSSL_cleanse_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%ecx @@ -342,10 +342,10 @@ L022aligned: .align 4 _CRYPTO_memcmp: L_CRYPTO_memcmp_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -375,10 +375,10 @@ L023no_data: .align 4 _OPENSSL_instrument_bus: L_OPENSSL_instrument_bus_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -428,10 +428,10 @@ L026nogo: .align 4 _OPENSSL_instrument_bus2: L_OPENSSL_instrument_bus2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -494,10 +494,10 @@ L029nogo: .align 4 _OPENSSL_ia32_rdrand_bytes: L_OPENSSL_ia32_rdrand_bytes_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %ebx @@ -541,10 +541,10 @@ L032done: .align 4 _OPENSSL_ia32_rdseed_bytes: L_OPENSSL_ia32_rdseed_bytes_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %ebx diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/engines/e_padlock-x86.S b/deps/openssl/config/archs/BSD-x86/asm_avx2/engines/e_padlock-x86.S index fca7a343b6e704..1a973e23548f87 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/engines/e_padlock-x86.S +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/engines/e_padlock-x86.S @@ -4,10 +4,10 @@ .align 4 _padlock_capability: L_padlock_capability_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx pushfl @@ -68,10 +68,10 @@ L000noluck: .align 4 _padlock_key_bswap: L_padlock_key_bswap_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 240(%edx),%ecx @@ -90,10 +90,10 @@ L003bswap_loop: .align 4 _padlock_verify_context: L_padlock_verify_context_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx leal Lpadlock_saved_context-L004verify_pic_point,%eax @@ -105,10 +105,10 @@ L004verify_pic_point: .type __padlock_verify_ctx,@function .align 4 __padlock_verify_ctx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%eax btl $30,4(%esp) @@ -125,10 +125,10 @@ L005verified: .align 4 _padlock_reload_key: L_padlock_reload_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushfl popfl @@ -138,10 +138,10 @@ L_padlock_reload_key_begin: .align 4 _padlock_aes_block: L_padlock_aes_block_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -162,10 +162,10 @@ L_padlock_aes_block_begin: .align 4 _padlock_ecb_encrypt: L_padlock_ecb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -345,10 +345,10 @@ L006ecb_abort: .align 4 _padlock_cbc_encrypt: L_padlock_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -532,10 +532,10 @@ L018cbc_abort: .align 4 _padlock_cfb_encrypt: L_padlock_cfb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -658,10 +658,10 @@ L030cfb_abort: .align 4 _padlock_ofb_encrypt: L_padlock_ofb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -784,10 +784,10 @@ L039ofb_abort: .align 4 _padlock_ctr32_encrypt: L_padlock_ctr32_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -895,10 +895,10 @@ L048ctr32_abort: .align 4 _padlock_xstore: L_padlock_xstore_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi movl 8(%esp),%edi @@ -909,10 +909,10 @@ L_padlock_xstore_begin: .type __win32_segv_handler,@function .align 4 __win32_segv_handler: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $1,%eax movl 4(%esp),%edx @@ -928,10 +928,10 @@ L055ret: .align 4 _padlock_sha1_oneshot: L_padlock_sha1_oneshot_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -963,10 +963,10 @@ L_padlock_sha1_oneshot_begin: .align 4 _padlock_sha1_blocks: L_padlock_sha1_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -997,10 +997,10 @@ L_padlock_sha1_blocks_begin: .align 4 _padlock_sha256_oneshot: L_padlock_sha256_oneshot_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -1032,10 +1032,10 @@ L_padlock_sha256_oneshot_begin: .align 4 _padlock_sha256_blocks: L_padlock_sha256_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -1066,10 +1066,10 @@ L_padlock_sha256_blocks_begin: .align 4 _padlock_sha512_blocks: L_padlock_sha512_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/include/progs.h b/deps/openssl/config/archs/BSD-x86/asm_avx2/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl.gypi b/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl.gypi index 60512e2b588cfc..7d73b1d0fed35a 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/apps/progs.c b/deps/openssl/config/archs/BSD-x86/no-asm/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/BSD-x86/no-asm/apps/progs.c +++ b/deps/openssl/config/archs/BSD-x86/no-asm/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/configdata.pm b/deps/openssl/config/archs/BSD-x86/no-asm/configdata.pm index 6b5d662fd77178..1949c30466f684 100644 --- a/deps/openssl/config/archs/BSD-x86/no-asm/configdata.pm +++ b/deps/openssl/config/archs/BSD-x86/no-asm/configdata.pm @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [], @@ -154,7 +154,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -202,10 +202,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -255,11 +255,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "BSD-x86", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -387,7 +387,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -890,6 +889,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1046,9 +1048,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3426,9 +3425,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5820,9 +5816,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7205,6 +7198,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7413,10 +7410,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10199,7 +10192,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10250,7 +10242,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12453,9 +12444,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14847,9 +14835,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16214,10 +16199,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16819,7 +16800,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18278,6 +18258,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18440,9 +18424,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19815,7 +19796,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20149,6 +20129,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20201,7 +20182,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24331,7 +24311,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24358,7 +24337,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25599,9 +25577,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25683,9 +25658,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25816,6 +25788,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26128,12 +26106,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27522,8 +27494,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27550,7 +27522,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27567,8 +27539,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27586,7 +27558,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27608,7 +27580,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by 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 14d772edccc76f..a91bc209d7897e 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: BSD-x86" -#define DATE "built on: Mon Sep 30 17:05:57 2024 UTC" +#define DATE "built on: Mon Mar 3 17:38:58 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/include/progs.h b/deps/openssl/config/archs/BSD-x86/no-asm/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/BSD-x86/no-asm/include/progs.h +++ b/deps/openssl/config/archs/BSD-x86/no-asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/openssl.gypi b/deps/openssl/config/archs/BSD-x86/no-asm/openssl.gypi index 12fdb1843c693c..2031f41d6307b9 100644 --- a/deps/openssl/config/archs/BSD-x86/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/BSD-x86/no-asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/apps/progs.c b/deps/openssl/config/archs/BSD-x86_64/asm/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/apps/progs.c +++ b/deps/openssl/config/archs/BSD-x86_64/asm/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm b/deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm index f7cc1b97611e63..8bc2f8dbc605c8 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm +++ b/deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -203,10 +203,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -255,11 +255,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "BSD-x86_64", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -388,7 +388,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -890,6 +889,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1046,9 +1048,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3490,9 +3489,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5884,9 +5880,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7269,6 +7262,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7477,10 +7474,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10321,7 +10314,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10372,7 +10364,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12575,9 +12566,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14969,9 +14957,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16336,10 +16321,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16941,7 +16922,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18400,6 +18380,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18562,9 +18546,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19937,7 +19918,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20271,6 +20251,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20323,7 +20304,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24622,7 +24602,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24649,7 +24628,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25913,9 +25891,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25997,9 +25972,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -26130,6 +26102,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26442,12 +26420,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27833,8 +27805,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27861,7 +27833,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27878,8 +27850,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27897,7 +27869,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27919,7 +27891,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by 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 9d75e25aa5f6cd..2988835f420c99 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: BSD-x86_64" -#define DATE "built on: Mon Sep 30 17:06:08 2024 UTC" +#define DATE "built on: Mon Mar 3 17:39:05 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/ssl.h b/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/include/progs.h b/deps/openssl/config/archs/BSD-x86_64/asm/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/include/progs.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/openssl.gypi b/deps/openssl/config/archs/BSD-x86_64/asm/openssl.gypi index 7a468bd82eca92..f64b1e5b3bf451 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/openssl.gypi +++ b/deps/openssl/config/archs/BSD-x86_64/asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/apps/progs.c b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/apps/progs.c +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/configdata.pm b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/configdata.pm index a9ff7c2027b32a..868c583de97ee1 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 @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -203,10 +203,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -255,11 +255,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "BSD-x86_64", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -388,7 +388,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -890,6 +889,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1046,9 +1048,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3490,9 +3489,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5884,9 +5880,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7269,6 +7262,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7477,10 +7474,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10321,7 +10314,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10372,7 +10364,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12575,9 +12566,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14969,9 +14957,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16336,10 +16321,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16941,7 +16922,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18400,6 +18380,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18562,9 +18546,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19937,7 +19918,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20271,6 +20251,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20323,7 +20304,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24622,7 +24602,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24649,7 +24628,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25913,9 +25891,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25997,9 +25972,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -26130,6 +26102,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26442,12 +26420,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27833,8 +27805,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27861,7 +27833,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27878,8 +27850,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27897,7 +27869,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27919,7 +27891,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by 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 f1b735d8043953..926c8e49c09ae8 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: BSD-x86_64" -#define DATE "built on: Mon Sep 30 17:06:24 2024 UTC" +#define DATE "built on: Mon Mar 3 17:39:17 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/progs.h b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl.gypi b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl.gypi index 6de0252f4666f3..9dc83c8bbb123d 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 @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', diff --git a/deps/openssl/config/archs/BSD-x86_64/no-asm/apps/progs.c b/deps/openssl/config/archs/BSD-x86_64/no-asm/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/BSD-x86_64/no-asm/apps/progs.c +++ b/deps/openssl/config/archs/BSD-x86_64/no-asm/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/BSD-x86_64/no-asm/configdata.pm b/deps/openssl/config/archs/BSD-x86_64/no-asm/configdata.pm index 1ab302ff9a2dd9..5d90dbd402f55c 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 @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [], @@ -154,7 +154,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -202,10 +202,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -255,11 +255,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "BSD-x86_64", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -388,7 +388,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -891,6 +890,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1047,9 +1049,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3427,9 +3426,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5821,9 +5817,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7206,6 +7199,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7414,10 +7411,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10200,7 +10193,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10251,7 +10243,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12454,9 +12445,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14848,9 +14836,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16215,10 +16200,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16820,7 +16801,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18279,6 +18259,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18441,9 +18425,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19816,7 +19797,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20150,6 +20130,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20202,7 +20183,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24332,7 +24312,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24359,7 +24338,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25600,9 +25578,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25684,9 +25659,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25817,6 +25789,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26129,12 +26107,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27523,8 +27495,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27551,7 +27523,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27568,8 +27540,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27587,7 +27559,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27609,7 +27581,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by 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 c2bae3d778be1d..c4e7e9611e3b3f 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: BSD-x86_64" -#define DATE "built on: Mon Sep 30 17:06:40 2024 UTC" +#define DATE "built on: Mon Mar 3 17:39:28 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/BSD-x86_64/no-asm/include/progs.h b/deps/openssl/config/archs/BSD-x86_64/no-asm/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/BSD-x86_64/no-asm/include/progs.h +++ b/deps/openssl/config/archs/BSD-x86_64/no-asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/BSD-x86_64/no-asm/openssl.gypi b/deps/openssl/config/archs/BSD-x86_64/no-asm/openssl.gypi index d1d45e83d022b8..bb080a96ff626e 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 @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/VC-WIN32/asm/apps/progs.c b/deps/openssl/config/archs/VC-WIN32/asm/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/apps/progs.c +++ b/deps/openssl/config/archs/VC-WIN32/asm/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm b/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm index 3c9cf488d332fc..e4ccb9b41f56dd 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm @@ -148,7 +148,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -165,7 +165,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -216,10 +216,10 @@ our %config = ( ], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -268,11 +268,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "VC-WIN32", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "lib", @@ -287,7 +287,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x55c413c34420)", + "RANLIB" => "CODE(0x55e54966e698)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -437,7 +437,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -940,6 +939,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1096,9 +1098,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3532,9 +3531,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5926,9 +5922,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7317,6 +7310,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7525,10 +7522,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10334,7 +10327,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10385,7 +10377,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12591,9 +12582,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14985,9 +14973,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16368,10 +16353,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16973,7 +16954,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18438,6 +18418,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18600,9 +18584,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19975,7 +19956,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20309,6 +20289,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20361,7 +20342,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24575,7 +24555,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24602,7 +24581,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25861,9 +25839,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25945,9 +25920,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -26078,6 +26050,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26390,12 +26368,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27782,8 +27754,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27810,7 +27782,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27827,8 +27799,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27846,7 +27818,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27868,7 +27840,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by diff --git a/deps/openssl/config/archs/VC-WIN32/asm/crypto/bf/bf-586.asm b/deps/openssl/config/archs/VC-WIN32/asm/crypto/bf/bf-586.asm index 763e8e5bfe86e0..8ee1267a698dc2 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/crypto/bf/bf-586.asm +++ b/deps/openssl/config/archs/VC-WIN32/asm/crypto/bf/bf-586.asm @@ -769,55 +769,55 @@ L$004PIC_point: xor edx,edx jmp ebp L$006ej7: - %ifdef __CET__ + #ifdef __CET__ db 243,15,30,251 - %endif + #endif mov dh,BYTE [6+esi] shl edx,8 L$007ej6: - %ifdef __CET__ + #ifdef __CET__ db 243,15,30,251 - %endif + #endif mov dh,BYTE [5+esi] L$008ej5: - %ifdef __CET__ + #ifdef __CET__ db 243,15,30,251 - %endif + #endif mov dl,BYTE [4+esi] L$009ej4: - %ifdef __CET__ + #ifdef __CET__ db 243,15,30,251 - %endif + #endif mov ecx,DWORD [esi] jmp NEAR L$010ejend L$011ej3: - %ifdef __CET__ + #ifdef __CET__ db 243,15,30,251 - %endif + #endif mov ch,BYTE [2+esi] shl ecx,8 L$012ej2: - %ifdef __CET__ + #ifdef __CET__ db 243,15,30,251 - %endif + #endif mov ch,BYTE [1+esi] L$013ej1: - %ifdef __CET__ + #ifdef __CET__ db 243,15,30,251 - %endif + #endif mov cl,BYTE [esi] L$010ejend: 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 ddbc0c9135bcdf..e3b877ca1473fd 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/VC-WIN32/asm/crypto/buildinf.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: " -#define DATE "built on: Mon Sep 30 17:15:56 2024 UTC" +#define DATE "built on: Mon Mar 3 17:45:39 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/VC-WIN32/asm/crypto/des/des-586.asm b/deps/openssl/config/archs/VC-WIN32/asm/crypto/des/des-586.asm index da605e1b738a24..f7d4f9684de662 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/crypto/des/des-586.asm +++ b/deps/openssl/config/archs/VC-WIN32/asm/crypto/des/des-586.asm @@ -1400,55 +1400,55 @@ L$010PIC_point: xor edx,edx jmp ebp L$012ej7: - %ifdef __CET__ + #ifdef __CET__ db 243,15,30,251 - %endif + #endif mov dh,BYTE [6+esi] shl edx,8 L$013ej6: - %ifdef __CET__ + #ifdef __CET__ db 243,15,30,251 - %endif + #endif mov dh,BYTE [5+esi] L$014ej5: - %ifdef __CET__ + #ifdef __CET__ db 243,15,30,251 - %endif + #endif mov dl,BYTE [4+esi] L$015ej4: - %ifdef __CET__ + #ifdef __CET__ db 243,15,30,251 - %endif + #endif mov ecx,DWORD [esi] jmp NEAR L$016ejend L$017ej3: - %ifdef __CET__ + #ifdef __CET__ db 243,15,30,251 - %endif + #endif mov ch,BYTE [2+esi] shl ecx,8 L$018ej2: - %ifdef __CET__ + #ifdef __CET__ db 243,15,30,251 - %endif + #endif mov ch,BYTE [1+esi] L$019ej1: - %ifdef __CET__ + #ifdef __CET__ db 243,15,30,251 - %endif + #endif mov cl,BYTE [esi] L$016ejend: @@ -1617,55 +1617,55 @@ L$034PIC_point: xor edx,edx jmp ebp L$036ej7: - %ifdef __CET__ + #ifdef __CET__ db 243,15,30,251 - %endif + #endif mov dh,BYTE [6+esi] shl edx,8 L$037ej6: - %ifdef __CET__ + #ifdef __CET__ db 243,15,30,251 - %endif + #endif mov dh,BYTE [5+esi] L$038ej5: - %ifdef __CET__ + #ifdef __CET__ db 243,15,30,251 - %endif + #endif mov dl,BYTE [4+esi] L$039ej4: - %ifdef __CET__ + #ifdef __CET__ db 243,15,30,251 - %endif + #endif mov ecx,DWORD [esi] jmp NEAR L$040ejend L$041ej3: - %ifdef __CET__ + #ifdef __CET__ db 243,15,30,251 - %endif + #endif mov ch,BYTE [2+esi] shl ecx,8 L$042ej2: - %ifdef __CET__ + #ifdef __CET__ db 243,15,30,251 - %endif + #endif mov ch,BYTE [1+esi] L$043ej1: - %ifdef __CET__ + #ifdef __CET__ db 243,15,30,251 - %endif + #endif mov cl,BYTE [esi] L$040ejend: diff --git a/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/opensslv.h index 50c2dce1470fde..c0590cffa999a6 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/ssl.h b/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/ssl.h index 9712ae165a5759..7e9ca09bbf39f0 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/VC-WIN32/asm/include/progs.h b/deps/openssl/config/archs/VC-WIN32/asm/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/include/progs.h +++ b/deps/openssl/config/archs/VC-WIN32/asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/VC-WIN32/asm/openssl.gypi b/deps/openssl/config/archs/VC-WIN32/asm/openssl.gypi index 7a415cb3da09cb..0fb4d6ad1a813d 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/openssl.gypi +++ b/deps/openssl/config/archs/VC-WIN32/asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/apps/progs.c b/deps/openssl/config/archs/VC-WIN32/asm_avx2/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/apps/progs.c +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/configdata.pm b/deps/openssl/config/archs/VC-WIN32/asm_avx2/configdata.pm index a9d9e2fe5751aa..d20246dfb4f493 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/configdata.pm @@ -148,7 +148,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -165,7 +165,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -216,10 +216,10 @@ our %config = ( ], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -268,11 +268,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "VC-WIN32", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "lib", @@ -287,7 +287,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x55fa4e900730)", + "RANLIB" => "CODE(0x55d26fe42bc8)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -437,7 +437,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -940,6 +939,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1096,9 +1098,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3532,9 +3531,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5926,9 +5922,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7317,6 +7310,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7525,10 +7522,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10334,7 +10327,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10385,7 +10377,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12591,9 +12582,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14985,9 +14973,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16368,10 +16353,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16973,7 +16954,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18438,6 +18418,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18600,9 +18584,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19975,7 +19956,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20309,6 +20289,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20361,7 +20342,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24575,7 +24555,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24602,7 +24581,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25861,9 +25839,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25945,9 +25920,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -26078,6 +26050,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26390,12 +26368,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27782,8 +27754,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27810,7 +27782,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27827,8 +27799,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27846,7 +27818,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27868,7 +27840,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/bf/bf-586.asm b/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/bf/bf-586.asm index 763e8e5bfe86e0..8ee1267a698dc2 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/bf/bf-586.asm +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/bf/bf-586.asm @@ -769,55 +769,55 @@ L$004PIC_point: xor edx,edx jmp ebp L$006ej7: - %ifdef __CET__ + #ifdef __CET__ db 243,15,30,251 - %endif + #endif mov dh,BYTE [6+esi] shl edx,8 L$007ej6: - %ifdef __CET__ + #ifdef __CET__ db 243,15,30,251 - %endif + #endif mov dh,BYTE [5+esi] L$008ej5: - %ifdef __CET__ + #ifdef __CET__ db 243,15,30,251 - %endif + #endif mov dl,BYTE [4+esi] L$009ej4: - %ifdef __CET__ + #ifdef __CET__ db 243,15,30,251 - %endif + #endif mov ecx,DWORD [esi] jmp NEAR L$010ejend L$011ej3: - %ifdef __CET__ + #ifdef __CET__ db 243,15,30,251 - %endif + #endif mov ch,BYTE [2+esi] shl ecx,8 L$012ej2: - %ifdef __CET__ + #ifdef __CET__ db 243,15,30,251 - %endif + #endif mov ch,BYTE [1+esi] L$013ej1: - %ifdef __CET__ + #ifdef __CET__ db 243,15,30,251 - %endif + #endif mov cl,BYTE [esi] L$010ejend: 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 25257dbe4cdc20..0b161b3d870ab6 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: " -#define DATE "built on: Mon Sep 30 17:16:08 2024 UTC" +#define DATE "built on: Mon Mar 3 17:45:47 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/des/des-586.asm b/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/des/des-586.asm index da605e1b738a24..f7d4f9684de662 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/des/des-586.asm +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/des/des-586.asm @@ -1400,55 +1400,55 @@ L$010PIC_point: xor edx,edx jmp ebp L$012ej7: - %ifdef __CET__ + #ifdef __CET__ db 243,15,30,251 - %endif + #endif mov dh,BYTE [6+esi] shl edx,8 L$013ej6: - %ifdef __CET__ + #ifdef __CET__ db 243,15,30,251 - %endif + #endif mov dh,BYTE [5+esi] L$014ej5: - %ifdef __CET__ + #ifdef __CET__ db 243,15,30,251 - %endif + #endif mov dl,BYTE [4+esi] L$015ej4: - %ifdef __CET__ + #ifdef __CET__ db 243,15,30,251 - %endif + #endif mov ecx,DWORD [esi] jmp NEAR L$016ejend L$017ej3: - %ifdef __CET__ + #ifdef __CET__ db 243,15,30,251 - %endif + #endif mov ch,BYTE [2+esi] shl ecx,8 L$018ej2: - %ifdef __CET__ + #ifdef __CET__ db 243,15,30,251 - %endif + #endif mov ch,BYTE [1+esi] L$019ej1: - %ifdef __CET__ + #ifdef __CET__ db 243,15,30,251 - %endif + #endif mov cl,BYTE [esi] L$016ejend: @@ -1617,55 +1617,55 @@ L$034PIC_point: xor edx,edx jmp ebp L$036ej7: - %ifdef __CET__ + #ifdef __CET__ db 243,15,30,251 - %endif + #endif mov dh,BYTE [6+esi] shl edx,8 L$037ej6: - %ifdef __CET__ + #ifdef __CET__ db 243,15,30,251 - %endif + #endif mov dh,BYTE [5+esi] L$038ej5: - %ifdef __CET__ + #ifdef __CET__ db 243,15,30,251 - %endif + #endif mov dl,BYTE [4+esi] L$039ej4: - %ifdef __CET__ + #ifdef __CET__ db 243,15,30,251 - %endif + #endif mov ecx,DWORD [esi] jmp NEAR L$040ejend L$041ej3: - %ifdef __CET__ + #ifdef __CET__ db 243,15,30,251 - %endif + #endif mov ch,BYTE [2+esi] shl ecx,8 L$042ej2: - %ifdef __CET__ + #ifdef __CET__ db 243,15,30,251 - %endif + #endif mov ch,BYTE [1+esi] L$043ej1: - %ifdef __CET__ + #ifdef __CET__ db 243,15,30,251 - %endif + #endif mov cl,BYTE [esi] L$040ejend: diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/opensslv.h index 50c2dce1470fde..c0590cffa999a6 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/ssl.h index 9712ae165a5759..7e9ca09bbf39f0 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/progs.h b/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl.gypi b/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl.gypi index 0eb291c5b04f91..6771de85fc0e73 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/apps/progs.c b/deps/openssl/config/archs/VC-WIN32/no-asm/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/VC-WIN32/no-asm/apps/progs.c +++ b/deps/openssl/config/archs/VC-WIN32/no-asm/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm b/deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm index 242b585006bf5d..54178a3ca75e41 100644 --- a/deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm @@ -148,7 +148,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [], @@ -163,7 +163,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -215,10 +215,10 @@ our %config = ( ], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -268,11 +268,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "VC-WIN32", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "lib", @@ -287,7 +287,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x556017cde7e0)", + "RANLIB" => "CODE(0x55923e53d210)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -437,7 +437,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -941,6 +940,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1097,9 +1099,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3474,9 +3473,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5868,9 +5864,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7259,6 +7252,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7467,10 +7464,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10254,7 +10247,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10305,7 +10297,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12511,9 +12502,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14905,9 +14893,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16288,10 +16273,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16893,7 +16874,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18358,6 +18338,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18520,9 +18504,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19895,7 +19876,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20229,6 +20209,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20281,7 +20262,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24417,7 +24397,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24444,7 +24423,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25693,9 +25671,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25777,9 +25752,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25910,6 +25882,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26222,12 +26200,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27617,8 +27589,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27645,7 +27617,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27662,8 +27634,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27681,7 +27653,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27703,7 +27675,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by 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 f3494c62b7ffb6..1c85364d8c7456 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: " -#define DATE "built on: Mon Sep 30 17:16:20 2024 UTC" +#define DATE "built on: Mon Mar 3 17:45:54 2025 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/opensslv.h b/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/opensslv.h index 50c2dce1470fde..c0590cffa999a6 100644 --- a/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/ssl.h index 9712ae165a5759..7e9ca09bbf39f0 100644 --- a/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/include/progs.h b/deps/openssl/config/archs/VC-WIN32/no-asm/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/VC-WIN32/no-asm/include/progs.h +++ b/deps/openssl/config/archs/VC-WIN32/no-asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/openssl.gypi b/deps/openssl/config/archs/VC-WIN32/no-asm/openssl.gypi index c4e4b169a0489d..72b9b35f5e11f5 100644 --- a/deps/openssl/config/archs/VC-WIN32/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/VC-WIN32/no-asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/apps/progs.c b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/apps/progs.c +++ b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/configdata.pm b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/configdata.pm index 51e48deaccd109..f19c125891078f 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 @@ -147,7 +147,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [], @@ -163,7 +163,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -213,10 +213,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -266,11 +266,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "VC-WIN64-ARM", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "lib", @@ -283,7 +283,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x563ab4010d40)", + "RANLIB" => "CODE(0x55c469fcc0d0)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -429,7 +429,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -933,6 +932,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1089,9 +1091,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3466,9 +3465,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5860,9 +5856,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7251,6 +7244,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7459,10 +7456,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10246,7 +10239,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10297,7 +10289,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12503,9 +12494,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14897,9 +14885,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16280,10 +16265,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16885,7 +16866,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18350,6 +18330,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18512,9 +18496,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19887,7 +19868,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20221,6 +20201,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20273,7 +20254,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24409,7 +24389,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24436,7 +24415,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25685,9 +25663,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25769,9 +25744,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25902,6 +25874,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26214,12 +26192,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27609,8 +27581,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27637,7 +27609,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27654,8 +27626,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27673,7 +27645,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27695,7 +27667,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by 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 9e7f66c628b399..6fb26e4e322243 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: VC-WIN64-ARM" -#define DATE "built on: Mon Sep 30 17:16:31 2024 UTC" +#define DATE "built on: Mon Mar 3 17:46:01 2025 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/opensslv.h b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/opensslv.h index 50c2dce1470fde..c0590cffa999a6 100644 --- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/ssl.h index 9712ae165a5759..7e9ca09bbf39f0 100644 --- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/progs.h b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/progs.h +++ b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/openssl.gypi b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/openssl.gypi index 81eb195afa9c48..f144e4b579302b 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 @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/apps/progs.c b/deps/openssl/config/archs/VC-WIN64A/asm/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/apps/progs.c +++ b/deps/openssl/config/archs/VC-WIN64A/asm/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm b/deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm index a58ae5c555f86e..e593bdbe93729a 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm @@ -151,7 +151,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -168,7 +168,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -219,10 +219,10 @@ our %config = ( ], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -271,11 +271,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "VC-WIN64A", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "lib", @@ -290,7 +290,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x5567a098ee80)", + "RANLIB" => "CODE(0x55d5c3c2e388)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -441,7 +441,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -944,6 +943,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1100,9 +1102,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3541,9 +3540,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5935,9 +5931,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7326,6 +7319,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7534,10 +7531,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10369,7 +10362,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10420,7 +10412,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12626,9 +12617,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15020,9 +15008,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16403,10 +16388,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -17008,7 +16989,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18473,6 +18453,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18635,9 +18619,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -20010,7 +19991,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20344,6 +20324,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20396,7 +20377,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24701,7 +24681,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24728,7 +24707,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -26000,9 +25978,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -26084,9 +26059,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -26217,6 +26189,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26529,12 +26507,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27921,8 +27893,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27949,7 +27921,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27966,8 +27938,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27985,7 +27957,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -28007,7 +27979,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by 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 af6d41b18a92c0..c81530f3c2f20c 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/buildinf.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: " -#define DATE "built on: Mon Sep 30 17:15:14 2024 UTC" +#define DATE "built on: Mon Mar 3 17:45:10 2025 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/opensslv.h b/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/opensslv.h index 50c2dce1470fde..c0590cffa999a6 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/ssl.h b/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/ssl.h index 9712ae165a5759..7e9ca09bbf39f0 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/include/progs.h b/deps/openssl/config/archs/VC-WIN64A/asm/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/include/progs.h +++ b/deps/openssl/config/archs/VC-WIN64A/asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/openssl.gypi b/deps/openssl/config/archs/VC-WIN64A/asm/openssl.gypi index 5afa3d7541147c..56214992653bd3 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/openssl.gypi +++ b/deps/openssl/config/archs/VC-WIN64A/asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/apps/progs.c b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/apps/progs.c +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/configdata.pm b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/configdata.pm index b6476912c55ecc..c35332cde119d4 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/configdata.pm @@ -151,7 +151,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -168,7 +168,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -219,10 +219,10 @@ our %config = ( ], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -271,11 +271,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "VC-WIN64A", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "lib", @@ -290,7 +290,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x563a6722d330)", + "RANLIB" => "CODE(0x564c502df2c8)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -441,7 +441,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -944,6 +943,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1100,9 +1102,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3541,9 +3540,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5935,9 +5931,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7326,6 +7319,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7534,10 +7531,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10369,7 +10362,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10420,7 +10412,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12626,9 +12617,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -15020,9 +15008,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16403,10 +16388,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -17008,7 +16989,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18473,6 +18453,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18635,9 +18619,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -20010,7 +19991,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20344,6 +20324,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20396,7 +20377,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24701,7 +24681,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24728,7 +24707,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -26000,9 +25978,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -26084,9 +26059,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -26217,6 +26189,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26529,12 +26507,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27921,8 +27893,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27949,7 +27921,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27966,8 +27938,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27985,7 +27957,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -28007,7 +27979,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by 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 8e51d88ba4b79b..1a710a5f0decb8 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: " -#define DATE "built on: Mon Sep 30 17:15:29 2024 UTC" +#define DATE "built on: Mon Mar 3 17:45:21 2025 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/opensslv.h b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/opensslv.h index 50c2dce1470fde..c0590cffa999a6 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/ssl.h index 9712ae165a5759..7e9ca09bbf39f0 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/progs.h b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl.gypi b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl.gypi index 582f8c93a5b10f..89b4bcd47f1180 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', diff --git a/deps/openssl/config/archs/VC-WIN64A/no-asm/apps/progs.c b/deps/openssl/config/archs/VC-WIN64A/no-asm/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/VC-WIN64A/no-asm/apps/progs.c +++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/VC-WIN64A/no-asm/configdata.pm b/deps/openssl/config/archs/VC-WIN64A/no-asm/configdata.pm index 08e8c7dc590b24..8380f0663b53fb 100644 --- a/deps/openssl/config/archs/VC-WIN64A/no-asm/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/configdata.pm @@ -151,7 +151,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [], @@ -166,7 +166,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -218,10 +218,10 @@ our %config = ( ], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -271,11 +271,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "VC-WIN64A", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "lib", @@ -290,7 +290,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x55f18ff2a220)", + "RANLIB" => "CODE(0x5571d652e760)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -441,7 +441,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -945,6 +944,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1101,9 +1103,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3478,9 +3477,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5872,9 +5868,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7263,6 +7256,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7471,10 +7468,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10258,7 +10251,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10309,7 +10301,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12515,9 +12506,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14909,9 +14897,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16292,10 +16277,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16897,7 +16878,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18362,6 +18342,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18524,9 +18508,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19899,7 +19880,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20233,6 +20213,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20285,7 +20266,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24421,7 +24401,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24448,7 +24427,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25697,9 +25675,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25781,9 +25756,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25914,6 +25886,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26226,12 +26204,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27621,8 +27593,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27649,7 +27621,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27666,8 +27638,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27685,7 +27657,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27707,7 +27679,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by 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 50896740e947c3..98963cea925a6d 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: " -#define DATE "built on: Mon Sep 30 17:15:44 2024 UTC" +#define DATE "built on: Mon Mar 3 17:45:32 2025 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/opensslv.h b/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/opensslv.h index 50c2dce1470fde..c0590cffa999a6 100644 --- a/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/ssl.h index 9712ae165a5759..7e9ca09bbf39f0 100644 --- a/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/VC-WIN64A/no-asm/include/progs.h b/deps/openssl/config/archs/VC-WIN64A/no-asm/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/VC-WIN64A/no-asm/include/progs.h +++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl.gypi b/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl.gypi index af84bdff856623..3cdefe6bdde202 100644 --- a/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm/apps/progs.c b/deps/openssl/config/archs/aix64-gcc-as/asm/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm/apps/progs.c +++ b/deps/openssl/config/archs/aix64-gcc-as/asm/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm/configdata.pm b/deps/openssl/config/archs/aix64-gcc-as/asm/configdata.pm index 77e00d35a9d76f..b62204fa06b199 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm/configdata.pm +++ b/deps/openssl/config/archs/aix64-gcc-as/asm/configdata.pm @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,10 +206,10 @@ our %config = ( ], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -258,11 +258,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "aix64-gcc-as", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar -X64", @@ -390,7 +390,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -893,6 +892,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1049,9 +1051,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3467,9 +3466,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5861,9 +5857,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7246,6 +7239,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7454,10 +7451,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10277,7 +10270,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10328,7 +10320,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12531,9 +12522,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14925,9 +14913,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16292,10 +16277,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16897,7 +16878,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18356,6 +18336,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18518,9 +18502,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19893,7 +19874,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20227,6 +20207,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20279,7 +20260,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24540,7 +24520,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24567,7 +24546,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25825,9 +25803,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25909,9 +25884,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -26042,6 +26014,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26354,12 +26332,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27748,8 +27720,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27776,7 +27748,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27793,8 +27765,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27812,7 +27784,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27834,7 +27806,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by 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 99d30076120310..771179da42efe4 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: aix64-gcc-as" -#define DATE "built on: Mon Sep 30 17:04:53 2024 UTC" +#define DATE "built on: Mon Mar 3 17:38:16 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/ssl.h b/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm/include/progs.h b/deps/openssl/config/archs/aix64-gcc-as/asm/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm/include/progs.h +++ b/deps/openssl/config/archs/aix64-gcc-as/asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm/openssl.gypi b/deps/openssl/config/archs/aix64-gcc-as/asm/openssl.gypi index 8a048cba01e211..93acbf01f5373a 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm/openssl.gypi +++ b/deps/openssl/config/archs/aix64-gcc-as/asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/apps/progs.c b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/apps/progs.c +++ b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/configdata.pm b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/configdata.pm index 34862e4d370a0e..8f82e300d1cfad 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 @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,10 +206,10 @@ our %config = ( ], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -258,11 +258,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "aix64-gcc-as", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar -X64", @@ -390,7 +390,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -893,6 +892,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1049,9 +1051,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3467,9 +3466,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5861,9 +5857,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7246,6 +7239,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7454,10 +7451,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10277,7 +10270,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10328,7 +10320,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12531,9 +12522,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14925,9 +14913,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16292,10 +16277,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16897,7 +16878,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18356,6 +18336,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18518,9 +18502,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19893,7 +19874,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20227,6 +20207,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20279,7 +20260,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24540,7 +24520,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24567,7 +24546,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25825,9 +25803,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25909,9 +25884,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -26042,6 +26014,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26354,12 +26332,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27748,8 +27720,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27776,7 +27748,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27793,8 +27765,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27812,7 +27784,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27834,7 +27806,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by 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 69dd90a6c66fe7..b96ee210174c9f 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: aix64-gcc-as" -#define DATE "built on: Mon Sep 30 17:05:06 2024 UTC" +#define DATE "built on: Mon Mar 3 17:38:24 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/progs.h b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/openssl.gypi b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/openssl.gypi index ab4157db96a8ad..912a5ae1d06017 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 @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/aix64-gcc-as/no-asm/apps/progs.c b/deps/openssl/config/archs/aix64-gcc-as/no-asm/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/no-asm/apps/progs.c +++ b/deps/openssl/config/archs/aix64-gcc-as/no-asm/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/aix64-gcc-as/no-asm/configdata.pm b/deps/openssl/config/archs/aix64-gcc-as/no-asm/configdata.pm index 3012083af82f69..d86c9dd0cea2c6 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 @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [], @@ -154,7 +154,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -205,10 +205,10 @@ our %config = ( ], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -258,11 +258,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "aix64-gcc-as", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar -X64", @@ -390,7 +390,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -894,6 +893,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1050,9 +1052,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3430,9 +3429,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5824,9 +5820,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7209,6 +7202,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7417,10 +7414,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10202,7 +10195,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10253,7 +10245,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12456,9 +12447,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14850,9 +14838,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16217,10 +16202,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16822,7 +16803,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18281,6 +18261,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18443,9 +18427,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19818,7 +19799,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20152,6 +20132,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20204,7 +20185,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24330,7 +24310,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24357,7 +24336,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25598,9 +25576,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25682,9 +25657,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25815,6 +25787,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26127,12 +26105,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27524,8 +27496,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27552,7 +27524,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27569,8 +27541,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27588,7 +27560,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27610,7 +27582,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by 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 c1c41584528e9c..6d73b16f98de8c 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: aix64-gcc-as" -#define DATE "built on: Mon Sep 30 17:05:19 2024 UTC" +#define DATE "built on: Mon Mar 3 17:38:33 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/progs.h b/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/progs.h +++ b/deps/openssl/config/archs/aix64-gcc-as/no-asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/aix64-gcc-as/no-asm/openssl.gypi b/deps/openssl/config/archs/aix64-gcc-as/no-asm/openssl.gypi index 150635d1cfc050..9cc4582197f86d 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 @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/apps/progs.c b/deps/openssl/config/archs/darwin-i386-cc/asm/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/apps/progs.c +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/configdata.pm b/deps/openssl/config/archs/darwin-i386-cc/asm/configdata.pm index c48853b80e4e46..a7010ccaafa8f9 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/configdata.pm +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/configdata.pm @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,10 +206,10 @@ our %config = ( ], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -258,11 +258,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "darwin-i386-cc", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -388,7 +388,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -891,6 +890,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1047,9 +1049,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3486,9 +3485,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5880,9 +5876,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7257,6 +7250,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7465,10 +7462,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10271,7 +10264,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10322,7 +10314,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12525,9 +12516,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14919,9 +14907,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16272,10 +16257,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16871,7 +16852,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18322,6 +18302,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18484,9 +18468,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19859,7 +19840,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20193,6 +20173,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20245,7 +20226,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24449,7 +24429,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24476,7 +24455,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25725,9 +25703,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25809,9 +25784,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25942,6 +25914,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26254,12 +26232,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27646,8 +27618,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27674,7 +27646,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27691,8 +27663,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27710,7 +27682,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27732,7 +27704,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/aes/aes-586.S b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/aes/aes-586.S index f474c45fde8a8f..e0eafe83fec395 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/aes/aes-586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/aes/aes-586.S @@ -1,10 +1,10 @@ .text .align 4 __x86_AES_encrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -263,10 +263,10 @@ L000loop: ret .align 4 __sse_AES_encrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pxor (%edi),%mm0 pxor 8(%edi),%mm4 @@ -423,10 +423,10 @@ L002out: ret .align 4 __x86_AES_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -976,10 +976,10 @@ LAES_Te: .align 4 _AES_encrypt: L_AES_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1042,10 +1042,10 @@ L005x86: ret .align 4 __x86_AES_decrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -1400,10 +1400,10 @@ L006loop: ret .align 4 __sse_AES_decrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pxor (%edi),%mm0 pxor 8(%edi),%mm4 @@ -1619,10 +1619,10 @@ L008out: ret .align 4 __x86_AES_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -2176,10 +2176,10 @@ LAES_Td: .align 4 _AES_decrypt: L_AES_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2244,10 +2244,10 @@ L011x86: .align 4 _AES_cbc_encrypt: L_AES_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2778,10 +2778,10 @@ L039slow_dec_partial_x86: ret .align 4 __x86_AES_set_encrypt_key: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3013,10 +3013,10 @@ L045exit: .align 4 _AES_set_encrypt_key: L_AES_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call __x86_AES_set_encrypt_key ret @@ -3024,10 +3024,10 @@ L_AES_set_encrypt_key_begin: .align 4 _AES_set_decrypt_key: L_AES_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call __x86_AES_set_encrypt_key cmpl $0,%eax diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/aes/aesni-x86.S b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/aes/aesni-x86.S index 7a23ba9595c312..cfb2150e42dce4 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/aes/aesni-x86.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/aes/aesni-x86.S @@ -3,10 +3,10 @@ .align 4 _aesni_encrypt: L_aesni_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 12(%esp),%edx @@ -33,10 +33,10 @@ L000enc1_loop_1: .align 4 _aesni_decrypt: L_aesni_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 12(%esp),%edx @@ -61,10 +61,10 @@ L001dec1_loop_2: ret .align 4 __aesni_encrypt2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -91,10 +91,10 @@ L002enc2_loop: ret .align 4 __aesni_decrypt2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -121,10 +121,10 @@ L003dec2_loop: ret .align 4 __aesni_encrypt3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -156,10 +156,10 @@ L004enc3_loop: ret .align 4 __aesni_decrypt3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -191,10 +191,10 @@ L005dec3_loop: ret .align 4 __aesni_encrypt4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 movups 16(%edx),%xmm1 @@ -232,10 +232,10 @@ L006enc4_loop: ret .align 4 __aesni_decrypt4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 movups 16(%edx),%xmm1 @@ -273,10 +273,10 @@ L007dec4_loop: ret .align 4 __aesni_encrypt6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -330,10 +330,10 @@ L_aesni_encrypt6_enter: ret .align 4 __aesni_decrypt6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -389,10 +389,10 @@ L_aesni_decrypt6_enter: .align 4 _aesni_ecb_encrypt: L_aesni_ecb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -627,10 +627,10 @@ L012ecb_ret: .align 4 _aesni_ccm64_encrypt_blocks: L_aesni_ccm64_encrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -718,10 +718,10 @@ L031ccm64_enc2_loop: .align 4 _aesni_ccm64_decrypt_blocks: L_aesni_ccm64_decrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -844,10 +844,10 @@ L036enc1_loop_6: .align 4 _aesni_ctr32_encrypt_blocks: L_aesni_ctr32_encrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1085,10 +1085,10 @@ L040ctr32_ret: .align 4 _aesni_xts_encrypt: L_aesni_xts_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1448,10 +1448,10 @@ L056xts_enc_ret: .align 4 _aesni_xts_decrypt: L_aesni_xts_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1841,10 +1841,10 @@ L069xts_dec_ret: .align 4 _aesni_ocb_encrypt: L_aesni_ocb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2239,10 +2239,10 @@ L078done: .align 4 _aesni_ocb_decrypt: L_aesni_ocb_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2637,10 +2637,10 @@ L088done: .align 4 _aesni_cbc_encrypt: L_aesni_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2899,10 +2899,10 @@ L094cbc_abort: ret .align 4 __aesni_set_encrypt_key: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3237,10 +3237,10 @@ L115bad_keybits: .align 4 _aesni_set_encrypt_key: L_aesni_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%ecx @@ -3251,10 +3251,10 @@ L_aesni_set_encrypt_key_begin: .align 4 _aesni_set_decrypt_key: L_aesni_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%ecx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/aes/vpaes-x86.S b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/aes/vpaes-x86.S index 6e7c3afef0a4e6..8ed38def86a0f8 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/aes/vpaes-x86.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/aes/vpaes-x86.S @@ -58,10 +58,10 @@ L_vpaes_consts: .align 6,0x90 .align 4 __vpaes_preheat: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%ebp movdqa -48(%ebp),%xmm7 @@ -69,10 +69,10 @@ __vpaes_preheat: ret .align 4 __vpaes_encrypt_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $16,%ecx movl 240(%edx),%eax @@ -149,10 +149,10 @@ L000enc_entry: ret .align 4 __vpaes_decrypt_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif leal 608(%ebp),%ebx movl 240(%edx),%eax @@ -240,10 +240,10 @@ L002dec_entry: ret .align 4 __vpaes_schedule_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%ebp movdqu (%esi),%xmm0 @@ -337,10 +337,10 @@ L013schedule_mangle_last_dec: ret .align 4 __vpaes_schedule_192_smear: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pshufd $128,%xmm6,%xmm1 pshufd $254,%xmm7,%xmm0 @@ -352,10 +352,10 @@ __vpaes_schedule_192_smear: ret .align 4 __vpaes_schedule_round: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa 8(%esp),%xmm2 pxor %xmm1,%xmm1 @@ -404,10 +404,10 @@ L_vpaes_schedule_low_round: ret .align 4 __vpaes_schedule_transform: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa -16(%ebp),%xmm2 movdqa %xmm2,%xmm1 @@ -422,10 +422,10 @@ __vpaes_schedule_transform: ret .align 4 __vpaes_schedule_mangle: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa %xmm0,%xmm4 movdqa 128(%ebp),%xmm5 @@ -486,10 +486,10 @@ L015schedule_mangle_both: .align 4 _vpaes_set_encrypt_key: L_vpaes_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -522,10 +522,10 @@ L016pic_point: .align 4 _vpaes_set_decrypt_key: L_vpaes_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -563,10 +563,10 @@ L017pic_point: .align 4 _vpaes_encrypt: L_vpaes_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -595,10 +595,10 @@ L018pic_point: .align 4 _vpaes_decrypt: L_vpaes_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -627,10 +627,10 @@ L019pic_point: .align 4 _vpaes_cbc_encrypt: L_vpaes_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bf/bf-586.S b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bf/bf-586.S index b049ee042681d3..224e82f4fca289 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bf/bf-586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bf/bf-586.S @@ -3,10 +3,10 @@ .align 4 _BF_encrypt: L_BF_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -356,10 +356,10 @@ L_BF_encrypt_begin: .align 4 _BF_decrypt: L_BF_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -709,10 +709,10 @@ L_BF_decrypt_begin: .align 4 _BF_cbc_encrypt: L_BF_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -777,55 +777,55 @@ L004PIC_point: xorl %edx,%edx jmp *%ebp L006ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx L007ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh L008ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl L009ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp L010ejend L011ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx L012ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch L013ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl L010ejend: diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/bn-586.S b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/bn-586.S index 066935dd3b41df..c68e429c858901 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/bn-586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/bn-586.S @@ -3,10 +3,10 @@ .align 4 _bn_mul_add_words: L_bn_mul_add_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L000PIC_me_up L000PIC_me_up: @@ -289,10 +289,10 @@ L009maw_end: .align 4 _bn_mul_words: L_bn_mul_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L010PIC_me_up L010PIC_me_up: @@ -474,10 +474,10 @@ L016mw_end: .align 4 _bn_sqr_words: L_bn_sqr_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L017PIC_me_up L017PIC_me_up: @@ -618,10 +618,10 @@ L022sw_end: .align 4 _bn_div_words: L_bn_div_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax @@ -632,10 +632,10 @@ L_bn_div_words_begin: .align 4 _bn_add_words: L_bn_add_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -817,10 +817,10 @@ L025aw_end: .align 4 _bn_sub_words: L_bn_sub_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1002,10 +1002,10 @@ L028aw_end: .align 4 _bn_sub_part_words: L_bn_sub_part_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/co-586.S b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/co-586.S index 4dfecb94fdb065..27f2f64b7daca4 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/co-586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/co-586.S @@ -3,10 +3,10 @@ .align 4 _bn_mul_comba8: L_bn_mul_comba8_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi movl 12(%esp),%esi @@ -550,10 +550,10 @@ L_bn_mul_comba8_begin: .align 4 _bn_mul_comba4: L_bn_mul_comba4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi movl 12(%esp),%esi @@ -721,10 +721,10 @@ L_bn_mul_comba4_begin: .align 4 _bn_sqr_comba8: L_bn_sqr_comba8_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1132,10 +1132,10 @@ L_bn_sqr_comba8_begin: .align 4 _bn_sqr_comba4: L_bn_sqr_comba4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/x86-gf2m.S b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/x86-gf2m.S index 92bdaeac9b1c0e..7e31dadc183bf4 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/x86-gf2m.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/x86-gf2m.S @@ -1,10 +1,10 @@ .text .align 4 __mul_1x1_mmx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif subl $36,%esp movl %eax,%ecx @@ -107,10 +107,10 @@ __mul_1x1_mmx: ret .align 4 __mul_1x1_ialu: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif subl $36,%esp movl %eax,%ecx @@ -244,10 +244,10 @@ __mul_1x1_ialu: .align 4 _bn_GF2m_mul_2x2: L_bn_GF2m_mul_2x2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L000PIC_me_up L000PIC_me_up: diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/x86-mont.S b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/x86-mont.S index 7bca500149ee8d..4f5eef0e0fd2b6 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/x86-mont.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/x86-mont.S @@ -3,10 +3,10 @@ .align 4 _bn_mul_mont: L_bn_mul_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx 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 9e690dbea0a857..23241e4076a384 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin-i386-cc" -#define DATE "built on: Mon Sep 30 17:07:34 2024 UTC" +#define DATE "built on: Mon Mar 3 17:40:05 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/camellia/cmll-x86.S b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/camellia/cmll-x86.S index 088d99e8826e44..d28a91962765c2 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/camellia/cmll-x86.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/camellia/cmll-x86.S @@ -3,10 +3,10 @@ .align 4 _Camellia_EncryptBlock_Rounds: L_Camellia_EncryptBlock_Rounds_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -60,10 +60,10 @@ L000pic_point: .align 4 _Camellia_EncryptBlock: L_Camellia_EncryptBlock_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $128,%eax subl 4(%esp),%eax @@ -75,10 +75,10 @@ L_Camellia_EncryptBlock_begin: .align 4 _Camellia_encrypt: L_Camellia_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -130,10 +130,10 @@ L001pic_point: ret .align 4 __x86_Camellia_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl (%edi),%eax xorl 4(%edi),%ebx @@ -363,10 +363,10 @@ L003done: .align 4 _Camellia_DecryptBlock_Rounds: L_Camellia_DecryptBlock_Rounds_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -420,10 +420,10 @@ L004pic_point: .align 4 _Camellia_DecryptBlock: L_Camellia_DecryptBlock_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $128,%eax subl 4(%esp),%eax @@ -435,10 +435,10 @@ L_Camellia_DecryptBlock_begin: .align 4 _Camellia_decrypt: L_Camellia_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -490,10 +490,10 @@ L005pic_point: ret .align 4 __x86_Camellia_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl (%edi),%eax xorl 4(%edi),%ebx @@ -723,10 +723,10 @@ L007done: .align 4 _Camellia_Ekeygen: L_Camellia_Ekeygen_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1567,10 +1567,10 @@ L013done: .align 4 _Camellia_set_key: L_Camellia_set_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ecx @@ -2122,10 +2122,10 @@ LCamellia_SBOX: .align 4 _Camellia_cbc_encrypt: L_Camellia_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/chacha/chacha-x86.S b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/chacha/chacha-x86.S index fcc5df1948bf90..5f9bf22a9b3b65 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/chacha/chacha-x86.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/chacha/chacha-x86.S @@ -3,10 +3,10 @@ .align 4 _ChaCha20_ctr32: L_ChaCha20_ctr32_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -379,10 +379,10 @@ L000no_data: .align 4 _ChaCha20_ssse3: L_ChaCha20_ssse3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -974,10 +974,10 @@ Lssse3_data: .align 4 _ChaCha20_xop: L_ChaCha20_xop_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/des/crypt586.S b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/des/crypt586.S index e059424feeea5c..034b257524f87e 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/des/crypt586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/des/crypt586.S @@ -3,10 +3,10 @@ .align 4 _fcrypt_body: L_fcrypt_body_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/des/des-586.S b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/des/des-586.S index a0489166c7628c..be8f83c1454c9e 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/des/des-586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/des/des-586.S @@ -2,10 +2,10 @@ .globl _DES_SPtrans .align 4 __x86_DES_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ecx # Round 0 @@ -476,10 +476,10 @@ __x86_DES_encrypt: ret .align 4 __x86_DES_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ecx # Round 15 @@ -952,10 +952,10 @@ __x86_DES_decrypt: .align 4 _DES_encrypt1: L_DES_encrypt1_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1068,10 +1068,10 @@ L002done: .align 4 _DES_encrypt2: L_DES_encrypt2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1114,10 +1114,10 @@ L005done: .align 4 _DES_encrypt3: L_DES_encrypt3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ebx @@ -1238,10 +1238,10 @@ L_DES_encrypt3_begin: .align 4 _DES_decrypt3: L_DES_decrypt3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ebx @@ -1362,10 +1362,10 @@ L_DES_decrypt3_begin: .align 4 _DES_ncbc_encrypt: L_DES_ncbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -1428,55 +1428,55 @@ L010PIC_point: xorl %edx,%edx jmp *%ebp L012ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx L013ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh L014ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl L015ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp L016ejend L017ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx L018ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch L019ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl L016ejend: @@ -1580,10 +1580,10 @@ L011cbc_enc_jmp_table: .align 4 _DES_ede3_cbc_encrypt: L_DES_ede3_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -1650,55 +1650,55 @@ L034PIC_point: xorl %edx,%edx jmp *%ebp L036ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx L037ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh L038ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl L039ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp L040ejend L041ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx L042ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch L043ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl L040ejend: diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/ec/ecp_nistz256-x86.S b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/ec/ecp_nistz256-x86.S index 821f4fc126e702..b689c73ff53935 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/ec/ecp_nistz256-x86.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/ec/ecp_nistz256-x86.S @@ -2386,10 +2386,10 @@ LONE: .align 4 _ecp_nistz256_mul_by_2: L_ecp_nistz256_mul_by_2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2408,10 +2408,10 @@ L_ecp_nistz256_mul_by_2_begin: .align 4 _ecp_nistz256_mul_by_3: L_ecp_nistz256_mul_by_3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2436,10 +2436,10 @@ L_ecp_nistz256_mul_by_3_begin: .align 4 _ecp_nistz256_div_by_2: L_ecp_nistz256_div_by_2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2455,10 +2455,10 @@ L_ecp_nistz256_div_by_2_begin: ret .align 4 __ecp_nistz256_div_by_2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ebp xorl %edx,%edx @@ -2541,10 +2541,10 @@ __ecp_nistz256_div_by_2: .align 4 _ecp_nistz256_add: L_ecp_nistz256_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2561,10 +2561,10 @@ L_ecp_nistz256_add_begin: ret .align 4 __ecp_nistz256_add: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%eax movl 4(%esi),%ebx @@ -2641,10 +2641,10 @@ __ecp_nistz256_add: .align 4 _ecp_nistz256_sub: L_ecp_nistz256_sub_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2661,10 +2661,10 @@ L_ecp_nistz256_sub_begin: ret .align 4 __ecp_nistz256_sub: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%eax movl 4(%esi),%ebx @@ -2722,10 +2722,10 @@ __ecp_nistz256_sub: .align 4 _ecp_nistz256_neg: L_ecp_nistz256_neg_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2753,10 +2753,10 @@ L_ecp_nistz256_neg_begin: ret .align 4 __picup_eax: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esp),%eax ret @@ -2764,10 +2764,10 @@ __picup_eax: .align 4 _ecp_nistz256_to_mont: L_ecp_nistz256_to_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2790,10 +2790,10 @@ L000pic: .align 4 _ecp_nistz256_from_mont: L_ecp_nistz256_from_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2816,10 +2816,10 @@ L001pic: .align 4 _ecp_nistz256_mul_mont: L_ecp_nistz256_mul_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2842,10 +2842,10 @@ L002pic: .align 4 _ecp_nistz256_sqr_mont: L_ecp_nistz256_sqr_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2866,10 +2866,10 @@ L003pic: ret .align 4 __ecp_nistz256_mul_mont: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif andl $83886080,%eax cmpl $83886080,%eax @@ -3766,10 +3766,10 @@ L004mul_mont_ialu: .align 4 _ecp_nistz256_scatter_w5: L_ecp_nistz256_scatter_w5_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3802,10 +3802,10 @@ L006scatter_w5_loop: .align 4 _ecp_nistz256_gather_w5: L_ecp_nistz256_gather_w5_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3899,10 +3899,10 @@ L_ecp_nistz256_gather_w5_begin: .align 4 _ecp_nistz256_scatter_w7: L_ecp_nistz256_scatter_w7_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3933,10 +3933,10 @@ L007scatter_w7_loop: .align 4 _ecp_nistz256_gather_w7: L_ecp_nistz256_gather_w7_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4150,10 +4150,10 @@ L_ecp_nistz256_gather_w7_begin: .align 4 _ecp_nistz256_point_double: L_ecp_nistz256_point_double_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4279,10 +4279,10 @@ Lpoint_double_shortcut: .align 4 _ecp_nistz256_point_add: L_ecp_nistz256_point_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4795,10 +4795,10 @@ L012add_done: .align 4 _ecp_nistz256_point_add_affine: L_ecp_nistz256_point_add_affine_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/md5/md5-586.S b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/md5/md5-586.S index 9ee5a8d80b6826..3b6e2bcd680320 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/md5/md5-586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/md5/md5-586.S @@ -3,10 +3,10 @@ .align 4 _ossl_md5_block_asm_data_order: L_ossl_md5_block_asm_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/modes/ghash-x86.S b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/modes/ghash-x86.S index e06d1f7a01ebe7..af9992b1339fae 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/modes/ghash-x86.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/modes/ghash-x86.S @@ -3,10 +3,10 @@ .align 4 _gcm_gmult_4bit_x86: L_gcm_gmult_4bit_x86_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -100,10 +100,10 @@ L001x86_break: .align 4 _gcm_ghash_4bit_x86: L_gcm_ghash_4bit_x86_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -212,10 +212,10 @@ L004x86_break: .align 4 _gcm_gmult_4bit_mmx: L_gcm_gmult_4bit_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -314,10 +314,10 @@ L007mmx_break: .align 4 _gcm_ghash_4bit_mmx: L_gcm_ghash_4bit_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -921,10 +921,10 @@ L009outer: .align 4 _gcm_init_clmul: L_gcm_init_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax @@ -993,10 +993,10 @@ L010pic: .align 4 _gcm_gmult_clmul: L_gcm_gmult_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%edx @@ -1049,10 +1049,10 @@ L011pic: .align 4 _gcm_ghash_clmul: L_gcm_ghash_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/poly1305/poly1305-x86.S b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/poly1305/poly1305-x86.S index 96cf0c9fe941f6..a875d95c19fd79 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/poly1305/poly1305-x86.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/poly1305/poly1305-x86.S @@ -4,10 +4,10 @@ .align 4 _poly1305_init: L_poly1305_init_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -68,10 +68,10 @@ L000nokey: .align 4 _poly1305_blocks: L_poly1305_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -239,10 +239,10 @@ L003nodata: .align 4 _poly1305_emit: L_poly1305_emit_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -301,10 +301,10 @@ Lenter_emit: .align 5,0x90 .align 4 __poly1305_init_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqu 24(%edi),%xmm4 leal 48(%edi),%edi @@ -506,10 +506,10 @@ L006square_break: .align 5,0x90 .align 4 __poly1305_blocks_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1270,10 +1270,10 @@ L007nodata: .align 5,0x90 .align 4 __poly1305_emit_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1366,10 +1366,10 @@ __poly1305_emit_sse2: .align 5,0x90 .align 4 __poly1305_init_avx2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif vmovdqu 24(%edi),%xmm4 leal 48(%edi),%edi @@ -1540,10 +1540,10 @@ L019square_break: .align 5,0x90 .align 4 __poly1305_blocks_avx2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/rc4/rc4-586.S b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/rc4/rc4-586.S index 38098085523f56..36f7dcd44c6ab0 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/rc4/rc4-586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/rc4/rc4-586.S @@ -3,10 +3,10 @@ .align 4 _RC4: L_RC4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -272,10 +272,10 @@ L000abort: .align 4 _RC4_set_key: L_RC4_set_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -353,10 +353,10 @@ L015exit: .align 4 _RC4_options: L_RC4_options_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L018pic_point L018pic_point: diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/ripemd/rmd-586.S b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/ripemd/rmd-586.S index 2c284c730a1df4..e03283ada03f90 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/ripemd/rmd-586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/ripemd/rmd-586.S @@ -3,10 +3,10 @@ .align 4 _ripemd160_block_asm_data_order: L_ripemd160_block_asm_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/sha/sha1-586.S b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/sha/sha1-586.S index feb96c11a57097..b7b5798f35b7ea 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/sha/sha1-586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/sha/sha1-586.S @@ -3,10 +3,10 @@ .align 4 _sha1_block_data_order: L_sha1_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1400,10 +1400,10 @@ L002loop: ret .align 4 __sha1_block_data_order_shaext: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1573,10 +1573,10 @@ L004loop_shaext: ret .align 4 __sha1_block_data_order_ssse3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2795,10 +2795,10 @@ L007done: ret .align 4 __sha1_block_data_order_avx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/sha/sha256-586.S b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/sha/sha256-586.S index e1dfe28d26e5bb..20b89b47789a06 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/sha/sha256-586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/sha/sha256-586.S @@ -3,10 +3,10 @@ .align 4 _sha256_block_data_order: L_sha256_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/sha/sha512-586.S b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/sha/sha512-586.S index f9eb6e28565e9e..aac95a47bc4907 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/sha/sha512-586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/sha/sha512-586.S @@ -3,10 +3,10 @@ .align 4 _sha512_block_data_order: L_sha512_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/whrlpool/wp-mmx.S b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/whrlpool/wp-mmx.S index 9804d68ba98858..0d1c56212376bb 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/whrlpool/wp-mmx.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/whrlpool/wp-mmx.S @@ -3,10 +3,10 @@ .align 4 _whirlpool_block_mmx: L_whirlpool_block_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/x86cpuid.S b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/x86cpuid.S index 8e0719f379c608..aecd5dd75fb9d7 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/x86cpuid.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/x86cpuid.S @@ -3,10 +3,10 @@ .align 4 _OPENSSL_ia32_cpuid: L_OPENSSL_ia32_cpuid_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -150,10 +150,10 @@ L000nocpuid: .align 4 _OPENSSL_rdtsc: L_OPENSSL_rdtsc_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl %eax,%eax xorl %edx,%edx @@ -170,10 +170,10 @@ L010notsc: .align 4 _OPENSSL_instrument_halt: L_OPENSSL_instrument_halt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L011PIC_me_up L011PIC_me_up: @@ -205,10 +205,10 @@ L012nohalt: .align 4 _OPENSSL_far_spin: L_OPENSSL_far_spin_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushfl popl %eax @@ -235,10 +235,10 @@ L013nospin: .align 4 _OPENSSL_wipe_cpu: L_OPENSSL_wipe_cpu_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl %eax,%eax xorl %edx,%edx @@ -269,10 +269,10 @@ L016no_x87: .align 4 _OPENSSL_atomic_add: L_OPENSSL_atomic_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%ecx @@ -291,10 +291,10 @@ L018spin: .align 4 _OPENSSL_cleanse: L_OPENSSL_cleanse_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%ecx @@ -331,10 +331,10 @@ L022aligned: .align 4 _CRYPTO_memcmp: L_CRYPTO_memcmp_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -363,10 +363,10 @@ L023no_data: .align 4 _OPENSSL_instrument_bus: L_OPENSSL_instrument_bus_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -414,10 +414,10 @@ L026nogo: .align 4 _OPENSSL_instrument_bus2: L_OPENSSL_instrument_bus2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -478,10 +478,10 @@ L029nogo: .align 4 _OPENSSL_ia32_rdrand_bytes: L_OPENSSL_ia32_rdrand_bytes_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %ebx @@ -524,10 +524,10 @@ L032done: .align 4 _OPENSSL_ia32_rdseed_bytes: L_OPENSSL_ia32_rdseed_bytes_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/engines/e_padlock-x86.S b/deps/openssl/config/archs/darwin-i386-cc/asm/engines/e_padlock-x86.S index 9b7ebf7ad1c4f9..26efbeac9c843c 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/engines/e_padlock-x86.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/engines/e_padlock-x86.S @@ -3,10 +3,10 @@ .align 4 _padlock_capability: L_padlock_capability_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx pushfl @@ -66,10 +66,10 @@ L000noluck: .align 4 _padlock_key_bswap: L_padlock_key_bswap_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 240(%edx),%ecx @@ -87,10 +87,10 @@ L003bswap_loop: .align 4 _padlock_verify_context: L_padlock_verify_context_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx leal Lpadlock_saved_context-L004verify_pic_point,%eax @@ -101,10 +101,10 @@ L004verify_pic_point: ret .align 4 __padlock_verify_ctx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%eax btl $30,4(%esp) @@ -120,10 +120,10 @@ L005verified: .align 4 _padlock_reload_key: L_padlock_reload_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushfl popfl @@ -132,10 +132,10 @@ L_padlock_reload_key_begin: .align 4 _padlock_aes_block: L_padlock_aes_block_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -155,10 +155,10 @@ L_padlock_aes_block_begin: .align 4 _padlock_ecb_encrypt: L_padlock_ecb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -337,10 +337,10 @@ L006ecb_abort: .align 4 _padlock_cbc_encrypt: L_padlock_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -523,10 +523,10 @@ L018cbc_abort: .align 4 _padlock_cfb_encrypt: L_padlock_cfb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -648,10 +648,10 @@ L030cfb_abort: .align 4 _padlock_ofb_encrypt: L_padlock_ofb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -773,10 +773,10 @@ L039ofb_abort: .align 4 _padlock_ctr32_encrypt: L_padlock_ctr32_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -883,10 +883,10 @@ L048ctr32_abort: .align 4 _padlock_xstore: L_padlock_xstore_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi movl 8(%esp),%edi @@ -896,10 +896,10 @@ L_padlock_xstore_begin: ret .align 4 __win32_segv_handler: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $1,%eax movl 4(%esp),%edx @@ -914,10 +914,10 @@ L055ret: .align 4 _padlock_sha1_oneshot: L_padlock_sha1_oneshot_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -948,10 +948,10 @@ L_padlock_sha1_oneshot_begin: .align 4 _padlock_sha1_blocks: L_padlock_sha1_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -981,10 +981,10 @@ L_padlock_sha1_blocks_begin: .align 4 _padlock_sha256_oneshot: L_padlock_sha256_oneshot_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -1015,10 +1015,10 @@ L_padlock_sha256_oneshot_begin: .align 4 _padlock_sha256_blocks: L_padlock_sha256_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -1048,10 +1048,10 @@ L_padlock_sha256_blocks_begin: .align 4 _padlock_sha512_blocks: L_padlock_sha512_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/ssl.h b/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/include/progs.h b/deps/openssl/config/archs/darwin-i386-cc/asm/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/include/progs.h +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/openssl.gypi b/deps/openssl/config/archs/darwin-i386-cc/asm/openssl.gypi index 1fac08080709a0..49b8dd0ee2b6ab 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/openssl.gypi +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/apps/progs.c b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/apps/progs.c +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/configdata.pm b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/configdata.pm index 0b7a603aa08014..f7902dadf5d0b2 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 @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,10 +206,10 @@ our %config = ( ], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -258,11 +258,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "darwin-i386-cc", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -388,7 +388,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -891,6 +890,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1047,9 +1049,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3486,9 +3485,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5880,9 +5876,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7257,6 +7250,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7465,10 +7462,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10271,7 +10264,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10322,7 +10314,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12525,9 +12516,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14919,9 +14907,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16272,10 +16257,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16871,7 +16852,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18322,6 +18302,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18484,9 +18468,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19859,7 +19840,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20193,6 +20173,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20245,7 +20226,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24449,7 +24429,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24476,7 +24455,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25725,9 +25703,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25809,9 +25784,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25942,6 +25914,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26254,12 +26232,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27646,8 +27618,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27674,7 +27646,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27691,8 +27663,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27710,7 +27682,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27732,7 +27704,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/aes/aes-586.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/aes/aes-586.S index f474c45fde8a8f..e0eafe83fec395 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/aes/aes-586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/aes/aes-586.S @@ -1,10 +1,10 @@ .text .align 4 __x86_AES_encrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -263,10 +263,10 @@ L000loop: ret .align 4 __sse_AES_encrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pxor (%edi),%mm0 pxor 8(%edi),%mm4 @@ -423,10 +423,10 @@ L002out: ret .align 4 __x86_AES_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -976,10 +976,10 @@ LAES_Te: .align 4 _AES_encrypt: L_AES_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1042,10 +1042,10 @@ L005x86: ret .align 4 __x86_AES_decrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -1400,10 +1400,10 @@ L006loop: ret .align 4 __sse_AES_decrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pxor (%edi),%mm0 pxor 8(%edi),%mm4 @@ -1619,10 +1619,10 @@ L008out: ret .align 4 __x86_AES_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -2176,10 +2176,10 @@ LAES_Td: .align 4 _AES_decrypt: L_AES_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2244,10 +2244,10 @@ L011x86: .align 4 _AES_cbc_encrypt: L_AES_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2778,10 +2778,10 @@ L039slow_dec_partial_x86: ret .align 4 __x86_AES_set_encrypt_key: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3013,10 +3013,10 @@ L045exit: .align 4 _AES_set_encrypt_key: L_AES_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call __x86_AES_set_encrypt_key ret @@ -3024,10 +3024,10 @@ L_AES_set_encrypt_key_begin: .align 4 _AES_set_decrypt_key: L_AES_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call __x86_AES_set_encrypt_key cmpl $0,%eax diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/aes/aesni-x86.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/aes/aesni-x86.S index 7a23ba9595c312..cfb2150e42dce4 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/aes/aesni-x86.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/aes/aesni-x86.S @@ -3,10 +3,10 @@ .align 4 _aesni_encrypt: L_aesni_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 12(%esp),%edx @@ -33,10 +33,10 @@ L000enc1_loop_1: .align 4 _aesni_decrypt: L_aesni_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 12(%esp),%edx @@ -61,10 +61,10 @@ L001dec1_loop_2: ret .align 4 __aesni_encrypt2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -91,10 +91,10 @@ L002enc2_loop: ret .align 4 __aesni_decrypt2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -121,10 +121,10 @@ L003dec2_loop: ret .align 4 __aesni_encrypt3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -156,10 +156,10 @@ L004enc3_loop: ret .align 4 __aesni_decrypt3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -191,10 +191,10 @@ L005dec3_loop: ret .align 4 __aesni_encrypt4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 movups 16(%edx),%xmm1 @@ -232,10 +232,10 @@ L006enc4_loop: ret .align 4 __aesni_decrypt4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 movups 16(%edx),%xmm1 @@ -273,10 +273,10 @@ L007dec4_loop: ret .align 4 __aesni_encrypt6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -330,10 +330,10 @@ L_aesni_encrypt6_enter: ret .align 4 __aesni_decrypt6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -389,10 +389,10 @@ L_aesni_decrypt6_enter: .align 4 _aesni_ecb_encrypt: L_aesni_ecb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -627,10 +627,10 @@ L012ecb_ret: .align 4 _aesni_ccm64_encrypt_blocks: L_aesni_ccm64_encrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -718,10 +718,10 @@ L031ccm64_enc2_loop: .align 4 _aesni_ccm64_decrypt_blocks: L_aesni_ccm64_decrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -844,10 +844,10 @@ L036enc1_loop_6: .align 4 _aesni_ctr32_encrypt_blocks: L_aesni_ctr32_encrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1085,10 +1085,10 @@ L040ctr32_ret: .align 4 _aesni_xts_encrypt: L_aesni_xts_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1448,10 +1448,10 @@ L056xts_enc_ret: .align 4 _aesni_xts_decrypt: L_aesni_xts_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1841,10 +1841,10 @@ L069xts_dec_ret: .align 4 _aesni_ocb_encrypt: L_aesni_ocb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2239,10 +2239,10 @@ L078done: .align 4 _aesni_ocb_decrypt: L_aesni_ocb_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2637,10 +2637,10 @@ L088done: .align 4 _aesni_cbc_encrypt: L_aesni_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2899,10 +2899,10 @@ L094cbc_abort: ret .align 4 __aesni_set_encrypt_key: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3237,10 +3237,10 @@ L115bad_keybits: .align 4 _aesni_set_encrypt_key: L_aesni_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%ecx @@ -3251,10 +3251,10 @@ L_aesni_set_encrypt_key_begin: .align 4 _aesni_set_decrypt_key: L_aesni_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%ecx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/aes/vpaes-x86.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/aes/vpaes-x86.S index 6e7c3afef0a4e6..8ed38def86a0f8 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/aes/vpaes-x86.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/aes/vpaes-x86.S @@ -58,10 +58,10 @@ L_vpaes_consts: .align 6,0x90 .align 4 __vpaes_preheat: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%ebp movdqa -48(%ebp),%xmm7 @@ -69,10 +69,10 @@ __vpaes_preheat: ret .align 4 __vpaes_encrypt_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $16,%ecx movl 240(%edx),%eax @@ -149,10 +149,10 @@ L000enc_entry: ret .align 4 __vpaes_decrypt_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif leal 608(%ebp),%ebx movl 240(%edx),%eax @@ -240,10 +240,10 @@ L002dec_entry: ret .align 4 __vpaes_schedule_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%ebp movdqu (%esi),%xmm0 @@ -337,10 +337,10 @@ L013schedule_mangle_last_dec: ret .align 4 __vpaes_schedule_192_smear: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pshufd $128,%xmm6,%xmm1 pshufd $254,%xmm7,%xmm0 @@ -352,10 +352,10 @@ __vpaes_schedule_192_smear: ret .align 4 __vpaes_schedule_round: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa 8(%esp),%xmm2 pxor %xmm1,%xmm1 @@ -404,10 +404,10 @@ L_vpaes_schedule_low_round: ret .align 4 __vpaes_schedule_transform: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa -16(%ebp),%xmm2 movdqa %xmm2,%xmm1 @@ -422,10 +422,10 @@ __vpaes_schedule_transform: ret .align 4 __vpaes_schedule_mangle: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa %xmm0,%xmm4 movdqa 128(%ebp),%xmm5 @@ -486,10 +486,10 @@ L015schedule_mangle_both: .align 4 _vpaes_set_encrypt_key: L_vpaes_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -522,10 +522,10 @@ L016pic_point: .align 4 _vpaes_set_decrypt_key: L_vpaes_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -563,10 +563,10 @@ L017pic_point: .align 4 _vpaes_encrypt: L_vpaes_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -595,10 +595,10 @@ L018pic_point: .align 4 _vpaes_decrypt: L_vpaes_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -627,10 +627,10 @@ L019pic_point: .align 4 _vpaes_cbc_encrypt: L_vpaes_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/bf/bf-586.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/bf/bf-586.S index b049ee042681d3..224e82f4fca289 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/bf/bf-586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/bf/bf-586.S @@ -3,10 +3,10 @@ .align 4 _BF_encrypt: L_BF_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -356,10 +356,10 @@ L_BF_encrypt_begin: .align 4 _BF_decrypt: L_BF_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -709,10 +709,10 @@ L_BF_decrypt_begin: .align 4 _BF_cbc_encrypt: L_BF_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -777,55 +777,55 @@ L004PIC_point: xorl %edx,%edx jmp *%ebp L006ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx L007ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh L008ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl L009ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp L010ejend L011ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx L012ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch L013ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl L010ejend: diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/bn/bn-586.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/bn/bn-586.S index 066935dd3b41df..c68e429c858901 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/bn/bn-586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/bn/bn-586.S @@ -3,10 +3,10 @@ .align 4 _bn_mul_add_words: L_bn_mul_add_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L000PIC_me_up L000PIC_me_up: @@ -289,10 +289,10 @@ L009maw_end: .align 4 _bn_mul_words: L_bn_mul_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L010PIC_me_up L010PIC_me_up: @@ -474,10 +474,10 @@ L016mw_end: .align 4 _bn_sqr_words: L_bn_sqr_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L017PIC_me_up L017PIC_me_up: @@ -618,10 +618,10 @@ L022sw_end: .align 4 _bn_div_words: L_bn_div_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax @@ -632,10 +632,10 @@ L_bn_div_words_begin: .align 4 _bn_add_words: L_bn_add_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -817,10 +817,10 @@ L025aw_end: .align 4 _bn_sub_words: L_bn_sub_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1002,10 +1002,10 @@ L028aw_end: .align 4 _bn_sub_part_words: L_bn_sub_part_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/bn/co-586.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/bn/co-586.S index 4dfecb94fdb065..27f2f64b7daca4 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/bn/co-586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/bn/co-586.S @@ -3,10 +3,10 @@ .align 4 _bn_mul_comba8: L_bn_mul_comba8_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi movl 12(%esp),%esi @@ -550,10 +550,10 @@ L_bn_mul_comba8_begin: .align 4 _bn_mul_comba4: L_bn_mul_comba4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi movl 12(%esp),%esi @@ -721,10 +721,10 @@ L_bn_mul_comba4_begin: .align 4 _bn_sqr_comba8: L_bn_sqr_comba8_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1132,10 +1132,10 @@ L_bn_sqr_comba8_begin: .align 4 _bn_sqr_comba4: L_bn_sqr_comba4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/bn/x86-gf2m.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/bn/x86-gf2m.S index 92bdaeac9b1c0e..7e31dadc183bf4 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/bn/x86-gf2m.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/bn/x86-gf2m.S @@ -1,10 +1,10 @@ .text .align 4 __mul_1x1_mmx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif subl $36,%esp movl %eax,%ecx @@ -107,10 +107,10 @@ __mul_1x1_mmx: ret .align 4 __mul_1x1_ialu: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif subl $36,%esp movl %eax,%ecx @@ -244,10 +244,10 @@ __mul_1x1_ialu: .align 4 _bn_GF2m_mul_2x2: L_bn_GF2m_mul_2x2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L000PIC_me_up L000PIC_me_up: diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/bn/x86-mont.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/bn/x86-mont.S index 7bca500149ee8d..4f5eef0e0fd2b6 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/bn/x86-mont.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/bn/x86-mont.S @@ -3,10 +3,10 @@ .align 4 _bn_mul_mont: L_bn_mul_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx 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 f0fc131a0ac265..6f0bac530eb7db 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin-i386-cc" -#define DATE "built on: Mon Sep 30 17:07:47 2024 UTC" +#define DATE "built on: Mon Mar 3 17:40:13 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/camellia/cmll-x86.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/camellia/cmll-x86.S index 088d99e8826e44..d28a91962765c2 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/camellia/cmll-x86.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/camellia/cmll-x86.S @@ -3,10 +3,10 @@ .align 4 _Camellia_EncryptBlock_Rounds: L_Camellia_EncryptBlock_Rounds_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -60,10 +60,10 @@ L000pic_point: .align 4 _Camellia_EncryptBlock: L_Camellia_EncryptBlock_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $128,%eax subl 4(%esp),%eax @@ -75,10 +75,10 @@ L_Camellia_EncryptBlock_begin: .align 4 _Camellia_encrypt: L_Camellia_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -130,10 +130,10 @@ L001pic_point: ret .align 4 __x86_Camellia_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl (%edi),%eax xorl 4(%edi),%ebx @@ -363,10 +363,10 @@ L003done: .align 4 _Camellia_DecryptBlock_Rounds: L_Camellia_DecryptBlock_Rounds_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -420,10 +420,10 @@ L004pic_point: .align 4 _Camellia_DecryptBlock: L_Camellia_DecryptBlock_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $128,%eax subl 4(%esp),%eax @@ -435,10 +435,10 @@ L_Camellia_DecryptBlock_begin: .align 4 _Camellia_decrypt: L_Camellia_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -490,10 +490,10 @@ L005pic_point: ret .align 4 __x86_Camellia_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl (%edi),%eax xorl 4(%edi),%ebx @@ -723,10 +723,10 @@ L007done: .align 4 _Camellia_Ekeygen: L_Camellia_Ekeygen_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1567,10 +1567,10 @@ L013done: .align 4 _Camellia_set_key: L_Camellia_set_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ecx @@ -2122,10 +2122,10 @@ LCamellia_SBOX: .align 4 _Camellia_cbc_encrypt: L_Camellia_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/chacha/chacha-x86.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/chacha/chacha-x86.S index fcc5df1948bf90..5f9bf22a9b3b65 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/chacha/chacha-x86.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/chacha/chacha-x86.S @@ -3,10 +3,10 @@ .align 4 _ChaCha20_ctr32: L_ChaCha20_ctr32_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -379,10 +379,10 @@ L000no_data: .align 4 _ChaCha20_ssse3: L_ChaCha20_ssse3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -974,10 +974,10 @@ Lssse3_data: .align 4 _ChaCha20_xop: L_ChaCha20_xop_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/des/crypt586.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/des/crypt586.S index e059424feeea5c..034b257524f87e 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/des/crypt586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/des/crypt586.S @@ -3,10 +3,10 @@ .align 4 _fcrypt_body: L_fcrypt_body_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/des/des-586.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/des/des-586.S index a0489166c7628c..be8f83c1454c9e 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/des/des-586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/des/des-586.S @@ -2,10 +2,10 @@ .globl _DES_SPtrans .align 4 __x86_DES_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ecx # Round 0 @@ -476,10 +476,10 @@ __x86_DES_encrypt: ret .align 4 __x86_DES_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ecx # Round 15 @@ -952,10 +952,10 @@ __x86_DES_decrypt: .align 4 _DES_encrypt1: L_DES_encrypt1_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1068,10 +1068,10 @@ L002done: .align 4 _DES_encrypt2: L_DES_encrypt2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1114,10 +1114,10 @@ L005done: .align 4 _DES_encrypt3: L_DES_encrypt3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ebx @@ -1238,10 +1238,10 @@ L_DES_encrypt3_begin: .align 4 _DES_decrypt3: L_DES_decrypt3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ebx @@ -1362,10 +1362,10 @@ L_DES_decrypt3_begin: .align 4 _DES_ncbc_encrypt: L_DES_ncbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -1428,55 +1428,55 @@ L010PIC_point: xorl %edx,%edx jmp *%ebp L012ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx L013ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh L014ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl L015ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp L016ejend L017ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx L018ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch L019ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl L016ejend: @@ -1580,10 +1580,10 @@ L011cbc_enc_jmp_table: .align 4 _DES_ede3_cbc_encrypt: L_DES_ede3_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -1650,55 +1650,55 @@ L034PIC_point: xorl %edx,%edx jmp *%ebp L036ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx L037ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh L038ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl L039ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp L040ejend L041ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx L042ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch L043ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl L040ejend: diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/ec/ecp_nistz256-x86.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/ec/ecp_nistz256-x86.S index 821f4fc126e702..b689c73ff53935 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/ec/ecp_nistz256-x86.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/ec/ecp_nistz256-x86.S @@ -2386,10 +2386,10 @@ LONE: .align 4 _ecp_nistz256_mul_by_2: L_ecp_nistz256_mul_by_2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2408,10 +2408,10 @@ L_ecp_nistz256_mul_by_2_begin: .align 4 _ecp_nistz256_mul_by_3: L_ecp_nistz256_mul_by_3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2436,10 +2436,10 @@ L_ecp_nistz256_mul_by_3_begin: .align 4 _ecp_nistz256_div_by_2: L_ecp_nistz256_div_by_2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2455,10 +2455,10 @@ L_ecp_nistz256_div_by_2_begin: ret .align 4 __ecp_nistz256_div_by_2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ebp xorl %edx,%edx @@ -2541,10 +2541,10 @@ __ecp_nistz256_div_by_2: .align 4 _ecp_nistz256_add: L_ecp_nistz256_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2561,10 +2561,10 @@ L_ecp_nistz256_add_begin: ret .align 4 __ecp_nistz256_add: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%eax movl 4(%esi),%ebx @@ -2641,10 +2641,10 @@ __ecp_nistz256_add: .align 4 _ecp_nistz256_sub: L_ecp_nistz256_sub_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2661,10 +2661,10 @@ L_ecp_nistz256_sub_begin: ret .align 4 __ecp_nistz256_sub: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%eax movl 4(%esi),%ebx @@ -2722,10 +2722,10 @@ __ecp_nistz256_sub: .align 4 _ecp_nistz256_neg: L_ecp_nistz256_neg_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2753,10 +2753,10 @@ L_ecp_nistz256_neg_begin: ret .align 4 __picup_eax: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esp),%eax ret @@ -2764,10 +2764,10 @@ __picup_eax: .align 4 _ecp_nistz256_to_mont: L_ecp_nistz256_to_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2790,10 +2790,10 @@ L000pic: .align 4 _ecp_nistz256_from_mont: L_ecp_nistz256_from_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2816,10 +2816,10 @@ L001pic: .align 4 _ecp_nistz256_mul_mont: L_ecp_nistz256_mul_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2842,10 +2842,10 @@ L002pic: .align 4 _ecp_nistz256_sqr_mont: L_ecp_nistz256_sqr_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2866,10 +2866,10 @@ L003pic: ret .align 4 __ecp_nistz256_mul_mont: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif andl $83886080,%eax cmpl $83886080,%eax @@ -3766,10 +3766,10 @@ L004mul_mont_ialu: .align 4 _ecp_nistz256_scatter_w5: L_ecp_nistz256_scatter_w5_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3802,10 +3802,10 @@ L006scatter_w5_loop: .align 4 _ecp_nistz256_gather_w5: L_ecp_nistz256_gather_w5_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3899,10 +3899,10 @@ L_ecp_nistz256_gather_w5_begin: .align 4 _ecp_nistz256_scatter_w7: L_ecp_nistz256_scatter_w7_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3933,10 +3933,10 @@ L007scatter_w7_loop: .align 4 _ecp_nistz256_gather_w7: L_ecp_nistz256_gather_w7_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4150,10 +4150,10 @@ L_ecp_nistz256_gather_w7_begin: .align 4 _ecp_nistz256_point_double: L_ecp_nistz256_point_double_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4279,10 +4279,10 @@ Lpoint_double_shortcut: .align 4 _ecp_nistz256_point_add: L_ecp_nistz256_point_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4795,10 +4795,10 @@ L012add_done: .align 4 _ecp_nistz256_point_add_affine: L_ecp_nistz256_point_add_affine_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/md5/md5-586.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/md5/md5-586.S index 9ee5a8d80b6826..3b6e2bcd680320 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/md5/md5-586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/md5/md5-586.S @@ -3,10 +3,10 @@ .align 4 _ossl_md5_block_asm_data_order: L_ossl_md5_block_asm_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/modes/ghash-x86.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/modes/ghash-x86.S index e06d1f7a01ebe7..af9992b1339fae 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/modes/ghash-x86.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/modes/ghash-x86.S @@ -3,10 +3,10 @@ .align 4 _gcm_gmult_4bit_x86: L_gcm_gmult_4bit_x86_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -100,10 +100,10 @@ L001x86_break: .align 4 _gcm_ghash_4bit_x86: L_gcm_ghash_4bit_x86_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -212,10 +212,10 @@ L004x86_break: .align 4 _gcm_gmult_4bit_mmx: L_gcm_gmult_4bit_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -314,10 +314,10 @@ L007mmx_break: .align 4 _gcm_ghash_4bit_mmx: L_gcm_ghash_4bit_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -921,10 +921,10 @@ L009outer: .align 4 _gcm_init_clmul: L_gcm_init_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax @@ -993,10 +993,10 @@ L010pic: .align 4 _gcm_gmult_clmul: L_gcm_gmult_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%edx @@ -1049,10 +1049,10 @@ L011pic: .align 4 _gcm_ghash_clmul: L_gcm_ghash_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/poly1305/poly1305-x86.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/poly1305/poly1305-x86.S index 96cf0c9fe941f6..a875d95c19fd79 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/poly1305/poly1305-x86.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/poly1305/poly1305-x86.S @@ -4,10 +4,10 @@ .align 4 _poly1305_init: L_poly1305_init_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -68,10 +68,10 @@ L000nokey: .align 4 _poly1305_blocks: L_poly1305_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -239,10 +239,10 @@ L003nodata: .align 4 _poly1305_emit: L_poly1305_emit_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -301,10 +301,10 @@ Lenter_emit: .align 5,0x90 .align 4 __poly1305_init_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqu 24(%edi),%xmm4 leal 48(%edi),%edi @@ -506,10 +506,10 @@ L006square_break: .align 5,0x90 .align 4 __poly1305_blocks_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1270,10 +1270,10 @@ L007nodata: .align 5,0x90 .align 4 __poly1305_emit_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1366,10 +1366,10 @@ __poly1305_emit_sse2: .align 5,0x90 .align 4 __poly1305_init_avx2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif vmovdqu 24(%edi),%xmm4 leal 48(%edi),%edi @@ -1540,10 +1540,10 @@ L019square_break: .align 5,0x90 .align 4 __poly1305_blocks_avx2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/rc4/rc4-586.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/rc4/rc4-586.S index 38098085523f56..36f7dcd44c6ab0 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/rc4/rc4-586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/rc4/rc4-586.S @@ -3,10 +3,10 @@ .align 4 _RC4: L_RC4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -272,10 +272,10 @@ L000abort: .align 4 _RC4_set_key: L_RC4_set_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -353,10 +353,10 @@ L015exit: .align 4 _RC4_options: L_RC4_options_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L018pic_point L018pic_point: diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/ripemd/rmd-586.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/ripemd/rmd-586.S index 2c284c730a1df4..e03283ada03f90 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/ripemd/rmd-586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/ripemd/rmd-586.S @@ -3,10 +3,10 @@ .align 4 _ripemd160_block_asm_data_order: L_ripemd160_block_asm_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/sha/sha1-586.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/sha/sha1-586.S index feb96c11a57097..b7b5798f35b7ea 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/sha/sha1-586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/sha/sha1-586.S @@ -3,10 +3,10 @@ .align 4 _sha1_block_data_order: L_sha1_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1400,10 +1400,10 @@ L002loop: ret .align 4 __sha1_block_data_order_shaext: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1573,10 +1573,10 @@ L004loop_shaext: ret .align 4 __sha1_block_data_order_ssse3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2795,10 +2795,10 @@ L007done: ret .align 4 __sha1_block_data_order_avx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/sha/sha256-586.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/sha/sha256-586.S index e1dfe28d26e5bb..20b89b47789a06 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/sha/sha256-586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/sha/sha256-586.S @@ -3,10 +3,10 @@ .align 4 _sha256_block_data_order: L_sha256_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/sha/sha512-586.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/sha/sha512-586.S index f9eb6e28565e9e..aac95a47bc4907 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/sha/sha512-586.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/sha/sha512-586.S @@ -3,10 +3,10 @@ .align 4 _sha512_block_data_order: L_sha512_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/whrlpool/wp-mmx.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/whrlpool/wp-mmx.S index 9804d68ba98858..0d1c56212376bb 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/whrlpool/wp-mmx.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/whrlpool/wp-mmx.S @@ -3,10 +3,10 @@ .align 4 _whirlpool_block_mmx: L_whirlpool_block_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/x86cpuid.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/x86cpuid.S index 8e0719f379c608..aecd5dd75fb9d7 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/x86cpuid.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/x86cpuid.S @@ -3,10 +3,10 @@ .align 4 _OPENSSL_ia32_cpuid: L_OPENSSL_ia32_cpuid_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -150,10 +150,10 @@ L000nocpuid: .align 4 _OPENSSL_rdtsc: L_OPENSSL_rdtsc_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl %eax,%eax xorl %edx,%edx @@ -170,10 +170,10 @@ L010notsc: .align 4 _OPENSSL_instrument_halt: L_OPENSSL_instrument_halt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call L011PIC_me_up L011PIC_me_up: @@ -205,10 +205,10 @@ L012nohalt: .align 4 _OPENSSL_far_spin: L_OPENSSL_far_spin_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushfl popl %eax @@ -235,10 +235,10 @@ L013nospin: .align 4 _OPENSSL_wipe_cpu: L_OPENSSL_wipe_cpu_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl %eax,%eax xorl %edx,%edx @@ -269,10 +269,10 @@ L016no_x87: .align 4 _OPENSSL_atomic_add: L_OPENSSL_atomic_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%ecx @@ -291,10 +291,10 @@ L018spin: .align 4 _OPENSSL_cleanse: L_OPENSSL_cleanse_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%ecx @@ -331,10 +331,10 @@ L022aligned: .align 4 _CRYPTO_memcmp: L_CRYPTO_memcmp_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -363,10 +363,10 @@ L023no_data: .align 4 _OPENSSL_instrument_bus: L_OPENSSL_instrument_bus_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -414,10 +414,10 @@ L026nogo: .align 4 _OPENSSL_instrument_bus2: L_OPENSSL_instrument_bus2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -478,10 +478,10 @@ L029nogo: .align 4 _OPENSSL_ia32_rdrand_bytes: L_OPENSSL_ia32_rdrand_bytes_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %ebx @@ -524,10 +524,10 @@ L032done: .align 4 _OPENSSL_ia32_rdseed_bytes: L_OPENSSL_ia32_rdseed_bytes_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %ebx diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/engines/e_padlock-x86.S b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/engines/e_padlock-x86.S index 9b7ebf7ad1c4f9..26efbeac9c843c 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/engines/e_padlock-x86.S +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/engines/e_padlock-x86.S @@ -3,10 +3,10 @@ .align 4 _padlock_capability: L_padlock_capability_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx pushfl @@ -66,10 +66,10 @@ L000noluck: .align 4 _padlock_key_bswap: L_padlock_key_bswap_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 240(%edx),%ecx @@ -87,10 +87,10 @@ L003bswap_loop: .align 4 _padlock_verify_context: L_padlock_verify_context_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx leal Lpadlock_saved_context-L004verify_pic_point,%eax @@ -101,10 +101,10 @@ L004verify_pic_point: ret .align 4 __padlock_verify_ctx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%eax btl $30,4(%esp) @@ -120,10 +120,10 @@ L005verified: .align 4 _padlock_reload_key: L_padlock_reload_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushfl popfl @@ -132,10 +132,10 @@ L_padlock_reload_key_begin: .align 4 _padlock_aes_block: L_padlock_aes_block_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -155,10 +155,10 @@ L_padlock_aes_block_begin: .align 4 _padlock_ecb_encrypt: L_padlock_ecb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -337,10 +337,10 @@ L006ecb_abort: .align 4 _padlock_cbc_encrypt: L_padlock_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -523,10 +523,10 @@ L018cbc_abort: .align 4 _padlock_cfb_encrypt: L_padlock_cfb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -648,10 +648,10 @@ L030cfb_abort: .align 4 _padlock_ofb_encrypt: L_padlock_ofb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -773,10 +773,10 @@ L039ofb_abort: .align 4 _padlock_ctr32_encrypt: L_padlock_ctr32_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -883,10 +883,10 @@ L048ctr32_abort: .align 4 _padlock_xstore: L_padlock_xstore_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi movl 8(%esp),%edi @@ -896,10 +896,10 @@ L_padlock_xstore_begin: ret .align 4 __win32_segv_handler: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $1,%eax movl 4(%esp),%edx @@ -914,10 +914,10 @@ L055ret: .align 4 _padlock_sha1_oneshot: L_padlock_sha1_oneshot_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -948,10 +948,10 @@ L_padlock_sha1_oneshot_begin: .align 4 _padlock_sha1_blocks: L_padlock_sha1_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -981,10 +981,10 @@ L_padlock_sha1_blocks_begin: .align 4 _padlock_sha256_oneshot: L_padlock_sha256_oneshot_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -1015,10 +1015,10 @@ L_padlock_sha256_oneshot_begin: .align 4 _padlock_sha256_blocks: L_padlock_sha256_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -1048,10 +1048,10 @@ L_padlock_sha256_blocks_begin: .align 4 _padlock_sha512_blocks: L_padlock_sha512_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/progs.h b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl.gypi b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl.gypi index 0f428fdfbb5bd7..1611dce927f3cc 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 @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', diff --git a/deps/openssl/config/archs/darwin-i386-cc/no-asm/apps/progs.c b/deps/openssl/config/archs/darwin-i386-cc/no-asm/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/no-asm/apps/progs.c +++ b/deps/openssl/config/archs/darwin-i386-cc/no-asm/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/darwin-i386-cc/no-asm/configdata.pm b/deps/openssl/config/archs/darwin-i386-cc/no-asm/configdata.pm index 4eafb602153f5e..ec00efff1ea7b4 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 @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [], @@ -154,7 +154,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -205,10 +205,10 @@ our %config = ( ], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -258,11 +258,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "darwin-i386-cc", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -388,7 +388,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -892,6 +891,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1048,9 +1050,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3428,9 +3427,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5822,9 +5818,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7199,6 +7192,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7407,10 +7404,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10191,7 +10184,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10242,7 +10234,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12445,9 +12436,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14839,9 +14827,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16192,10 +16177,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16791,7 +16772,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18242,6 +18222,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18404,9 +18388,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19779,7 +19760,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20113,6 +20093,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20165,7 +20146,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24291,7 +24271,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24318,7 +24297,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25557,9 +25535,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25641,9 +25616,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25774,6 +25746,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26086,12 +26064,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27481,8 +27453,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27509,7 +27481,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27526,8 +27498,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27545,7 +27517,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27567,7 +27539,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by 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 7c35bb03c23c0d..6dfe51fe98835b 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin-i386-cc" -#define DATE "built on: Mon Sep 30 17:08:00 2024 UTC" +#define DATE "built on: Mon Mar 3 17:40:22 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/progs.h b/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/progs.h +++ b/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/darwin-i386-cc/no-asm/openssl.gypi b/deps/openssl/config/archs/darwin-i386-cc/no-asm/openssl.gypi index 7469c552c64729..fb2e7f750ac6fc 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 @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm/apps/progs.c b/deps/openssl/config/archs/darwin64-arm64-cc/asm/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm/apps/progs.c +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm/configdata.pm b/deps/openssl/config/archs/darwin64-arm64-cc/asm/configdata.pm index 877a6b8a253eed..9e0575e1a9baf5 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm/configdata.pm +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm/configdata.pm @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,10 +206,10 @@ our %config = ( ], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -258,11 +258,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "darwin64-arm64-cc", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -388,7 +388,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -891,6 +890,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1047,9 +1049,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3459,9 +3458,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5853,9 +5849,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7230,6 +7223,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7438,10 +7435,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10245,7 +10238,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10296,7 +10288,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12499,9 +12490,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14893,9 +14881,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16246,10 +16231,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16845,7 +16826,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18356,6 +18336,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18518,9 +18502,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19893,7 +19874,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20227,6 +20207,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20279,7 +20260,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24486,7 +24466,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24513,7 +24492,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25763,9 +25741,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25847,9 +25822,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25980,6 +25952,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26292,12 +26270,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27684,8 +27656,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27712,7 +27684,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27729,8 +27701,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27748,7 +27720,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27770,7 +27742,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm/crypto/bn/armv8-mont.S b/deps/openssl/config/archs/darwin64-arm64-cc/asm/crypto/bn/armv8-mont.S index 6fca712c4754a8..adb12afdb1ae24 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm/crypto/bn/armv8-mont.S +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm/crypto/bn/armv8-mont.S @@ -15,10 +15,12 @@ Lbn_mul_mont: cmp x5,#32 b.le Lscalar_impl #ifndef __KERNEL__ +#ifndef __AARCH64EB__ adrp x17,_OPENSSL_armv8_rsa_neonized@PAGE ldr w17,[x17,_OPENSSL_armv8_rsa_neonized@PAGEOFF] cbnz w17, bn_mul8x_mont_neon #endif +#endif Lscalar_impl: tst x5,#7 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 53600343288552..b9d469409c6eda 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin64-arm64-cc" -#define DATE "built on: Mon Sep 30 17:08:11 2024 UTC" +#define DATE "built on: Mon Mar 3 17:40:29 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/ssl.h b/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/progs.h b/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/progs.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm/openssl.gypi b/deps/openssl/config/archs/darwin64-arm64-cc/asm/openssl.gypi index 91173eeb093184..5028c50d6ab6e8 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm/openssl.gypi +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/apps/progs.c b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/apps/progs.c +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/configdata.pm b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/configdata.pm index 3deb53b0966350..10d0bb261298c2 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 @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,10 +206,10 @@ our %config = ( ], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -258,11 +258,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "darwin64-arm64-cc", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -388,7 +388,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -891,6 +890,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1047,9 +1049,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3459,9 +3458,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5853,9 +5849,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7230,6 +7223,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7438,10 +7435,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10245,7 +10238,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10296,7 +10288,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12499,9 +12490,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14893,9 +14881,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16246,10 +16231,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16845,7 +16826,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18356,6 +18336,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18518,9 +18502,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19893,7 +19874,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20227,6 +20207,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20279,7 +20260,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24486,7 +24466,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24513,7 +24492,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25763,9 +25741,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25847,9 +25822,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25980,6 +25952,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26292,12 +26270,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27684,8 +27656,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27712,7 +27684,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27729,8 +27701,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27748,7 +27720,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27770,7 +27742,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/crypto/bn/armv8-mont.S b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/crypto/bn/armv8-mont.S index 6fca712c4754a8..adb12afdb1ae24 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/crypto/bn/armv8-mont.S +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/crypto/bn/armv8-mont.S @@ -15,10 +15,12 @@ Lbn_mul_mont: cmp x5,#32 b.le Lscalar_impl #ifndef __KERNEL__ +#ifndef __AARCH64EB__ adrp x17,_OPENSSL_armv8_rsa_neonized@PAGE ldr w17,[x17,_OPENSSL_armv8_rsa_neonized@PAGEOFF] cbnz w17, bn_mul8x_mont_neon #endif +#endif Lscalar_impl: tst x5,#7 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 74f8be4cef56d1..78f706439620d1 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin64-arm64-cc" -#define DATE "built on: Mon Sep 30 17:08:24 2024 UTC" +#define DATE "built on: Mon Mar 3 17:40:38 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/progs.h b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/openssl.gypi b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/openssl.gypi index 61a8836a9dde3f..edd82ba510c2dd 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 @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/apps/progs.c b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/apps/progs.c +++ b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/configdata.pm b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/configdata.pm index 7698c6b4a8d09e..04bb6273cd8810 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 @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [], @@ -154,7 +154,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -205,10 +205,10 @@ our %config = ( ], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -258,11 +258,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "darwin64-arm64-cc", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -388,7 +388,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -892,6 +891,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1048,9 +1050,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3428,9 +3427,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5822,9 +5818,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7199,6 +7192,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7407,10 +7404,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10191,7 +10184,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10242,7 +10234,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12445,9 +12436,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14839,9 +14827,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16192,10 +16177,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16791,7 +16772,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18242,6 +18222,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18404,9 +18388,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19779,7 +19760,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20113,6 +20093,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20165,7 +20146,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24291,7 +24271,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24318,7 +24297,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25557,9 +25535,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25641,9 +25616,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25774,6 +25746,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26086,12 +26064,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27481,8 +27453,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27509,7 +27481,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27526,8 +27498,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27545,7 +27517,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27567,7 +27539,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by 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 16436bc0b1796c..0f24bf813bb50a 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin64-arm64-cc" -#define DATE "built on: Mon Sep 30 17:08:36 2024 UTC" +#define DATE "built on: Mon Mar 3 17:40:46 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/progs.h b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/progs.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/openssl.gypi b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/openssl.gypi index 835387a25b28e2..67fd4d4b74bcce 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 @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/apps/progs.c b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/apps/progs.c +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/configdata.pm b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/configdata.pm index 4d3767f42329f5..4c80e67ddd7c62 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 @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,10 +206,10 @@ our %config = ( ], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -258,11 +258,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "darwin64-x86_64-cc", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -388,7 +388,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -891,6 +890,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1047,9 +1049,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3491,9 +3490,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5885,9 +5881,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7262,6 +7255,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7470,10 +7467,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10312,7 +10305,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10363,7 +10355,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12566,9 +12557,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14960,9 +14948,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16313,10 +16298,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16912,7 +16893,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18363,6 +18343,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18525,9 +18509,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19900,7 +19881,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20234,6 +20214,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20286,7 +20267,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24581,7 +24561,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24608,7 +24587,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25870,9 +25848,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25954,9 +25929,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -26087,6 +26059,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26399,12 +26377,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27791,8 +27763,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27819,7 +27791,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27836,8 +27808,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27855,7 +27827,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27877,7 +27849,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by 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 8c788f6d59a666..076176ad33f96e 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin64-x86_64-cc" -#define DATE "built on: Mon Sep 30 17:06:51 2024 UTC" +#define DATE "built on: Mon Mar 3 17:39:35 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/ssl.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/progs.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/progs.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl.gypi b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl.gypi index 454a35a31ecd9a..10a92888817f0e 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 @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/apps/progs.c b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/apps/progs.c +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/configdata.pm b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/configdata.pm index 1f75fe7575c2cf..1166d313788b3d 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 @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,10 +206,10 @@ our %config = ( ], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -258,11 +258,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "darwin64-x86_64-cc", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -388,7 +388,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -891,6 +890,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1047,9 +1049,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3491,9 +3490,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5885,9 +5881,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7262,6 +7255,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7470,10 +7467,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10312,7 +10305,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10363,7 +10355,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12566,9 +12557,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14960,9 +14948,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16313,10 +16298,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16912,7 +16893,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18363,6 +18343,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18525,9 +18509,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19900,7 +19881,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20234,6 +20214,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20286,7 +20267,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24581,7 +24561,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24608,7 +24587,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25870,9 +25848,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25954,9 +25929,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -26087,6 +26059,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26399,12 +26377,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27791,8 +27763,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27819,7 +27791,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27836,8 +27808,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27855,7 +27827,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27877,7 +27849,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by 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 7fc043860e91f6..9f591cef5e412e 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin64-x86_64-cc" -#define DATE "built on: Mon Sep 30 17:07:07 2024 UTC" +#define DATE "built on: Mon Mar 3 17:39:47 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/progs.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl.gypi b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl.gypi index b6218392f74489..d1c3557a62e246 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 @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/apps/progs.c b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/apps/progs.c +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/configdata.pm b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/configdata.pm index 10e32f3d13be08..7a38d205f0f660 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 @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [], @@ -154,7 +154,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -205,10 +205,10 @@ our %config = ( ], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -258,11 +258,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "darwin64-x86_64-cc", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -388,7 +388,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -892,6 +891,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1048,9 +1050,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3428,9 +3427,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5822,9 +5818,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7199,6 +7192,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7407,10 +7404,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10191,7 +10184,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10242,7 +10234,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12445,9 +12436,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14839,9 +14827,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16192,10 +16177,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16791,7 +16772,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18242,6 +18222,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18404,9 +18388,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19779,7 +19760,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20113,6 +20093,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20165,7 +20146,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24291,7 +24271,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24318,7 +24297,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25557,9 +25535,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25641,9 +25616,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25774,6 +25746,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26086,12 +26064,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27481,8 +27453,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27509,7 +27481,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27526,8 +27498,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27545,7 +27517,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27567,7 +27539,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by 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 ecf1d141ca8f37..eda6d834729920 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin64-x86_64-cc" -#define DATE "built on: Mon Sep 30 17:07:22 2024 UTC" +#define DATE "built on: Mon Mar 3 17:39:57 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/progs.h b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/progs.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/openssl.gypi b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/openssl.gypi index d2f0708edf95c2..cd8cb60dca73cb 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 @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/linux-aarch64/asm/apps/progs.c b/deps/openssl/config/archs/linux-aarch64/asm/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/apps/progs.c +++ b/deps/openssl/config/archs/linux-aarch64/asm/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-aarch64/asm/configdata.pm b/deps/openssl/config/archs/linux-aarch64/asm/configdata.pm index b9637a41bbedcc..647d77cda4bc45 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/configdata.pm +++ b/deps/openssl/config/archs/linux-aarch64/asm/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,10 +207,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux-aarch64", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -395,7 +395,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -898,6 +897,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1054,9 +1056,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3466,9 +3465,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5860,9 +5856,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7245,6 +7238,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7453,10 +7450,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10261,7 +10254,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10312,7 +10304,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12515,9 +12506,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14909,9 +14897,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16276,10 +16261,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16881,7 +16862,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18400,6 +18380,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18562,9 +18546,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19937,7 +19918,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20271,6 +20251,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20323,7 +20304,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24530,7 +24510,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24557,7 +24536,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25809,9 +25787,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25893,9 +25868,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -26026,6 +25998,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26338,12 +26316,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27732,8 +27704,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27760,7 +27732,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27777,8 +27749,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27796,7 +27768,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27818,7 +27790,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by diff --git a/deps/openssl/config/archs/linux-aarch64/asm/crypto/bn/armv8-mont.S b/deps/openssl/config/archs/linux-aarch64/asm/crypto/bn/armv8-mont.S index 98d06f934a9ea5..397c83e863839f 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/crypto/bn/armv8-mont.S +++ b/deps/openssl/config/archs/linux-aarch64/asm/crypto/bn/armv8-mont.S @@ -15,10 +15,12 @@ bn_mul_mont: cmp x5,#32 b.le .Lscalar_impl #ifndef __KERNEL__ +#ifndef __AARCH64EB__ adrp x17,OPENSSL_armv8_rsa_neonized ldr w17,[x17,#:lo12:OPENSSL_armv8_rsa_neonized] cbnz w17, bn_mul8x_mont_neon #endif +#endif .Lscalar_impl: tst x5,#7 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 eba7c744efbda4..dde99c72fe513d 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-aarch64/asm/crypto/buildinf.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-aarch64" -#define DATE "built on: Mon Sep 30 17:08:48 2024 UTC" +#define DATE "built on: Mon Mar 3 17:40:53 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux-aarch64/asm/include/progs.h b/deps/openssl/config/archs/linux-aarch64/asm/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/include/progs.h +++ b/deps/openssl/config/archs/linux-aarch64/asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-aarch64/asm/openssl.gypi b/deps/openssl/config/archs/linux-aarch64/asm/openssl.gypi index 5990887c029387..4e0923be89cafb 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-aarch64/asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/apps/progs.c b/deps/openssl/config/archs/linux-aarch64/asm_avx2/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/apps/progs.c +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux-aarch64/asm_avx2/configdata.pm index 988b82a67947ef..5a2d2709a95e74 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,10 +207,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux-aarch64", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -395,7 +395,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -898,6 +897,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1054,9 +1056,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3466,9 +3465,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5860,9 +5856,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7245,6 +7238,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7453,10 +7450,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10261,7 +10254,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10312,7 +10304,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12515,9 +12506,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14909,9 +14897,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16276,10 +16261,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16881,7 +16862,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18400,6 +18380,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18562,9 +18546,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19937,7 +19918,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20271,6 +20251,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20323,7 +20304,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24530,7 +24510,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24557,7 +24536,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25809,9 +25787,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25893,9 +25868,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -26026,6 +25998,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26338,12 +26316,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27732,8 +27704,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27760,7 +27732,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27777,8 +27749,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27796,7 +27768,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27818,7 +27790,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/bn/armv8-mont.S b/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/bn/armv8-mont.S index 98d06f934a9ea5..397c83e863839f 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/bn/armv8-mont.S +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/bn/armv8-mont.S @@ -15,10 +15,12 @@ bn_mul_mont: cmp x5,#32 b.le .Lscalar_impl #ifndef __KERNEL__ +#ifndef __AARCH64EB__ adrp x17,OPENSSL_armv8_rsa_neonized ldr w17,[x17,#:lo12:OPENSSL_armv8_rsa_neonized] cbnz w17, bn_mul8x_mont_neon #endif +#endif .Lscalar_impl: tst x5,#7 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 33cbe794886024..f1f0dc352bc9d2 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-aarch64" -#define DATE "built on: Mon Sep 30 17:09:00 2024 UTC" +#define DATE "built on: Mon Mar 3 17:41:02 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/progs.h b/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux-aarch64/asm_avx2/openssl.gypi index c7cb2091b5a793..b9d76aee0d0dd6 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/apps/progs.c b/deps/openssl/config/archs/linux-aarch64/no-asm/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/linux-aarch64/no-asm/apps/progs.c +++ b/deps/openssl/config/archs/linux-aarch64/no-asm/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/configdata.pm b/deps/openssl/config/archs/linux-aarch64/no-asm/configdata.pm index 9ff6e315a7f549..73acc853654324 100644 --- a/deps/openssl/config/archs/linux-aarch64/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux-aarch64/no-asm/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [], @@ -157,7 +157,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,10 +206,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux-aarch64", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -395,7 +395,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -899,6 +898,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1055,9 +1057,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3435,9 +3434,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5829,9 +5825,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7214,6 +7207,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7422,10 +7419,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10207,7 +10200,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10258,7 +10250,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12461,9 +12452,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14855,9 +14843,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16222,10 +16207,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16827,7 +16808,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18286,6 +18266,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18448,9 +18432,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19823,7 +19804,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20157,6 +20137,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20209,7 +20190,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24335,7 +24315,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24362,7 +24341,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25603,9 +25581,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25687,9 +25662,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25820,6 +25792,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26132,12 +26110,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27529,8 +27501,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27557,7 +27529,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27574,8 +27546,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27593,7 +27565,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27615,7 +27587,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by 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 82407322b9655a..76fe98e6267807 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-aarch64" -#define DATE "built on: Mon Sep 30 17:09:13 2024 UTC" +#define DATE "built on: Mon Mar 3 17:41:10 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/include/progs.h b/deps/openssl/config/archs/linux-aarch64/no-asm/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/linux-aarch64/no-asm/include/progs.h +++ b/deps/openssl/config/archs/linux-aarch64/no-asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/openssl.gypi b/deps/openssl/config/archs/linux-aarch64/no-asm/openssl.gypi index f20a2ba245d462..387362a4757ebb 100644 --- a/deps/openssl/config/archs/linux-aarch64/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-aarch64/no-asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/linux-armv4/asm/apps/progs.c b/deps/openssl/config/archs/linux-armv4/asm/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/apps/progs.c +++ b/deps/openssl/config/archs/linux-armv4/asm/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-armv4/asm/configdata.pm b/deps/openssl/config/archs/linux-armv4/asm/configdata.pm index 4ac06388d755d8..16213a0d684b26 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/configdata.pm +++ b/deps/openssl/config/archs/linux-armv4/asm/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,10 +207,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux-armv4", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -395,7 +395,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -898,6 +897,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1054,9 +1056,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3474,9 +3473,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5868,9 +5864,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7253,6 +7246,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7461,10 +7458,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10271,7 +10264,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10322,7 +10314,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12525,9 +12516,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14919,9 +14907,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16286,10 +16271,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16891,7 +16872,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18434,6 +18414,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18596,9 +18580,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19971,7 +19952,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20305,6 +20285,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20357,7 +20338,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24571,7 +24551,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24598,7 +24577,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25851,9 +25829,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25935,9 +25910,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -26068,6 +26040,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26380,12 +26358,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27774,8 +27746,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27802,7 +27774,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27819,8 +27791,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27838,7 +27810,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27860,7 +27832,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by 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 c2f243c0696fb7..b4a93ae307a3aa 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-armv4/asm/crypto/buildinf.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-armv4" -#define DATE "built on: Mon Sep 30 17:09:25 2024 UTC" +#define DATE "built on: Mon Mar 3 17:41:18 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-armv4/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-armv4/asm/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-armv4/asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux-armv4/asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux-armv4/asm/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-armv4/asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux-armv4/asm/include/progs.h b/deps/openssl/config/archs/linux-armv4/asm/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/include/progs.h +++ b/deps/openssl/config/archs/linux-armv4/asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-armv4/asm/openssl.gypi b/deps/openssl/config/archs/linux-armv4/asm/openssl.gypi index 8fd7c43c4db633..849f58d4bdb02b 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-armv4/asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/apps/progs.c b/deps/openssl/config/archs/linux-armv4/asm_avx2/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/apps/progs.c +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux-armv4/asm_avx2/configdata.pm index f5715110100590..58067f20ad9102 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,10 +207,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux-armv4", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -395,7 +395,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -898,6 +897,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1054,9 +1056,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3474,9 +3473,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5868,9 +5864,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7253,6 +7246,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7461,10 +7458,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10271,7 +10264,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10322,7 +10314,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12525,9 +12516,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14919,9 +14907,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16286,10 +16271,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16891,7 +16872,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18434,6 +18414,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18596,9 +18580,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19971,7 +19952,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20305,6 +20285,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20357,7 +20338,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24571,7 +24551,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24598,7 +24577,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25851,9 +25829,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25935,9 +25910,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -26068,6 +26040,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26380,12 +26358,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27774,8 +27746,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27802,7 +27774,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27819,8 +27791,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27838,7 +27810,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27860,7 +27832,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by 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 e5f76f6ad716ba..e36974b4cd4632 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-armv4" -#define DATE "built on: Mon Sep 30 17:09:38 2024 UTC" +#define DATE "built on: Mon Mar 3 17:41:26 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/include/progs.h b/deps/openssl/config/archs/linux-armv4/asm_avx2/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux-armv4/asm_avx2/openssl.gypi index 9b594145412313..76181e218d83dd 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/linux-armv4/no-asm/apps/progs.c b/deps/openssl/config/archs/linux-armv4/no-asm/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/linux-armv4/no-asm/apps/progs.c +++ b/deps/openssl/config/archs/linux-armv4/no-asm/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-armv4/no-asm/configdata.pm b/deps/openssl/config/archs/linux-armv4/no-asm/configdata.pm index 2254a71143d8fd..5ffc6b958947b8 100644 --- a/deps/openssl/config/archs/linux-armv4/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux-armv4/no-asm/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [], @@ -157,7 +157,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,10 +206,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux-armv4", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -395,7 +395,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -899,6 +898,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1055,9 +1057,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3435,9 +3434,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5829,9 +5825,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7214,6 +7207,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7422,10 +7419,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10207,7 +10200,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10258,7 +10250,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12461,9 +12452,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14855,9 +14843,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16222,10 +16207,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16827,7 +16808,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18286,6 +18266,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18448,9 +18432,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19823,7 +19804,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20157,6 +20137,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20209,7 +20190,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24335,7 +24315,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24362,7 +24341,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25603,9 +25581,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25687,9 +25662,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25820,6 +25792,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26132,12 +26110,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27529,8 +27501,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27557,7 +27529,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27574,8 +27546,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27593,7 +27565,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27615,7 +27587,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by 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 9b3d97b629171d..1fff2ed227a562 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-armv4" -#define DATE "built on: Mon Sep 30 17:09:50 2024 UTC" +#define DATE "built on: Mon Mar 3 17:41:35 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux-armv4/no-asm/include/progs.h b/deps/openssl/config/archs/linux-armv4/no-asm/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/linux-armv4/no-asm/include/progs.h +++ b/deps/openssl/config/archs/linux-armv4/no-asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-armv4/no-asm/openssl.gypi b/deps/openssl/config/archs/linux-armv4/no-asm/openssl.gypi index cc4efdf7d59fad..6ad73f4142da8c 100644 --- a/deps/openssl/config/archs/linux-armv4/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-armv4/no-asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/linux-elf/asm/apps/progs.c b/deps/openssl/config/archs/linux-elf/asm/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/linux-elf/asm/apps/progs.c +++ b/deps/openssl/config/archs/linux-elf/asm/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-elf/asm/configdata.pm b/deps/openssl/config/archs/linux-elf/asm/configdata.pm index f134e72ba600e3..60e058b0367bad 100644 --- a/deps/openssl/config/archs/linux-elf/asm/configdata.pm +++ b/deps/openssl/config/archs/linux-elf/asm/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,10 +207,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux-elf", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -394,7 +394,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -897,6 +896,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1053,9 +1055,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3492,9 +3491,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5886,9 +5882,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7271,6 +7264,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7479,10 +7476,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10286,7 +10279,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10337,7 +10329,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12540,9 +12531,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14934,9 +14922,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16301,10 +16286,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16906,7 +16887,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18365,6 +18345,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18527,9 +18511,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19902,7 +19883,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20236,6 +20216,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20288,7 +20269,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24492,7 +24472,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24519,7 +24498,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25770,9 +25748,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25854,9 +25829,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25987,6 +25959,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26299,12 +26277,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27693,8 +27665,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27721,7 +27693,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27738,8 +27710,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27757,7 +27729,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27779,7 +27751,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/aes/aes-586.S b/deps/openssl/config/archs/linux-elf/asm/crypto/aes/aes-586.S index 628a3b6333e9d3..9ee3fc9a57e8e1 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/aes/aes-586.S +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/aes/aes-586.S @@ -2,10 +2,10 @@ .type _x86_AES_encrypt_compact,@function .align 16 _x86_AES_encrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -274,10 +274,10 @@ _x86_AES_encrypt_compact: .type _sse_AES_encrypt_compact,@function .align 16 _sse_AES_encrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pxor (%edi),%mm0 pxor 8(%edi),%mm4 @@ -436,10 +436,10 @@ _sse_AES_encrypt_compact: .type _x86_AES_encrypt,@function .align 16 _x86_AES_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -995,10 +995,10 @@ _x86_AES_encrypt: .align 16 AES_encrypt: .L_AES_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1063,10 +1063,10 @@ AES_encrypt: .type _x86_AES_decrypt_compact,@function .align 16 _x86_AES_decrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -1423,10 +1423,10 @@ _x86_AES_decrypt_compact: .type _sse_AES_decrypt_compact,@function .align 16 _sse_AES_decrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pxor (%edi),%mm0 pxor 8(%edi),%mm4 @@ -1644,10 +1644,10 @@ _sse_AES_decrypt_compact: .type _x86_AES_decrypt,@function .align 16 _x86_AES_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -2207,10 +2207,10 @@ _x86_AES_decrypt: .align 16 AES_decrypt: .L_AES_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2277,10 +2277,10 @@ AES_decrypt: .align 16 AES_cbc_encrypt: .L_AES_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2813,10 +2813,10 @@ AES_cbc_encrypt: .type _x86_AES_set_encrypt_key,@function .align 16 _x86_AES_set_encrypt_key: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3050,10 +3050,10 @@ _x86_AES_set_encrypt_key: .align 16 AES_set_encrypt_key: .L_AES_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call _x86_AES_set_encrypt_key ret @@ -3063,10 +3063,10 @@ AES_set_encrypt_key: .align 16 AES_set_decrypt_key: .L_AES_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call _x86_AES_set_encrypt_key cmpl $0,%eax diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/aes/aesni-x86.S b/deps/openssl/config/archs/linux-elf/asm/crypto/aes/aesni-x86.S index 9191466ee47a31..eb2d01b16630a1 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/aes/aesni-x86.S +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/aes/aesni-x86.S @@ -4,10 +4,10 @@ .align 16 aesni_encrypt: .L_aesni_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 12(%esp),%edx @@ -36,10 +36,10 @@ aesni_encrypt: .align 16 aesni_decrypt: .L_aesni_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 12(%esp),%edx @@ -66,10 +66,10 @@ aesni_decrypt: .type _aesni_encrypt2,@function .align 16 _aesni_encrypt2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -98,10 +98,10 @@ _aesni_encrypt2: .type _aesni_decrypt2,@function .align 16 _aesni_decrypt2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -130,10 +130,10 @@ _aesni_decrypt2: .type _aesni_encrypt3,@function .align 16 _aesni_encrypt3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -167,10 +167,10 @@ _aesni_encrypt3: .type _aesni_decrypt3,@function .align 16 _aesni_decrypt3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -204,10 +204,10 @@ _aesni_decrypt3: .type _aesni_encrypt4,@function .align 16 _aesni_encrypt4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 movups 16(%edx),%xmm1 @@ -247,10 +247,10 @@ _aesni_encrypt4: .type _aesni_decrypt4,@function .align 16 _aesni_decrypt4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 movups 16(%edx),%xmm1 @@ -290,10 +290,10 @@ _aesni_decrypt4: .type _aesni_encrypt6,@function .align 16 _aesni_encrypt6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -349,10 +349,10 @@ _aesni_encrypt6: .type _aesni_decrypt6,@function .align 16 _aesni_decrypt6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -410,10 +410,10 @@ _aesni_decrypt6: .align 16 aesni_ecb_encrypt: .L_aesni_ecb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -650,10 +650,10 @@ aesni_ecb_encrypt: .align 16 aesni_ccm64_encrypt_blocks: .L_aesni_ccm64_encrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -743,10 +743,10 @@ aesni_ccm64_encrypt_blocks: .align 16 aesni_ccm64_decrypt_blocks: .L_aesni_ccm64_decrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -871,10 +871,10 @@ aesni_ccm64_decrypt_blocks: .align 16 aesni_ctr32_encrypt_blocks: .L_aesni_ctr32_encrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1114,10 +1114,10 @@ aesni_ctr32_encrypt_blocks: .align 16 aesni_xts_encrypt: .L_aesni_xts_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1479,10 +1479,10 @@ aesni_xts_encrypt: .align 16 aesni_xts_decrypt: .L_aesni_xts_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1874,10 +1874,10 @@ aesni_xts_decrypt: .align 16 aesni_ocb_encrypt: .L_aesni_ocb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2274,10 +2274,10 @@ aesni_ocb_encrypt: .align 16 aesni_ocb_decrypt: .L_aesni_ocb_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2674,10 +2674,10 @@ aesni_ocb_decrypt: .align 16 aesni_cbc_encrypt: .L_aesni_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2938,10 +2938,10 @@ aesni_cbc_encrypt: .type _aesni_set_encrypt_key,@function .align 16 _aesni_set_encrypt_key: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3278,10 +3278,10 @@ _aesni_set_encrypt_key: .align 16 aesni_set_encrypt_key: .L_aesni_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%ecx @@ -3294,10 +3294,10 @@ aesni_set_encrypt_key: .align 16 aesni_set_decrypt_key: .L_aesni_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%ecx diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/aes/vpaes-x86.S b/deps/openssl/config/archs/linux-elf/asm/crypto/aes/vpaes-x86.S index 39d00e772e56d9..f3adb70545a641 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/aes/vpaes-x86.S +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/aes/vpaes-x86.S @@ -59,10 +59,10 @@ .type _vpaes_preheat,@function .align 16 _vpaes_preheat: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%ebp movdqa -48(%ebp),%xmm7 @@ -72,10 +72,10 @@ _vpaes_preheat: .type _vpaes_encrypt_core,@function .align 16 _vpaes_encrypt_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $16,%ecx movl 240(%edx),%eax @@ -154,10 +154,10 @@ _vpaes_encrypt_core: .type _vpaes_decrypt_core,@function .align 16 _vpaes_decrypt_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif leal 608(%ebp),%ebx movl 240(%edx),%eax @@ -247,10 +247,10 @@ _vpaes_decrypt_core: .type _vpaes_schedule_core,@function .align 16 _vpaes_schedule_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%ebp movdqu (%esi),%xmm0 @@ -346,10 +346,10 @@ _vpaes_schedule_core: .type _vpaes_schedule_192_smear,@function .align 16 _vpaes_schedule_192_smear: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pshufd $128,%xmm6,%xmm1 pshufd $254,%xmm7,%xmm0 @@ -363,10 +363,10 @@ _vpaes_schedule_192_smear: .type _vpaes_schedule_round,@function .align 16 _vpaes_schedule_round: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa 8(%esp),%xmm2 pxor %xmm1,%xmm1 @@ -417,10 +417,10 @@ _vpaes_schedule_round: .type _vpaes_schedule_transform,@function .align 16 _vpaes_schedule_transform: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa -16(%ebp),%xmm2 movdqa %xmm2,%xmm1 @@ -437,10 +437,10 @@ _vpaes_schedule_transform: .type _vpaes_schedule_mangle,@function .align 16 _vpaes_schedule_mangle: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa %xmm0,%xmm4 movdqa 128(%ebp),%xmm5 @@ -503,10 +503,10 @@ _vpaes_schedule_mangle: .align 16 vpaes_set_encrypt_key: .L_vpaes_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -541,10 +541,10 @@ vpaes_set_encrypt_key: .align 16 vpaes_set_decrypt_key: .L_vpaes_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -584,10 +584,10 @@ vpaes_set_decrypt_key: .align 16 vpaes_encrypt: .L_vpaes_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -618,10 +618,10 @@ vpaes_encrypt: .align 16 vpaes_decrypt: .L_vpaes_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -652,10 +652,10 @@ vpaes_decrypt: .align 16 vpaes_cbc_encrypt: .L_vpaes_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/bf/bf-586.S b/deps/openssl/config/archs/linux-elf/asm/crypto/bf/bf-586.S index a3ff8edf86bcde..801b28d56381f2 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/bf/bf-586.S +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/bf/bf-586.S @@ -4,10 +4,10 @@ .align 16 BF_encrypt: .L_BF_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -359,10 +359,10 @@ BF_encrypt: .align 16 BF_decrypt: .L_BF_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -714,10 +714,10 @@ BF_decrypt: .align 16 BF_cbc_encrypt: .L_BF_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -782,55 +782,55 @@ BF_cbc_encrypt: xorl %edx,%edx jmp *%ebp .L006ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx .L007ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh .L008ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl .L009ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp .L010ejend .L011ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx .L012ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch .L013ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl .L010ejend: diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/bn/bn-586.S b/deps/openssl/config/archs/linux-elf/asm/crypto/bn/bn-586.S index 2495ae69451647..a74e6470b438db 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/bn/bn-586.S +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/bn/bn-586.S @@ -4,10 +4,10 @@ .align 16 bn_mul_add_words: .L_bn_mul_add_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L000PIC_me_up .L000PIC_me_up: @@ -292,10 +292,10 @@ bn_mul_add_words: .align 16 bn_mul_words: .L_bn_mul_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L010PIC_me_up .L010PIC_me_up: @@ -479,10 +479,10 @@ bn_mul_words: .align 16 bn_sqr_words: .L_bn_sqr_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L017PIC_me_up .L017PIC_me_up: @@ -625,10 +625,10 @@ bn_sqr_words: .align 16 bn_div_words: .L_bn_div_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax @@ -641,10 +641,10 @@ bn_div_words: .align 16 bn_add_words: .L_bn_add_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -828,10 +828,10 @@ bn_add_words: .align 16 bn_sub_words: .L_bn_sub_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1015,10 +1015,10 @@ bn_sub_words: .align 16 bn_sub_part_words: .L_bn_sub_part_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/bn/co-586.S b/deps/openssl/config/archs/linux-elf/asm/crypto/bn/co-586.S index 9a90455392adee..bc8cd28886aeac 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/bn/co-586.S +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/bn/co-586.S @@ -4,10 +4,10 @@ .align 16 bn_mul_comba8: .L_bn_mul_comba8_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi movl 12(%esp),%esi @@ -553,10 +553,10 @@ bn_mul_comba8: .align 16 bn_mul_comba4: .L_bn_mul_comba4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi movl 12(%esp),%esi @@ -726,10 +726,10 @@ bn_mul_comba4: .align 16 bn_sqr_comba8: .L_bn_sqr_comba8_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1139,10 +1139,10 @@ bn_sqr_comba8: .align 16 bn_sqr_comba4: .L_bn_sqr_comba4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/bn/x86-gf2m.S b/deps/openssl/config/archs/linux-elf/asm/crypto/bn/x86-gf2m.S index fcb54e967b4cbc..b784b7cbe310e1 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/bn/x86-gf2m.S +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/bn/x86-gf2m.S @@ -2,10 +2,10 @@ .type _mul_1x1_mmx,@function .align 16 _mul_1x1_mmx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif subl $36,%esp movl %eax,%ecx @@ -110,10 +110,10 @@ _mul_1x1_mmx: .type _mul_1x1_ialu,@function .align 16 _mul_1x1_ialu: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif subl $36,%esp movl %eax,%ecx @@ -249,10 +249,10 @@ _mul_1x1_ialu: .align 16 bn_GF2m_mul_2x2: .L_bn_GF2m_mul_2x2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L000PIC_me_up .L000PIC_me_up: diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/bn/x86-mont.S b/deps/openssl/config/archs/linux-elf/asm/crypto/bn/x86-mont.S index 7dddbf7d87f1d8..5d8a4c6cb31633 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/bn/x86-mont.S +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/bn/x86-mont.S @@ -4,10 +4,10 @@ .align 16 bn_mul_mont: .L_bn_mul_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx 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 939d8f553cc2f0..7e90b770e9fa81 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/buildinf.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-elf" -#define DATE "built on: Mon Sep 30 17:10:02 2024 UTC" +#define DATE "built on: Mon Mar 3 17:41:42 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/camellia/cmll-x86.S b/deps/openssl/config/archs/linux-elf/asm/crypto/camellia/cmll-x86.S index bcbaf49e0ac210..f4b77edc3333cd 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/camellia/cmll-x86.S +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/camellia/cmll-x86.S @@ -4,10 +4,10 @@ .align 16 Camellia_EncryptBlock_Rounds: .L_Camellia_EncryptBlock_Rounds_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -63,10 +63,10 @@ Camellia_EncryptBlock_Rounds: .align 16 Camellia_EncryptBlock: .L_Camellia_EncryptBlock_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $128,%eax subl 4(%esp),%eax @@ -80,10 +80,10 @@ Camellia_EncryptBlock: .align 16 Camellia_encrypt: .L_Camellia_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -137,10 +137,10 @@ Camellia_encrypt: .type _x86_Camellia_encrypt,@function .align 16 _x86_Camellia_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl (%edi),%eax xorl 4(%edi),%ebx @@ -372,10 +372,10 @@ _x86_Camellia_encrypt: .align 16 Camellia_DecryptBlock_Rounds: .L_Camellia_DecryptBlock_Rounds_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -431,10 +431,10 @@ Camellia_DecryptBlock_Rounds: .align 16 Camellia_DecryptBlock: .L_Camellia_DecryptBlock_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $128,%eax subl 4(%esp),%eax @@ -448,10 +448,10 @@ Camellia_DecryptBlock: .align 16 Camellia_decrypt: .L_Camellia_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -505,10 +505,10 @@ Camellia_decrypt: .type _x86_Camellia_decrypt,@function .align 16 _x86_Camellia_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl (%edi),%eax xorl 4(%edi),%ebx @@ -740,10 +740,10 @@ _x86_Camellia_decrypt: .align 16 Camellia_Ekeygen: .L_Camellia_Ekeygen_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1586,10 +1586,10 @@ Camellia_Ekeygen: .align 16 Camellia_set_key: .L_Camellia_set_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ecx @@ -2143,10 +2143,10 @@ Camellia_set_key: .align 16 Camellia_cbc_encrypt: .L_Camellia_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/chacha/chacha-x86.S b/deps/openssl/config/archs/linux-elf/asm/crypto/chacha/chacha-x86.S index 9cc4027c738002..ec98cb32fd0e6e 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/chacha/chacha-x86.S +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/chacha/chacha-x86.S @@ -4,10 +4,10 @@ .align 16 ChaCha20_ctr32: .L_ChaCha20_ctr32_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -382,10 +382,10 @@ ChaCha20_ctr32: .align 16 ChaCha20_ssse3: .L_ChaCha20_ssse3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -979,10 +979,10 @@ ChaCha20_ssse3: .align 16 ChaCha20_xop: .L_ChaCha20_xop_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/des/crypt586.S b/deps/openssl/config/archs/linux-elf/asm/crypto/des/crypt586.S index ac4b251ec0b12f..29ba0fa70a8e2b 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/des/crypt586.S +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/des/crypt586.S @@ -4,10 +4,10 @@ .align 16 fcrypt_body: .L_fcrypt_body_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/des/des-586.S b/deps/openssl/config/archs/linux-elf/asm/crypto/des/des-586.S index 90449e4fac6a0f..b3839fa8875df9 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/des/des-586.S +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/des/des-586.S @@ -3,10 +3,10 @@ .type _x86_DES_encrypt,@function .align 16 _x86_DES_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ecx @@ -479,10 +479,10 @@ _x86_DES_encrypt: .type _x86_DES_decrypt,@function .align 16 _x86_DES_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ecx @@ -957,10 +957,10 @@ _x86_DES_decrypt: .align 16 DES_encrypt1: .L_DES_encrypt1_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1075,10 +1075,10 @@ DES_encrypt1: .align 16 DES_encrypt2: .L_DES_encrypt2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1123,10 +1123,10 @@ DES_encrypt2: .align 16 DES_encrypt3: .L_DES_encrypt3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ebx @@ -1249,10 +1249,10 @@ DES_encrypt3: .align 16 DES_decrypt3: .L_DES_decrypt3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ebx @@ -1375,10 +1375,10 @@ DES_decrypt3: .align 16 DES_ncbc_encrypt: .L_DES_ncbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -1441,55 +1441,55 @@ DES_ncbc_encrypt: xorl %edx,%edx jmp *%ebp .L012ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx .L013ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh .L014ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl .L015ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp .L016ejend .L017ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx .L018ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch .L019ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl .L016ejend: @@ -1595,10 +1595,10 @@ DES_ncbc_encrypt: .align 16 DES_ede3_cbc_encrypt: .L_DES_ede3_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -1665,55 +1665,55 @@ DES_ede3_cbc_encrypt: xorl %edx,%edx jmp *%ebp .L036ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx .L037ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh .L038ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl .L039ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp .L040ejend .L041ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx .L042ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch .L043ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl .L040ejend: diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/ec/ecp_nistz256-x86.S b/deps/openssl/config/archs/linux-elf/asm/crypto/ec/ecp_nistz256-x86.S index 4e17d5eb877efc..f822079f8a9fb7 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/ec/ecp_nistz256-x86.S +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/ec/ecp_nistz256-x86.S @@ -2387,10 +2387,10 @@ ecp_nistz256_precomputed: .align 16 ecp_nistz256_mul_by_2: .L_ecp_nistz256_mul_by_2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2411,10 +2411,10 @@ ecp_nistz256_mul_by_2: .align 16 ecp_nistz256_mul_by_3: .L_ecp_nistz256_mul_by_3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2441,10 +2441,10 @@ ecp_nistz256_mul_by_3: .align 16 ecp_nistz256_div_by_2: .L_ecp_nistz256_div_by_2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2462,10 +2462,10 @@ ecp_nistz256_div_by_2: .type _ecp_nistz256_div_by_2,@function .align 16 _ecp_nistz256_div_by_2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ebp xorl %edx,%edx @@ -2550,10 +2550,10 @@ _ecp_nistz256_div_by_2: .align 16 ecp_nistz256_add: .L_ecp_nistz256_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2572,10 +2572,10 @@ ecp_nistz256_add: .type _ecp_nistz256_add,@function .align 16 _ecp_nistz256_add: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%eax movl 4(%esi),%ebx @@ -2654,10 +2654,10 @@ _ecp_nistz256_add: .align 16 ecp_nistz256_sub: .L_ecp_nistz256_sub_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2676,10 +2676,10 @@ ecp_nistz256_sub: .type _ecp_nistz256_sub,@function .align 16 _ecp_nistz256_sub: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%eax movl 4(%esi),%ebx @@ -2739,10 +2739,10 @@ _ecp_nistz256_sub: .align 16 ecp_nistz256_neg: .L_ecp_nistz256_neg_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2772,10 +2772,10 @@ ecp_nistz256_neg: .type _picup_eax,@function .align 16 _picup_eax: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esp),%eax ret @@ -2785,10 +2785,10 @@ _picup_eax: .align 16 ecp_nistz256_to_mont: .L_ecp_nistz256_to_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2813,10 +2813,10 @@ ecp_nistz256_to_mont: .align 16 ecp_nistz256_from_mont: .L_ecp_nistz256_from_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2841,10 +2841,10 @@ ecp_nistz256_from_mont: .align 16 ecp_nistz256_mul_mont: .L_ecp_nistz256_mul_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2869,10 +2869,10 @@ ecp_nistz256_mul_mont: .align 16 ecp_nistz256_sqr_mont: .L_ecp_nistz256_sqr_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2895,10 +2895,10 @@ ecp_nistz256_sqr_mont: .type _ecp_nistz256_mul_mont,@function .align 16 _ecp_nistz256_mul_mont: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif andl $83886080,%eax cmpl $83886080,%eax @@ -3797,10 +3797,10 @@ _ecp_nistz256_mul_mont: .align 16 ecp_nistz256_scatter_w5: .L_ecp_nistz256_scatter_w5_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3835,10 +3835,10 @@ ecp_nistz256_scatter_w5: .align 16 ecp_nistz256_gather_w5: .L_ecp_nistz256_gather_w5_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3934,10 +3934,10 @@ ecp_nistz256_gather_w5: .align 16 ecp_nistz256_scatter_w7: .L_ecp_nistz256_scatter_w7_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3970,10 +3970,10 @@ ecp_nistz256_scatter_w7: .align 16 ecp_nistz256_gather_w7: .L_ecp_nistz256_gather_w7_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4189,10 +4189,10 @@ ecp_nistz256_gather_w7: .align 16 ecp_nistz256_point_double: .L_ecp_nistz256_point_double_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4320,10 +4320,10 @@ ecp_nistz256_point_double: .align 16 ecp_nistz256_point_add: .L_ecp_nistz256_point_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4838,10 +4838,10 @@ ecp_nistz256_point_add: .align 16 ecp_nistz256_point_add_affine: .L_ecp_nistz256_point_add_affine_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/md5/md5-586.S b/deps/openssl/config/archs/linux-elf/asm/crypto/md5/md5-586.S index 33c01af676ab4d..7e96dc647ade2a 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/md5/md5-586.S +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/md5/md5-586.S @@ -4,10 +4,10 @@ .align 16 ossl_md5_block_asm_data_order: .L_ossl_md5_block_asm_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/modes/ghash-x86.S b/deps/openssl/config/archs/linux-elf/asm/crypto/modes/ghash-x86.S index dd80e32c53beb3..9b3361acd3a552 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/modes/ghash-x86.S +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/modes/ghash-x86.S @@ -4,10 +4,10 @@ .align 16 gcm_gmult_4bit_x86: .L_gcm_gmult_4bit_x86_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -103,10 +103,10 @@ gcm_gmult_4bit_x86: .align 16 gcm_ghash_4bit_x86: .L_gcm_ghash_4bit_x86_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -217,10 +217,10 @@ gcm_ghash_4bit_x86: .align 16 gcm_gmult_4bit_mmx: .L_gcm_gmult_4bit_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -321,10 +321,10 @@ gcm_gmult_4bit_mmx: .align 16 gcm_ghash_4bit_mmx: .L_gcm_ghash_4bit_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -930,10 +930,10 @@ gcm_ghash_4bit_mmx: .align 16 gcm_init_clmul: .L_gcm_init_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax @@ -1004,10 +1004,10 @@ gcm_init_clmul: .align 16 gcm_gmult_clmul: .L_gcm_gmult_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%edx @@ -1062,10 +1062,10 @@ gcm_gmult_clmul: .align 16 gcm_ghash_clmul: .L_gcm_ghash_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/poly1305/poly1305-x86.S b/deps/openssl/config/archs/linux-elf/asm/crypto/poly1305/poly1305-x86.S index f95649faed3710..e76632cd1e7011 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/poly1305/poly1305-x86.S +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/poly1305/poly1305-x86.S @@ -5,10 +5,10 @@ .align 16 poly1305_init: .L_poly1305_init_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -71,10 +71,10 @@ poly1305_init: .align 16 poly1305_blocks: .L_poly1305_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -244,10 +244,10 @@ poly1305_blocks: .align 16 poly1305_emit: .L_poly1305_emit_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -308,10 +308,10 @@ poly1305_emit: .type _poly1305_init_sse2,@function .align 16 _poly1305_init_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqu 24(%edi),%xmm4 leal 48(%edi),%edi @@ -515,10 +515,10 @@ _poly1305_init_sse2: .type _poly1305_blocks_sse2,@function .align 16 _poly1305_blocks_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1281,10 +1281,10 @@ _poly1305_blocks_sse2: .type _poly1305_emit_sse2,@function .align 16 _poly1305_emit_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1379,10 +1379,10 @@ _poly1305_emit_sse2: .type _poly1305_init_avx2,@function .align 16 _poly1305_init_avx2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif vmovdqu 24(%edi),%xmm4 leal 48(%edi),%edi @@ -1555,10 +1555,10 @@ _poly1305_init_avx2: .type _poly1305_blocks_avx2,@function .align 16 _poly1305_blocks_avx2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/rc4/rc4-586.S b/deps/openssl/config/archs/linux-elf/asm/crypto/rc4/rc4-586.S index da909a31e73010..a10b047a7ecd4b 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/rc4/rc4-586.S +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/rc4/rc4-586.S @@ -4,10 +4,10 @@ .align 16 RC4: .L_RC4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -275,10 +275,10 @@ RC4: .align 16 RC4_set_key: .L_RC4_set_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -358,10 +358,10 @@ RC4_set_key: .align 16 RC4_options: .L_RC4_options_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L018pic_point .L018pic_point: diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/ripemd/rmd-586.S b/deps/openssl/config/archs/linux-elf/asm/crypto/ripemd/rmd-586.S index 57b95af6dde072..4f3ea459c99d61 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/ripemd/rmd-586.S +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/ripemd/rmd-586.S @@ -4,10 +4,10 @@ .align 16 ripemd160_block_asm_data_order: .L_ripemd160_block_asm_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/sha/sha1-586.S b/deps/openssl/config/archs/linux-elf/asm/crypto/sha/sha1-586.S index ddc85b3d82df65..4b60a71ee8332a 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/sha/sha1-586.S +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/sha/sha1-586.S @@ -4,10 +4,10 @@ .align 16 sha1_block_data_order: .L_sha1_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1403,10 +1403,10 @@ sha1_block_data_order: .type _sha1_block_data_order_shaext,@function .align 16 _sha1_block_data_order_shaext: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1578,10 +1578,10 @@ _sha1_block_data_order_shaext: .type _sha1_block_data_order_ssse3,@function .align 16 _sha1_block_data_order_ssse3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2802,10 +2802,10 @@ _sha1_block_data_order_ssse3: .type _sha1_block_data_order_avx,@function .align 16 _sha1_block_data_order_avx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/sha/sha256-586.S b/deps/openssl/config/archs/linux-elf/asm/crypto/sha/sha256-586.S index 9436ca5e1d8c92..c8599bd582c669 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/sha/sha256-586.S +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/sha/sha256-586.S @@ -4,10 +4,10 @@ .align 16 sha256_block_data_order: .L_sha256_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/sha/sha512-586.S b/deps/openssl/config/archs/linux-elf/asm/crypto/sha/sha512-586.S index c7cf815b4e052e..99d198dd91dc83 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/sha/sha512-586.S +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/sha/sha512-586.S @@ -4,10 +4,10 @@ .align 16 sha512_block_data_order: .L_sha512_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/whrlpool/wp-mmx.S b/deps/openssl/config/archs/linux-elf/asm/crypto/whrlpool/wp-mmx.S index 9fb9ca1e45efb9..ee571f6459470e 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/whrlpool/wp-mmx.S +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/whrlpool/wp-mmx.S @@ -4,10 +4,10 @@ .align 16 whirlpool_block_mmx: .L_whirlpool_block_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/x86cpuid.S b/deps/openssl/config/archs/linux-elf/asm/crypto/x86cpuid.S index eedacacfea8676..d4f2ec09e4e693 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/x86cpuid.S +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/x86cpuid.S @@ -4,10 +4,10 @@ .align 16 OPENSSL_ia32_cpuid: .L_OPENSSL_ia32_cpuid_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -153,10 +153,10 @@ OPENSSL_ia32_cpuid: .align 16 OPENSSL_rdtsc: .L_OPENSSL_rdtsc_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl %eax,%eax xorl %edx,%edx @@ -175,10 +175,10 @@ OPENSSL_rdtsc: .align 16 OPENSSL_instrument_halt: .L_OPENSSL_instrument_halt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L011PIC_me_up .L011PIC_me_up: @@ -212,10 +212,10 @@ OPENSSL_instrument_halt: .align 16 OPENSSL_far_spin: .L_OPENSSL_far_spin_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushfl popl %eax @@ -244,10 +244,10 @@ OPENSSL_far_spin: .align 16 OPENSSL_wipe_cpu: .L_OPENSSL_wipe_cpu_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl %eax,%eax xorl %edx,%edx @@ -280,10 +280,10 @@ OPENSSL_wipe_cpu: .align 16 OPENSSL_atomic_add: .L_OPENSSL_atomic_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%ecx @@ -304,10 +304,10 @@ OPENSSL_atomic_add: .align 16 OPENSSL_cleanse: .L_OPENSSL_cleanse_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%ecx @@ -346,10 +346,10 @@ OPENSSL_cleanse: .align 16 CRYPTO_memcmp: .L_CRYPTO_memcmp_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -380,10 +380,10 @@ CRYPTO_memcmp: .align 16 OPENSSL_instrument_bus: .L_OPENSSL_instrument_bus_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -433,10 +433,10 @@ OPENSSL_instrument_bus: .align 16 OPENSSL_instrument_bus2: .L_OPENSSL_instrument_bus2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -499,10 +499,10 @@ OPENSSL_instrument_bus2: .align 16 OPENSSL_ia32_rdrand_bytes: .L_OPENSSL_ia32_rdrand_bytes_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %ebx @@ -547,10 +547,10 @@ OPENSSL_ia32_rdrand_bytes: .align 16 OPENSSL_ia32_rdseed_bytes: .L_OPENSSL_ia32_rdseed_bytes_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm/engines/e_padlock-x86.S b/deps/openssl/config/archs/linux-elf/asm/engines/e_padlock-x86.S index 81e4ec050582c4..cea65eba34a03b 100644 --- a/deps/openssl/config/archs/linux-elf/asm/engines/e_padlock-x86.S +++ b/deps/openssl/config/archs/linux-elf/asm/engines/e_padlock-x86.S @@ -4,10 +4,10 @@ .align 16 padlock_capability: .L_padlock_capability_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx pushfl @@ -69,10 +69,10 @@ padlock_capability: .align 16 padlock_key_bswap: .L_padlock_key_bswap_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 240(%edx),%ecx @@ -92,10 +92,10 @@ padlock_key_bswap: .align 16 padlock_verify_context: .L_padlock_verify_context_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx leal .Lpadlock_saved_context-.L004verify_pic_point,%eax @@ -108,10 +108,10 @@ padlock_verify_context: .type _padlock_verify_ctx,@function .align 16 _padlock_verify_ctx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%eax btl $30,4(%esp) @@ -129,10 +129,10 @@ _padlock_verify_ctx: .align 16 padlock_reload_key: .L_padlock_reload_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushfl popfl @@ -143,10 +143,10 @@ padlock_reload_key: .align 16 padlock_aes_block: .L_padlock_aes_block_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -168,10 +168,10 @@ padlock_aes_block: .align 16 padlock_ecb_encrypt: .L_padlock_ecb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -352,10 +352,10 @@ padlock_ecb_encrypt: .align 16 padlock_cbc_encrypt: .L_padlock_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -540,10 +540,10 @@ padlock_cbc_encrypt: .align 16 padlock_cfb_encrypt: .L_padlock_cfb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -667,10 +667,10 @@ padlock_cfb_encrypt: .align 16 padlock_ofb_encrypt: .L_padlock_ofb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -794,10 +794,10 @@ padlock_ofb_encrypt: .align 16 padlock_ctr32_encrypt: .L_padlock_ctr32_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -906,10 +906,10 @@ padlock_ctr32_encrypt: .align 16 padlock_xstore: .L_padlock_xstore_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi movl 8(%esp),%edi @@ -921,10 +921,10 @@ padlock_xstore: .type _win32_segv_handler,@function .align 16 _win32_segv_handler: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $1,%eax movl 4(%esp),%edx @@ -941,10 +941,10 @@ _win32_segv_handler: .align 16 padlock_sha1_oneshot: .L_padlock_sha1_oneshot_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -977,10 +977,10 @@ padlock_sha1_oneshot: .align 16 padlock_sha1_blocks: .L_padlock_sha1_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -1012,10 +1012,10 @@ padlock_sha1_blocks: .align 16 padlock_sha256_oneshot: .L_padlock_sha256_oneshot_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -1048,10 +1048,10 @@ padlock_sha256_oneshot: .align 16 padlock_sha256_blocks: .L_padlock_sha256_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -1083,10 +1083,10 @@ padlock_sha256_blocks: .align 16 padlock_sha512_blocks: .L_padlock_sha512_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi diff --git a/deps/openssl/config/archs/linux-elf/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-elf/asm/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/linux-elf/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-elf/asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux-elf/asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux-elf/asm/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/linux-elf/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-elf/asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux-elf/asm/include/progs.h b/deps/openssl/config/archs/linux-elf/asm/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/linux-elf/asm/include/progs.h +++ b/deps/openssl/config/archs/linux-elf/asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-elf/asm/openssl.gypi b/deps/openssl/config/archs/linux-elf/asm/openssl.gypi index 0cf7d926c47e93..c782453da24f90 100644 --- a/deps/openssl/config/archs/linux-elf/asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-elf/asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/apps/progs.c b/deps/openssl/config/archs/linux-elf/asm_avx2/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/apps/progs.c +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux-elf/asm_avx2/configdata.pm index 90aff138cbc5cd..9797a19b75c08b 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,10 +207,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux-elf", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -394,7 +394,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -897,6 +896,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1053,9 +1055,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3492,9 +3491,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5886,9 +5882,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7271,6 +7264,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7479,10 +7476,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10286,7 +10279,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10337,7 +10329,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12540,9 +12531,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14934,9 +14922,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16301,10 +16286,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16906,7 +16887,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18365,6 +18345,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18527,9 +18511,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19902,7 +19883,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20236,6 +20216,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20288,7 +20269,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24492,7 +24472,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24519,7 +24498,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25770,9 +25748,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25854,9 +25829,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25987,6 +25959,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26299,12 +26277,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27693,8 +27665,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27721,7 +27693,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27738,8 +27710,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27757,7 +27729,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27779,7 +27751,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/aes/aes-586.S b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/aes/aes-586.S index 628a3b6333e9d3..9ee3fc9a57e8e1 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/aes/aes-586.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/aes/aes-586.S @@ -2,10 +2,10 @@ .type _x86_AES_encrypt_compact,@function .align 16 _x86_AES_encrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -274,10 +274,10 @@ _x86_AES_encrypt_compact: .type _sse_AES_encrypt_compact,@function .align 16 _sse_AES_encrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pxor (%edi),%mm0 pxor 8(%edi),%mm4 @@ -436,10 +436,10 @@ _sse_AES_encrypt_compact: .type _x86_AES_encrypt,@function .align 16 _x86_AES_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -995,10 +995,10 @@ _x86_AES_encrypt: .align 16 AES_encrypt: .L_AES_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1063,10 +1063,10 @@ AES_encrypt: .type _x86_AES_decrypt_compact,@function .align 16 _x86_AES_decrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -1423,10 +1423,10 @@ _x86_AES_decrypt_compact: .type _sse_AES_decrypt_compact,@function .align 16 _sse_AES_decrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pxor (%edi),%mm0 pxor 8(%edi),%mm4 @@ -1644,10 +1644,10 @@ _sse_AES_decrypt_compact: .type _x86_AES_decrypt,@function .align 16 _x86_AES_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -2207,10 +2207,10 @@ _x86_AES_decrypt: .align 16 AES_decrypt: .L_AES_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2277,10 +2277,10 @@ AES_decrypt: .align 16 AES_cbc_encrypt: .L_AES_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2813,10 +2813,10 @@ AES_cbc_encrypt: .type _x86_AES_set_encrypt_key,@function .align 16 _x86_AES_set_encrypt_key: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3050,10 +3050,10 @@ _x86_AES_set_encrypt_key: .align 16 AES_set_encrypt_key: .L_AES_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call _x86_AES_set_encrypt_key ret @@ -3063,10 +3063,10 @@ AES_set_encrypt_key: .align 16 AES_set_decrypt_key: .L_AES_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call _x86_AES_set_encrypt_key cmpl $0,%eax diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/aes/aesni-x86.S b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/aes/aesni-x86.S index 9191466ee47a31..eb2d01b16630a1 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/aes/aesni-x86.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/aes/aesni-x86.S @@ -4,10 +4,10 @@ .align 16 aesni_encrypt: .L_aesni_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 12(%esp),%edx @@ -36,10 +36,10 @@ aesni_encrypt: .align 16 aesni_decrypt: .L_aesni_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 12(%esp),%edx @@ -66,10 +66,10 @@ aesni_decrypt: .type _aesni_encrypt2,@function .align 16 _aesni_encrypt2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -98,10 +98,10 @@ _aesni_encrypt2: .type _aesni_decrypt2,@function .align 16 _aesni_decrypt2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -130,10 +130,10 @@ _aesni_decrypt2: .type _aesni_encrypt3,@function .align 16 _aesni_encrypt3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -167,10 +167,10 @@ _aesni_encrypt3: .type _aesni_decrypt3,@function .align 16 _aesni_decrypt3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -204,10 +204,10 @@ _aesni_decrypt3: .type _aesni_encrypt4,@function .align 16 _aesni_encrypt4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 movups 16(%edx),%xmm1 @@ -247,10 +247,10 @@ _aesni_encrypt4: .type _aesni_decrypt4,@function .align 16 _aesni_decrypt4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 movups 16(%edx),%xmm1 @@ -290,10 +290,10 @@ _aesni_decrypt4: .type _aesni_encrypt6,@function .align 16 _aesni_encrypt6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -349,10 +349,10 @@ _aesni_encrypt6: .type _aesni_decrypt6,@function .align 16 _aesni_decrypt6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -410,10 +410,10 @@ _aesni_decrypt6: .align 16 aesni_ecb_encrypt: .L_aesni_ecb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -650,10 +650,10 @@ aesni_ecb_encrypt: .align 16 aesni_ccm64_encrypt_blocks: .L_aesni_ccm64_encrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -743,10 +743,10 @@ aesni_ccm64_encrypt_blocks: .align 16 aesni_ccm64_decrypt_blocks: .L_aesni_ccm64_decrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -871,10 +871,10 @@ aesni_ccm64_decrypt_blocks: .align 16 aesni_ctr32_encrypt_blocks: .L_aesni_ctr32_encrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1114,10 +1114,10 @@ aesni_ctr32_encrypt_blocks: .align 16 aesni_xts_encrypt: .L_aesni_xts_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1479,10 +1479,10 @@ aesni_xts_encrypt: .align 16 aesni_xts_decrypt: .L_aesni_xts_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1874,10 +1874,10 @@ aesni_xts_decrypt: .align 16 aesni_ocb_encrypt: .L_aesni_ocb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2274,10 +2274,10 @@ aesni_ocb_encrypt: .align 16 aesni_ocb_decrypt: .L_aesni_ocb_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2674,10 +2674,10 @@ aesni_ocb_decrypt: .align 16 aesni_cbc_encrypt: .L_aesni_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2938,10 +2938,10 @@ aesni_cbc_encrypt: .type _aesni_set_encrypt_key,@function .align 16 _aesni_set_encrypt_key: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3278,10 +3278,10 @@ _aesni_set_encrypt_key: .align 16 aesni_set_encrypt_key: .L_aesni_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%ecx @@ -3294,10 +3294,10 @@ aesni_set_encrypt_key: .align 16 aesni_set_decrypt_key: .L_aesni_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%ecx diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/aes/vpaes-x86.S b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/aes/vpaes-x86.S index 39d00e772e56d9..f3adb70545a641 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/aes/vpaes-x86.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/aes/vpaes-x86.S @@ -59,10 +59,10 @@ .type _vpaes_preheat,@function .align 16 _vpaes_preheat: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%ebp movdqa -48(%ebp),%xmm7 @@ -72,10 +72,10 @@ _vpaes_preheat: .type _vpaes_encrypt_core,@function .align 16 _vpaes_encrypt_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $16,%ecx movl 240(%edx),%eax @@ -154,10 +154,10 @@ _vpaes_encrypt_core: .type _vpaes_decrypt_core,@function .align 16 _vpaes_decrypt_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif leal 608(%ebp),%ebx movl 240(%edx),%eax @@ -247,10 +247,10 @@ _vpaes_decrypt_core: .type _vpaes_schedule_core,@function .align 16 _vpaes_schedule_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%ebp movdqu (%esi),%xmm0 @@ -346,10 +346,10 @@ _vpaes_schedule_core: .type _vpaes_schedule_192_smear,@function .align 16 _vpaes_schedule_192_smear: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pshufd $128,%xmm6,%xmm1 pshufd $254,%xmm7,%xmm0 @@ -363,10 +363,10 @@ _vpaes_schedule_192_smear: .type _vpaes_schedule_round,@function .align 16 _vpaes_schedule_round: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa 8(%esp),%xmm2 pxor %xmm1,%xmm1 @@ -417,10 +417,10 @@ _vpaes_schedule_round: .type _vpaes_schedule_transform,@function .align 16 _vpaes_schedule_transform: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa -16(%ebp),%xmm2 movdqa %xmm2,%xmm1 @@ -437,10 +437,10 @@ _vpaes_schedule_transform: .type _vpaes_schedule_mangle,@function .align 16 _vpaes_schedule_mangle: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa %xmm0,%xmm4 movdqa 128(%ebp),%xmm5 @@ -503,10 +503,10 @@ _vpaes_schedule_mangle: .align 16 vpaes_set_encrypt_key: .L_vpaes_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -541,10 +541,10 @@ vpaes_set_encrypt_key: .align 16 vpaes_set_decrypt_key: .L_vpaes_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -584,10 +584,10 @@ vpaes_set_decrypt_key: .align 16 vpaes_encrypt: .L_vpaes_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -618,10 +618,10 @@ vpaes_encrypt: .align 16 vpaes_decrypt: .L_vpaes_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -652,10 +652,10 @@ vpaes_decrypt: .align 16 vpaes_cbc_encrypt: .L_vpaes_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/bf/bf-586.S b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/bf/bf-586.S index a3ff8edf86bcde..801b28d56381f2 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/bf/bf-586.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/bf/bf-586.S @@ -4,10 +4,10 @@ .align 16 BF_encrypt: .L_BF_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -359,10 +359,10 @@ BF_encrypt: .align 16 BF_decrypt: .L_BF_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -714,10 +714,10 @@ BF_decrypt: .align 16 BF_cbc_encrypt: .L_BF_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -782,55 +782,55 @@ BF_cbc_encrypt: xorl %edx,%edx jmp *%ebp .L006ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx .L007ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh .L008ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl .L009ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp .L010ejend .L011ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx .L012ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch .L013ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl .L010ejend: diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/bn/bn-586.S b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/bn/bn-586.S index 2495ae69451647..a74e6470b438db 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/bn/bn-586.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/bn/bn-586.S @@ -4,10 +4,10 @@ .align 16 bn_mul_add_words: .L_bn_mul_add_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L000PIC_me_up .L000PIC_me_up: @@ -292,10 +292,10 @@ bn_mul_add_words: .align 16 bn_mul_words: .L_bn_mul_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L010PIC_me_up .L010PIC_me_up: @@ -479,10 +479,10 @@ bn_mul_words: .align 16 bn_sqr_words: .L_bn_sqr_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L017PIC_me_up .L017PIC_me_up: @@ -625,10 +625,10 @@ bn_sqr_words: .align 16 bn_div_words: .L_bn_div_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax @@ -641,10 +641,10 @@ bn_div_words: .align 16 bn_add_words: .L_bn_add_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -828,10 +828,10 @@ bn_add_words: .align 16 bn_sub_words: .L_bn_sub_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1015,10 +1015,10 @@ bn_sub_words: .align 16 bn_sub_part_words: .L_bn_sub_part_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/bn/co-586.S b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/bn/co-586.S index 9a90455392adee..bc8cd28886aeac 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/bn/co-586.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/bn/co-586.S @@ -4,10 +4,10 @@ .align 16 bn_mul_comba8: .L_bn_mul_comba8_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi movl 12(%esp),%esi @@ -553,10 +553,10 @@ bn_mul_comba8: .align 16 bn_mul_comba4: .L_bn_mul_comba4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi movl 12(%esp),%esi @@ -726,10 +726,10 @@ bn_mul_comba4: .align 16 bn_sqr_comba8: .L_bn_sqr_comba8_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1139,10 +1139,10 @@ bn_sqr_comba8: .align 16 bn_sqr_comba4: .L_bn_sqr_comba4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/bn/x86-gf2m.S b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/bn/x86-gf2m.S index fcb54e967b4cbc..b784b7cbe310e1 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/bn/x86-gf2m.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/bn/x86-gf2m.S @@ -2,10 +2,10 @@ .type _mul_1x1_mmx,@function .align 16 _mul_1x1_mmx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif subl $36,%esp movl %eax,%ecx @@ -110,10 +110,10 @@ _mul_1x1_mmx: .type _mul_1x1_ialu,@function .align 16 _mul_1x1_ialu: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif subl $36,%esp movl %eax,%ecx @@ -249,10 +249,10 @@ _mul_1x1_ialu: .align 16 bn_GF2m_mul_2x2: .L_bn_GF2m_mul_2x2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L000PIC_me_up .L000PIC_me_up: diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/bn/x86-mont.S b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/bn/x86-mont.S index 7dddbf7d87f1d8..5d8a4c6cb31633 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/bn/x86-mont.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/bn/x86-mont.S @@ -4,10 +4,10 @@ .align 16 bn_mul_mont: .L_bn_mul_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx 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 3a655350497561..9acdfd4ff82b51 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-elf" -#define DATE "built on: Mon Sep 30 17:10:15 2024 UTC" +#define DATE "built on: Mon Mar 3 17:41:51 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/camellia/cmll-x86.S b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/camellia/cmll-x86.S index bcbaf49e0ac210..f4b77edc3333cd 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/camellia/cmll-x86.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/camellia/cmll-x86.S @@ -4,10 +4,10 @@ .align 16 Camellia_EncryptBlock_Rounds: .L_Camellia_EncryptBlock_Rounds_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -63,10 +63,10 @@ Camellia_EncryptBlock_Rounds: .align 16 Camellia_EncryptBlock: .L_Camellia_EncryptBlock_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $128,%eax subl 4(%esp),%eax @@ -80,10 +80,10 @@ Camellia_EncryptBlock: .align 16 Camellia_encrypt: .L_Camellia_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -137,10 +137,10 @@ Camellia_encrypt: .type _x86_Camellia_encrypt,@function .align 16 _x86_Camellia_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl (%edi),%eax xorl 4(%edi),%ebx @@ -372,10 +372,10 @@ _x86_Camellia_encrypt: .align 16 Camellia_DecryptBlock_Rounds: .L_Camellia_DecryptBlock_Rounds_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -431,10 +431,10 @@ Camellia_DecryptBlock_Rounds: .align 16 Camellia_DecryptBlock: .L_Camellia_DecryptBlock_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $128,%eax subl 4(%esp),%eax @@ -448,10 +448,10 @@ Camellia_DecryptBlock: .align 16 Camellia_decrypt: .L_Camellia_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -505,10 +505,10 @@ Camellia_decrypt: .type _x86_Camellia_decrypt,@function .align 16 _x86_Camellia_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl (%edi),%eax xorl 4(%edi),%ebx @@ -740,10 +740,10 @@ _x86_Camellia_decrypt: .align 16 Camellia_Ekeygen: .L_Camellia_Ekeygen_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1586,10 +1586,10 @@ Camellia_Ekeygen: .align 16 Camellia_set_key: .L_Camellia_set_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ecx @@ -2143,10 +2143,10 @@ Camellia_set_key: .align 16 Camellia_cbc_encrypt: .L_Camellia_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/chacha/chacha-x86.S b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/chacha/chacha-x86.S index 9cc4027c738002..ec98cb32fd0e6e 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/chacha/chacha-x86.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/chacha/chacha-x86.S @@ -4,10 +4,10 @@ .align 16 ChaCha20_ctr32: .L_ChaCha20_ctr32_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -382,10 +382,10 @@ ChaCha20_ctr32: .align 16 ChaCha20_ssse3: .L_ChaCha20_ssse3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -979,10 +979,10 @@ ChaCha20_ssse3: .align 16 ChaCha20_xop: .L_ChaCha20_xop_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/des/crypt586.S b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/des/crypt586.S index ac4b251ec0b12f..29ba0fa70a8e2b 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/des/crypt586.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/des/crypt586.S @@ -4,10 +4,10 @@ .align 16 fcrypt_body: .L_fcrypt_body_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/des/des-586.S b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/des/des-586.S index 90449e4fac6a0f..b3839fa8875df9 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/des/des-586.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/des/des-586.S @@ -3,10 +3,10 @@ .type _x86_DES_encrypt,@function .align 16 _x86_DES_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ecx @@ -479,10 +479,10 @@ _x86_DES_encrypt: .type _x86_DES_decrypt,@function .align 16 _x86_DES_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ecx @@ -957,10 +957,10 @@ _x86_DES_decrypt: .align 16 DES_encrypt1: .L_DES_encrypt1_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1075,10 +1075,10 @@ DES_encrypt1: .align 16 DES_encrypt2: .L_DES_encrypt2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1123,10 +1123,10 @@ DES_encrypt2: .align 16 DES_encrypt3: .L_DES_encrypt3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ebx @@ -1249,10 +1249,10 @@ DES_encrypt3: .align 16 DES_decrypt3: .L_DES_decrypt3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ebx @@ -1375,10 +1375,10 @@ DES_decrypt3: .align 16 DES_ncbc_encrypt: .L_DES_ncbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -1441,55 +1441,55 @@ DES_ncbc_encrypt: xorl %edx,%edx jmp *%ebp .L012ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx .L013ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh .L014ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl .L015ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp .L016ejend .L017ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx .L018ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch .L019ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl .L016ejend: @@ -1595,10 +1595,10 @@ DES_ncbc_encrypt: .align 16 DES_ede3_cbc_encrypt: .L_DES_ede3_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -1665,55 +1665,55 @@ DES_ede3_cbc_encrypt: xorl %edx,%edx jmp *%ebp .L036ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx .L037ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh .L038ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl .L039ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp .L040ejend .L041ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx .L042ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch .L043ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl .L040ejend: diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/ec/ecp_nistz256-x86.S b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/ec/ecp_nistz256-x86.S index 4e17d5eb877efc..f822079f8a9fb7 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/ec/ecp_nistz256-x86.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/ec/ecp_nistz256-x86.S @@ -2387,10 +2387,10 @@ ecp_nistz256_precomputed: .align 16 ecp_nistz256_mul_by_2: .L_ecp_nistz256_mul_by_2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2411,10 +2411,10 @@ ecp_nistz256_mul_by_2: .align 16 ecp_nistz256_mul_by_3: .L_ecp_nistz256_mul_by_3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2441,10 +2441,10 @@ ecp_nistz256_mul_by_3: .align 16 ecp_nistz256_div_by_2: .L_ecp_nistz256_div_by_2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2462,10 +2462,10 @@ ecp_nistz256_div_by_2: .type _ecp_nistz256_div_by_2,@function .align 16 _ecp_nistz256_div_by_2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ebp xorl %edx,%edx @@ -2550,10 +2550,10 @@ _ecp_nistz256_div_by_2: .align 16 ecp_nistz256_add: .L_ecp_nistz256_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2572,10 +2572,10 @@ ecp_nistz256_add: .type _ecp_nistz256_add,@function .align 16 _ecp_nistz256_add: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%eax movl 4(%esi),%ebx @@ -2654,10 +2654,10 @@ _ecp_nistz256_add: .align 16 ecp_nistz256_sub: .L_ecp_nistz256_sub_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2676,10 +2676,10 @@ ecp_nistz256_sub: .type _ecp_nistz256_sub,@function .align 16 _ecp_nistz256_sub: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%eax movl 4(%esi),%ebx @@ -2739,10 +2739,10 @@ _ecp_nistz256_sub: .align 16 ecp_nistz256_neg: .L_ecp_nistz256_neg_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2772,10 +2772,10 @@ ecp_nistz256_neg: .type _picup_eax,@function .align 16 _picup_eax: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esp),%eax ret @@ -2785,10 +2785,10 @@ _picup_eax: .align 16 ecp_nistz256_to_mont: .L_ecp_nistz256_to_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2813,10 +2813,10 @@ ecp_nistz256_to_mont: .align 16 ecp_nistz256_from_mont: .L_ecp_nistz256_from_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2841,10 +2841,10 @@ ecp_nistz256_from_mont: .align 16 ecp_nistz256_mul_mont: .L_ecp_nistz256_mul_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2869,10 +2869,10 @@ ecp_nistz256_mul_mont: .align 16 ecp_nistz256_sqr_mont: .L_ecp_nistz256_sqr_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2895,10 +2895,10 @@ ecp_nistz256_sqr_mont: .type _ecp_nistz256_mul_mont,@function .align 16 _ecp_nistz256_mul_mont: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif andl $83886080,%eax cmpl $83886080,%eax @@ -3797,10 +3797,10 @@ _ecp_nistz256_mul_mont: .align 16 ecp_nistz256_scatter_w5: .L_ecp_nistz256_scatter_w5_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3835,10 +3835,10 @@ ecp_nistz256_scatter_w5: .align 16 ecp_nistz256_gather_w5: .L_ecp_nistz256_gather_w5_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3934,10 +3934,10 @@ ecp_nistz256_gather_w5: .align 16 ecp_nistz256_scatter_w7: .L_ecp_nistz256_scatter_w7_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3970,10 +3970,10 @@ ecp_nistz256_scatter_w7: .align 16 ecp_nistz256_gather_w7: .L_ecp_nistz256_gather_w7_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4189,10 +4189,10 @@ ecp_nistz256_gather_w7: .align 16 ecp_nistz256_point_double: .L_ecp_nistz256_point_double_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4320,10 +4320,10 @@ ecp_nistz256_point_double: .align 16 ecp_nistz256_point_add: .L_ecp_nistz256_point_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4838,10 +4838,10 @@ ecp_nistz256_point_add: .align 16 ecp_nistz256_point_add_affine: .L_ecp_nistz256_point_add_affine_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/md5/md5-586.S b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/md5/md5-586.S index 33c01af676ab4d..7e96dc647ade2a 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/md5/md5-586.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/md5/md5-586.S @@ -4,10 +4,10 @@ .align 16 ossl_md5_block_asm_data_order: .L_ossl_md5_block_asm_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/modes/ghash-x86.S b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/modes/ghash-x86.S index dd80e32c53beb3..9b3361acd3a552 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/modes/ghash-x86.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/modes/ghash-x86.S @@ -4,10 +4,10 @@ .align 16 gcm_gmult_4bit_x86: .L_gcm_gmult_4bit_x86_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -103,10 +103,10 @@ gcm_gmult_4bit_x86: .align 16 gcm_ghash_4bit_x86: .L_gcm_ghash_4bit_x86_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -217,10 +217,10 @@ gcm_ghash_4bit_x86: .align 16 gcm_gmult_4bit_mmx: .L_gcm_gmult_4bit_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -321,10 +321,10 @@ gcm_gmult_4bit_mmx: .align 16 gcm_ghash_4bit_mmx: .L_gcm_ghash_4bit_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -930,10 +930,10 @@ gcm_ghash_4bit_mmx: .align 16 gcm_init_clmul: .L_gcm_init_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax @@ -1004,10 +1004,10 @@ gcm_init_clmul: .align 16 gcm_gmult_clmul: .L_gcm_gmult_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%edx @@ -1062,10 +1062,10 @@ gcm_gmult_clmul: .align 16 gcm_ghash_clmul: .L_gcm_ghash_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/poly1305/poly1305-x86.S b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/poly1305/poly1305-x86.S index f95649faed3710..e76632cd1e7011 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/poly1305/poly1305-x86.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/poly1305/poly1305-x86.S @@ -5,10 +5,10 @@ .align 16 poly1305_init: .L_poly1305_init_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -71,10 +71,10 @@ poly1305_init: .align 16 poly1305_blocks: .L_poly1305_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -244,10 +244,10 @@ poly1305_blocks: .align 16 poly1305_emit: .L_poly1305_emit_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -308,10 +308,10 @@ poly1305_emit: .type _poly1305_init_sse2,@function .align 16 _poly1305_init_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqu 24(%edi),%xmm4 leal 48(%edi),%edi @@ -515,10 +515,10 @@ _poly1305_init_sse2: .type _poly1305_blocks_sse2,@function .align 16 _poly1305_blocks_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1281,10 +1281,10 @@ _poly1305_blocks_sse2: .type _poly1305_emit_sse2,@function .align 16 _poly1305_emit_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1379,10 +1379,10 @@ _poly1305_emit_sse2: .type _poly1305_init_avx2,@function .align 16 _poly1305_init_avx2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif vmovdqu 24(%edi),%xmm4 leal 48(%edi),%edi @@ -1555,10 +1555,10 @@ _poly1305_init_avx2: .type _poly1305_blocks_avx2,@function .align 16 _poly1305_blocks_avx2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/rc4/rc4-586.S b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/rc4/rc4-586.S index da909a31e73010..a10b047a7ecd4b 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/rc4/rc4-586.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/rc4/rc4-586.S @@ -4,10 +4,10 @@ .align 16 RC4: .L_RC4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -275,10 +275,10 @@ RC4: .align 16 RC4_set_key: .L_RC4_set_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -358,10 +358,10 @@ RC4_set_key: .align 16 RC4_options: .L_RC4_options_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L018pic_point .L018pic_point: diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/ripemd/rmd-586.S b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/ripemd/rmd-586.S index 57b95af6dde072..4f3ea459c99d61 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/ripemd/rmd-586.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/ripemd/rmd-586.S @@ -4,10 +4,10 @@ .align 16 ripemd160_block_asm_data_order: .L_ripemd160_block_asm_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/sha/sha1-586.S b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/sha/sha1-586.S index ddc85b3d82df65..4b60a71ee8332a 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/sha/sha1-586.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/sha/sha1-586.S @@ -4,10 +4,10 @@ .align 16 sha1_block_data_order: .L_sha1_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1403,10 +1403,10 @@ sha1_block_data_order: .type _sha1_block_data_order_shaext,@function .align 16 _sha1_block_data_order_shaext: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1578,10 +1578,10 @@ _sha1_block_data_order_shaext: .type _sha1_block_data_order_ssse3,@function .align 16 _sha1_block_data_order_ssse3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2802,10 +2802,10 @@ _sha1_block_data_order_ssse3: .type _sha1_block_data_order_avx,@function .align 16 _sha1_block_data_order_avx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/sha/sha256-586.S b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/sha/sha256-586.S index 9436ca5e1d8c92..c8599bd582c669 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/sha/sha256-586.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/sha/sha256-586.S @@ -4,10 +4,10 @@ .align 16 sha256_block_data_order: .L_sha256_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/sha/sha512-586.S b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/sha/sha512-586.S index c7cf815b4e052e..99d198dd91dc83 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/sha/sha512-586.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/sha/sha512-586.S @@ -4,10 +4,10 @@ .align 16 sha512_block_data_order: .L_sha512_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/whrlpool/wp-mmx.S b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/whrlpool/wp-mmx.S index 9fb9ca1e45efb9..ee571f6459470e 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/whrlpool/wp-mmx.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/whrlpool/wp-mmx.S @@ -4,10 +4,10 @@ .align 16 whirlpool_block_mmx: .L_whirlpool_block_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/x86cpuid.S b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/x86cpuid.S index eedacacfea8676..d4f2ec09e4e693 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/x86cpuid.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/x86cpuid.S @@ -4,10 +4,10 @@ .align 16 OPENSSL_ia32_cpuid: .L_OPENSSL_ia32_cpuid_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -153,10 +153,10 @@ OPENSSL_ia32_cpuid: .align 16 OPENSSL_rdtsc: .L_OPENSSL_rdtsc_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl %eax,%eax xorl %edx,%edx @@ -175,10 +175,10 @@ OPENSSL_rdtsc: .align 16 OPENSSL_instrument_halt: .L_OPENSSL_instrument_halt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L011PIC_me_up .L011PIC_me_up: @@ -212,10 +212,10 @@ OPENSSL_instrument_halt: .align 16 OPENSSL_far_spin: .L_OPENSSL_far_spin_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushfl popl %eax @@ -244,10 +244,10 @@ OPENSSL_far_spin: .align 16 OPENSSL_wipe_cpu: .L_OPENSSL_wipe_cpu_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl %eax,%eax xorl %edx,%edx @@ -280,10 +280,10 @@ OPENSSL_wipe_cpu: .align 16 OPENSSL_atomic_add: .L_OPENSSL_atomic_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%ecx @@ -304,10 +304,10 @@ OPENSSL_atomic_add: .align 16 OPENSSL_cleanse: .L_OPENSSL_cleanse_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%ecx @@ -346,10 +346,10 @@ OPENSSL_cleanse: .align 16 CRYPTO_memcmp: .L_CRYPTO_memcmp_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -380,10 +380,10 @@ CRYPTO_memcmp: .align 16 OPENSSL_instrument_bus: .L_OPENSSL_instrument_bus_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -433,10 +433,10 @@ OPENSSL_instrument_bus: .align 16 OPENSSL_instrument_bus2: .L_OPENSSL_instrument_bus2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -499,10 +499,10 @@ OPENSSL_instrument_bus2: .align 16 OPENSSL_ia32_rdrand_bytes: .L_OPENSSL_ia32_rdrand_bytes_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %ebx @@ -547,10 +547,10 @@ OPENSSL_ia32_rdrand_bytes: .align 16 OPENSSL_ia32_rdseed_bytes: .L_OPENSSL_ia32_rdseed_bytes_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %ebx diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/engines/e_padlock-x86.S b/deps/openssl/config/archs/linux-elf/asm_avx2/engines/e_padlock-x86.S index 81e4ec050582c4..cea65eba34a03b 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/engines/e_padlock-x86.S +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/engines/e_padlock-x86.S @@ -4,10 +4,10 @@ .align 16 padlock_capability: .L_padlock_capability_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx pushfl @@ -69,10 +69,10 @@ padlock_capability: .align 16 padlock_key_bswap: .L_padlock_key_bswap_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 240(%edx),%ecx @@ -92,10 +92,10 @@ padlock_key_bswap: .align 16 padlock_verify_context: .L_padlock_verify_context_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx leal .Lpadlock_saved_context-.L004verify_pic_point,%eax @@ -108,10 +108,10 @@ padlock_verify_context: .type _padlock_verify_ctx,@function .align 16 _padlock_verify_ctx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%eax btl $30,4(%esp) @@ -129,10 +129,10 @@ _padlock_verify_ctx: .align 16 padlock_reload_key: .L_padlock_reload_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushfl popfl @@ -143,10 +143,10 @@ padlock_reload_key: .align 16 padlock_aes_block: .L_padlock_aes_block_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -168,10 +168,10 @@ padlock_aes_block: .align 16 padlock_ecb_encrypt: .L_padlock_ecb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -352,10 +352,10 @@ padlock_ecb_encrypt: .align 16 padlock_cbc_encrypt: .L_padlock_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -540,10 +540,10 @@ padlock_cbc_encrypt: .align 16 padlock_cfb_encrypt: .L_padlock_cfb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -667,10 +667,10 @@ padlock_cfb_encrypt: .align 16 padlock_ofb_encrypt: .L_padlock_ofb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -794,10 +794,10 @@ padlock_ofb_encrypt: .align 16 padlock_ctr32_encrypt: .L_padlock_ctr32_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -906,10 +906,10 @@ padlock_ctr32_encrypt: .align 16 padlock_xstore: .L_padlock_xstore_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi movl 8(%esp),%edi @@ -921,10 +921,10 @@ padlock_xstore: .type _win32_segv_handler,@function .align 16 _win32_segv_handler: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $1,%eax movl 4(%esp),%edx @@ -941,10 +941,10 @@ _win32_segv_handler: .align 16 padlock_sha1_oneshot: .L_padlock_sha1_oneshot_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -977,10 +977,10 @@ padlock_sha1_oneshot: .align 16 padlock_sha1_blocks: .L_padlock_sha1_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -1012,10 +1012,10 @@ padlock_sha1_blocks: .align 16 padlock_sha256_oneshot: .L_padlock_sha256_oneshot_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -1048,10 +1048,10 @@ padlock_sha256_oneshot: .align 16 padlock_sha256_blocks: .L_padlock_sha256_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -1083,10 +1083,10 @@ padlock_sha256_blocks: .align 16 padlock_sha512_blocks: .L_padlock_sha512_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/include/progs.h b/deps/openssl/config/archs/linux-elf/asm_avx2/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux-elf/asm_avx2/openssl.gypi index 4ca065ef163fd8..a0ce9ab8dcae98 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', diff --git a/deps/openssl/config/archs/linux-elf/no-asm/apps/progs.c b/deps/openssl/config/archs/linux-elf/no-asm/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/linux-elf/no-asm/apps/progs.c +++ b/deps/openssl/config/archs/linux-elf/no-asm/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-elf/no-asm/configdata.pm b/deps/openssl/config/archs/linux-elf/no-asm/configdata.pm index 479b266eb3e98d..bea915bf0bd923 100644 --- a/deps/openssl/config/archs/linux-elf/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux-elf/no-asm/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [], @@ -157,7 +157,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,10 +206,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux-elf", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -394,7 +394,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -898,6 +897,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1054,9 +1056,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3434,9 +3433,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5828,9 +5824,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7213,6 +7206,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7421,10 +7418,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10206,7 +10199,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10257,7 +10249,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12460,9 +12451,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14854,9 +14842,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16221,10 +16206,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16826,7 +16807,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18285,6 +18265,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18447,9 +18431,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19822,7 +19803,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20156,6 +20136,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20208,7 +20189,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24334,7 +24314,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24361,7 +24340,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25602,9 +25580,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25686,9 +25661,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25819,6 +25791,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26131,12 +26109,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27528,8 +27500,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27556,7 +27528,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27573,8 +27545,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27592,7 +27564,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27614,7 +27586,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by 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 cea8ea6ace931b..3a80e6d9a60910 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-elf" -#define DATE "built on: Mon Sep 30 17:10:28 2024 UTC" +#define DATE "built on: Mon Mar 3 17:42:00 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux-elf/no-asm/include/progs.h b/deps/openssl/config/archs/linux-elf/no-asm/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/linux-elf/no-asm/include/progs.h +++ b/deps/openssl/config/archs/linux-elf/no-asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi b/deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi index 3b06ffbeef4280..8bc730460cf9f9 100644 --- a/deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/apps/progs.c b/deps/openssl/config/archs/linux-ppc64le/asm/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm/apps/progs.c +++ b/deps/openssl/config/archs/linux-ppc64le/asm/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/configdata.pm b/deps/openssl/config/archs/linux-ppc64le/asm/configdata.pm index be8ddf1031a71c..fff2ad9cb3c275 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm/configdata.pm +++ b/deps/openssl/config/archs/linux-ppc64le/asm/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,10 +207,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux-ppc64le", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -395,7 +395,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -898,6 +897,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1054,9 +1056,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3472,9 +3471,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5866,9 +5862,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7251,6 +7244,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7459,10 +7456,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10282,7 +10275,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10333,7 +10325,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12536,9 +12527,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14930,9 +14918,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16297,10 +16282,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16902,7 +16883,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18361,6 +18341,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18523,9 +18507,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19898,7 +19879,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20232,6 +20212,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20284,7 +20265,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24545,7 +24525,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24572,7 +24551,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25830,9 +25808,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25914,9 +25889,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -26047,6 +26019,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26359,12 +26337,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27753,8 +27725,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27781,7 +27753,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27798,8 +27770,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27817,7 +27789,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27839,7 +27811,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by 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 a1d53486daf67c..aefb18f496ef9b 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-ppc64le/asm/crypto/buildinf.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-ppc64le" -#define DATE "built on: Mon Sep 30 17:11:23 2024 UTC" +#define DATE "built on: Mon Mar 3 17:42:38 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/include/progs.h b/deps/openssl/config/archs/linux-ppc64le/asm/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm/include/progs.h +++ b/deps/openssl/config/archs/linux-ppc64le/asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/openssl.gypi b/deps/openssl/config/archs/linux-ppc64le/asm/openssl.gypi index a7479e90fbe74c..391c727e3caa73 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-ppc64le/asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/apps/progs.c b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/apps/progs.c +++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/configdata.pm index 4693b1e2ca61fc..01f9ca793c2292 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,10 +207,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux-ppc64le", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -395,7 +395,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -898,6 +897,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1054,9 +1056,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3472,9 +3471,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5866,9 +5862,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7251,6 +7244,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7459,10 +7456,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10282,7 +10275,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10333,7 +10325,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12536,9 +12527,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14930,9 +14918,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16297,10 +16282,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16902,7 +16883,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18361,6 +18341,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18523,9 +18507,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19898,7 +19879,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20232,6 +20212,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20284,7 +20265,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24545,7 +24525,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24572,7 +24551,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25830,9 +25808,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25914,9 +25889,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -26047,6 +26019,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26359,12 +26337,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27753,8 +27725,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27781,7 +27753,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27798,8 +27770,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27817,7 +27789,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27839,7 +27811,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by 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 62ae301563cef0..bd19182e0cf04e 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-ppc64le" -#define DATE "built on: Mon Sep 30 17:11:36 2024 UTC" +#define DATE "built on: Mon Mar 3 17:42:46 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/progs.h b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/openssl.gypi index f07a1c9c6a49d1..df4018f9641216 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/linux-ppc64le/no-asm/apps/progs.c b/deps/openssl/config/archs/linux-ppc64le/no-asm/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/linux-ppc64le/no-asm/apps/progs.c +++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-ppc64le/no-asm/configdata.pm b/deps/openssl/config/archs/linux-ppc64le/no-asm/configdata.pm index 4ea931962056d2..69e6177264d46f 100644 --- a/deps/openssl/config/archs/linux-ppc64le/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [], @@ -157,7 +157,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,10 +206,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux-ppc64le", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -395,7 +395,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -899,6 +898,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1055,9 +1057,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3435,9 +3434,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5829,9 +5825,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7214,6 +7207,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7422,10 +7419,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10207,7 +10200,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10258,7 +10250,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12461,9 +12452,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14855,9 +14843,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16222,10 +16207,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16827,7 +16808,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18286,6 +18266,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18448,9 +18432,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19823,7 +19804,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20157,6 +20137,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20209,7 +20190,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24335,7 +24315,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24362,7 +24341,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25603,9 +25581,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25687,9 +25662,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25820,6 +25792,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26132,12 +26110,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27529,8 +27501,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27557,7 +27529,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27574,8 +27546,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27593,7 +27565,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27615,7 +27587,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by 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 813a758dbb8463..06e21bcbf73ff9 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-ppc64le" -#define DATE "built on: Mon Sep 30 17:11:49 2024 UTC" +#define DATE "built on: Mon Mar 3 17:42:54 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux-ppc64le/no-asm/include/progs.h b/deps/openssl/config/archs/linux-ppc64le/no-asm/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/linux-ppc64le/no-asm/include/progs.h +++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl.gypi b/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl.gypi index 046ec44ce8eb20..59a593c03ce93c 100644 --- a/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/linux-x86_64/asm/apps/progs.c b/deps/openssl/config/archs/linux-x86_64/asm/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/apps/progs.c +++ b/deps/openssl/config/archs/linux-x86_64/asm/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-x86_64/asm/configdata.pm b/deps/openssl/config/archs/linux-x86_64/asm/configdata.pm index 0a7527c74f608d..f5692b0609ae9f 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/configdata.pm +++ b/deps/openssl/config/archs/linux-x86_64/asm/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,10 +207,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux-x86_64", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -396,7 +396,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -899,6 +898,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1055,9 +1057,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3499,9 +3498,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5893,9 +5889,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7278,6 +7271,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7486,10 +7483,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10329,7 +10322,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10380,7 +10372,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12583,9 +12574,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14977,9 +14965,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16344,10 +16329,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16949,7 +16930,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18408,6 +18388,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18570,9 +18554,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19945,7 +19926,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20279,6 +20259,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20331,7 +20312,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24626,7 +24606,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24653,7 +24632,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25917,9 +25895,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -26001,9 +25976,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -26134,6 +26106,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26446,12 +26424,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27840,8 +27812,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27868,7 +27840,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27885,8 +27857,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27904,7 +27876,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27926,7 +27898,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by 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 56ff0a9f0ced76..75d352be92534e 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-x86_64" -#define DATE "built on: Mon Sep 30 17:10:40 2024 UTC" +#define DATE "built on: Mon Mar 3 17:42:07 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux-x86_64/asm/include/progs.h b/deps/openssl/config/archs/linux-x86_64/asm/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/include/progs.h +++ b/deps/openssl/config/archs/linux-x86_64/asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-x86_64/asm/openssl.gypi b/deps/openssl/config/archs/linux-x86_64/asm/openssl.gypi index 14bcd8e7f8fbed..a2861e7edd1b49 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-x86_64/asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/apps/progs.c b/deps/openssl/config/archs/linux-x86_64/asm_avx2/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/apps/progs.c +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux-x86_64/asm_avx2/configdata.pm index 8de9a59e88a749..1300f267aba1cd 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 @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,10 +207,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux-x86_64", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -396,7 +396,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -899,6 +898,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1055,9 +1057,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3499,9 +3498,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5893,9 +5889,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7278,6 +7271,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7486,10 +7483,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10329,7 +10322,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10380,7 +10372,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12583,9 +12574,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14977,9 +14965,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16344,10 +16329,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16949,7 +16930,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18408,6 +18388,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18570,9 +18554,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19945,7 +19926,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20279,6 +20259,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20331,7 +20312,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24626,7 +24606,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24653,7 +24632,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25917,9 +25895,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -26001,9 +25976,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -26134,6 +26106,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26446,12 +26424,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27840,8 +27812,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27868,7 +27840,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27885,8 +27857,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27904,7 +27876,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27926,7 +27898,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by 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 75117a04bb1d92..4df569f1c484b2 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-x86_64" -#define DATE "built on: Mon Sep 30 17:10:56 2024 UTC" +#define DATE "built on: Mon Mar 3 17:42:19 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/progs.h b/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl.gypi index 20c248d53cc144..5be120b7db1199 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 @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', diff --git a/deps/openssl/config/archs/linux-x86_64/no-asm/apps/progs.c b/deps/openssl/config/archs/linux-x86_64/no-asm/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/linux-x86_64/no-asm/apps/progs.c +++ b/deps/openssl/config/archs/linux-x86_64/no-asm/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-x86_64/no-asm/configdata.pm b/deps/openssl/config/archs/linux-x86_64/no-asm/configdata.pm index d520c3b33b87ae..84bde7dd6f4baa 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 @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [], @@ -157,7 +157,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,10 +206,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux-x86_64", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -396,7 +396,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -900,6 +899,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1056,9 +1058,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3436,9 +3435,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5830,9 +5826,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7215,6 +7208,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7423,10 +7420,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10208,7 +10201,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10259,7 +10251,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12462,9 +12453,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14856,9 +14844,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16223,10 +16208,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16828,7 +16809,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18287,6 +18267,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18449,9 +18433,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19824,7 +19805,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20158,6 +20138,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20210,7 +20191,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24336,7 +24316,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24363,7 +24342,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25604,9 +25582,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25688,9 +25663,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25821,6 +25793,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26133,12 +26111,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27530,8 +27502,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27558,7 +27530,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27575,8 +27547,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27594,7 +27566,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27616,7 +27588,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by 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 8062b751473863..b3d5bc5dfd560f 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-x86_64" -#define DATE "built on: Mon Sep 30 17:11:12 2024 UTC" +#define DATE "built on: Mon Mar 3 17:42:30 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux-x86_64/no-asm/include/progs.h b/deps/openssl/config/archs/linux-x86_64/no-asm/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/linux-x86_64/no-asm/include/progs.h +++ b/deps/openssl/config/archs/linux-x86_64/no-asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-x86_64/no-asm/openssl.gypi b/deps/openssl/config/archs/linux-x86_64/no-asm/openssl.gypi index f9ab8cd8ad2d05..0eae103bf3914d 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 @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/linux32-s390x/asm/apps/progs.c b/deps/openssl/config/archs/linux32-s390x/asm/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/apps/progs.c +++ b/deps/openssl/config/archs/linux32-s390x/asm/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm b/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm index 25d7152a50338e..60d2dfb49963a5 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm +++ b/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,10 +207,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux32-s390x", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -395,7 +395,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -898,6 +897,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1054,9 +1056,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3481,9 +3480,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5875,9 +5871,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7260,6 +7253,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7468,10 +7465,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10269,7 +10262,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10320,7 +10312,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12523,9 +12514,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14917,9 +14905,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16284,10 +16269,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16889,7 +16870,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18402,6 +18382,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18564,9 +18548,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19939,7 +19920,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20273,6 +20253,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20325,7 +20306,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24507,7 +24487,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24534,7 +24513,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25783,9 +25761,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25867,9 +25842,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -26000,6 +25972,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26312,12 +26290,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27706,8 +27678,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27734,7 +27706,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27751,8 +27723,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27770,7 +27742,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27792,7 +27764,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by 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 a1815adcb47351..8c11f6d346c703 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux32-s390x/asm/crypto/buildinf.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux32-s390x" -#define DATE "built on: Mon Sep 30 17:12:01 2024 UTC" +#define DATE "built on: Mon Mar 3 17:43:02 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux32-s390x/asm/include/progs.h b/deps/openssl/config/archs/linux32-s390x/asm/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/include/progs.h +++ b/deps/openssl/config/archs/linux32-s390x/asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux32-s390x/asm/openssl.gypi b/deps/openssl/config/archs/linux32-s390x/asm/openssl.gypi index 5815f28914db57..d2ec66abc20775 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/openssl.gypi +++ b/deps/openssl/config/archs/linux32-s390x/asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/apps/progs.c b/deps/openssl/config/archs/linux32-s390x/asm_avx2/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/apps/progs.c +++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux32-s390x/asm_avx2/configdata.pm index bfdea24dd5e5ae..d2ef0d48efbe77 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,10 +207,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux32-s390x", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -395,7 +395,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -898,6 +897,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1054,9 +1056,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3481,9 +3480,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5875,9 +5871,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7260,6 +7253,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7468,10 +7465,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10269,7 +10262,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10320,7 +10312,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12523,9 +12514,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14917,9 +14905,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16284,10 +16269,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16889,7 +16870,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18402,6 +18382,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18564,9 +18548,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19939,7 +19920,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20273,6 +20253,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20325,7 +20306,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24507,7 +24487,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24534,7 +24513,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25783,9 +25761,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25867,9 +25842,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -26000,6 +25972,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26312,12 +26290,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27706,8 +27678,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27734,7 +27706,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27751,8 +27723,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27770,7 +27742,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27792,7 +27764,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by 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 e6b3e00f5c752f..4e3fbde330bef6 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux32-s390x" -#define DATE "built on: Mon Sep 30 17:12:14 2024 UTC" +#define DATE "built on: Mon Mar 3 17:43:10 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/progs.h b/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux32-s390x/asm_avx2/openssl.gypi index 9cebf7a2e7764c..9a9cb1df312f6a 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', diff --git a/deps/openssl/config/archs/linux32-s390x/no-asm/apps/progs.c b/deps/openssl/config/archs/linux32-s390x/no-asm/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/linux32-s390x/no-asm/apps/progs.c +++ b/deps/openssl/config/archs/linux32-s390x/no-asm/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux32-s390x/no-asm/configdata.pm b/deps/openssl/config/archs/linux32-s390x/no-asm/configdata.pm index 36af8f54cc6c9f..aa400e08f318d9 100644 --- a/deps/openssl/config/archs/linux32-s390x/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux32-s390x/no-asm/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [], @@ -157,7 +157,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,10 +206,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux32-s390x", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -395,7 +395,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -899,6 +898,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1055,9 +1057,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3435,9 +3434,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5829,9 +5825,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7214,6 +7207,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7422,10 +7419,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10207,7 +10200,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10258,7 +10250,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12461,9 +12452,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14855,9 +14843,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16222,10 +16207,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16827,7 +16808,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18286,6 +18266,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18448,9 +18432,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19823,7 +19804,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20157,6 +20137,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20209,7 +20190,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24335,7 +24315,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24362,7 +24341,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25603,9 +25581,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25687,9 +25662,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25820,6 +25792,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26132,12 +26110,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27529,8 +27501,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27557,7 +27529,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27574,8 +27546,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27593,7 +27565,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27615,7 +27587,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by 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 2e191c2e4841b1..de07bf7b6dba92 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux32-s390x" -#define DATE "built on: Mon Sep 30 17:12:26 2024 UTC" +#define DATE "built on: Mon Mar 3 17:43:19 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux32-s390x/no-asm/include/progs.h b/deps/openssl/config/archs/linux32-s390x/no-asm/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/linux32-s390x/no-asm/include/progs.h +++ b/deps/openssl/config/archs/linux32-s390x/no-asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux32-s390x/no-asm/openssl.gypi b/deps/openssl/config/archs/linux32-s390x/no-asm/openssl.gypi index 1b3c2428a59557..7dc0d96b51cfce 100644 --- a/deps/openssl/config/archs/linux32-s390x/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux32-s390x/no-asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/linux64-loongarch64/no-asm/apps/progs.c b/deps/openssl/config/archs/linux64-loongarch64/no-asm/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/linux64-loongarch64/no-asm/apps/progs.c +++ b/deps/openssl/config/archs/linux64-loongarch64/no-asm/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux64-loongarch64/no-asm/configdata.pm b/deps/openssl/config/archs/linux64-loongarch64/no-asm/configdata.pm index 4ba193f4bf39c7..37a5a14c93fe97 100644 --- a/deps/openssl/config/archs/linux64-loongarch64/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux64-loongarch64/no-asm/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [], @@ -157,7 +157,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,10 +206,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux64-loongarch64", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -394,7 +394,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -898,6 +897,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1054,9 +1056,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3434,9 +3433,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5828,9 +5824,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7213,6 +7206,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7421,10 +7418,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10206,7 +10199,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10257,7 +10249,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12460,9 +12451,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14854,9 +14842,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16221,10 +16206,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16826,7 +16807,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18285,6 +18265,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18447,9 +18431,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19822,7 +19803,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20156,6 +20136,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20208,7 +20189,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24334,7 +24314,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24361,7 +24340,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25602,9 +25580,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25686,9 +25661,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25819,6 +25791,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26131,12 +26109,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27528,8 +27500,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27556,7 +27528,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27573,8 +27545,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27592,7 +27564,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27614,7 +27586,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by 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 8b0b4c9de878bc..d72925c30be65b 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux64-loongarch64" -#define DATE "built on: Mon Sep 30 17:16:54 2024 UTC" +#define DATE "built on: Mon Mar 3 17:46:16 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux64-loongarch64/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux64-loongarch64/no-asm/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/linux64-loongarch64/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux64-loongarch64/no-asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux64-loongarch64/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux64-loongarch64/no-asm/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/linux64-loongarch64/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux64-loongarch64/no-asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux64-loongarch64/no-asm/include/progs.h b/deps/openssl/config/archs/linux64-loongarch64/no-asm/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/linux64-loongarch64/no-asm/include/progs.h +++ b/deps/openssl/config/archs/linux64-loongarch64/no-asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux64-loongarch64/no-asm/openssl.gypi b/deps/openssl/config/archs/linux64-loongarch64/no-asm/openssl.gypi index 7646500a7b4e33..530fb2b9972229 100644 --- a/deps/openssl/config/archs/linux64-loongarch64/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux64-loongarch64/no-asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/linux64-mips64/asm/apps/progs.c b/deps/openssl/config/archs/linux64-mips64/asm/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm/apps/progs.c +++ b/deps/openssl/config/archs/linux64-mips64/asm/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux64-mips64/asm/configdata.pm b/deps/openssl/config/archs/linux64-mips64/asm/configdata.pm index 751dc619e087fa..16c26e39f33267 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm/configdata.pm +++ b/deps/openssl/config/archs/linux64-mips64/asm/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -162,7 +162,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -210,10 +210,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -262,11 +262,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux64-mips64", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -399,7 +399,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -902,6 +901,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1058,9 +1060,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3460,9 +3459,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5854,9 +5850,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7239,6 +7232,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7447,10 +7444,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10241,7 +10234,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10292,7 +10284,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12495,9 +12486,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14889,9 +14877,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16256,10 +16241,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16861,7 +16842,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18359,6 +18339,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18521,9 +18505,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19896,7 +19877,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20230,6 +20210,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20282,7 +20263,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24440,7 +24420,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24467,7 +24446,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25712,9 +25690,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25796,9 +25771,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25929,6 +25901,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26241,12 +26219,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27635,8 +27607,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27663,7 +27635,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27680,8 +27652,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27699,7 +27671,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27721,7 +27693,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by 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 5bcb19f0038b15..23dd9acc9d3839 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux64-mips64/asm/crypto/buildinf.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux64-mips64" -#define DATE "built on: Mon Sep 30 17:13:16 2024 UTC" +#define DATE "built on: Mon Mar 3 17:43:51 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux64-mips64/asm/include/progs.h b/deps/openssl/config/archs/linux64-mips64/asm/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm/include/progs.h +++ b/deps/openssl/config/archs/linux64-mips64/asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux64-mips64/asm/openssl.gypi b/deps/openssl/config/archs/linux64-mips64/asm/openssl.gypi index 530cea8a707d21..2766034c0f47f9 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm/openssl.gypi +++ b/deps/openssl/config/archs/linux64-mips64/asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/apps/progs.c b/deps/openssl/config/archs/linux64-mips64/asm_avx2/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/apps/progs.c +++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux64-mips64/asm_avx2/configdata.pm index c861a6aa75de33..e0c528631e9c62 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -162,7 +162,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -210,10 +210,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -262,11 +262,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux64-mips64", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -399,7 +399,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -902,6 +901,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1058,9 +1060,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3460,9 +3459,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5854,9 +5850,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7239,6 +7232,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7447,10 +7444,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10241,7 +10234,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10292,7 +10284,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12495,9 +12486,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14889,9 +14877,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16256,10 +16241,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16861,7 +16842,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18359,6 +18339,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18521,9 +18505,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19896,7 +19877,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20230,6 +20210,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20282,7 +20263,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24440,7 +24420,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24467,7 +24446,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25712,9 +25690,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25796,9 +25771,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25929,6 +25901,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26241,12 +26219,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27635,8 +27607,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27663,7 +27635,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27680,8 +27652,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27699,7 +27671,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27721,7 +27693,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by 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 9969f7fbe4894a..379c66fbf9b83b 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux64-mips64" -#define DATE "built on: Mon Sep 30 17:13:28 2024 UTC" +#define DATE "built on: Mon Mar 3 17:43:59 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/progs.h b/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux64-mips64/asm_avx2/openssl.gypi index 04841c7652189d..94f3c87ec84cd0 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/linux64-mips64/no-asm/apps/progs.c b/deps/openssl/config/archs/linux64-mips64/no-asm/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/linux64-mips64/no-asm/apps/progs.c +++ b/deps/openssl/config/archs/linux64-mips64/no-asm/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux64-mips64/no-asm/configdata.pm b/deps/openssl/config/archs/linux64-mips64/no-asm/configdata.pm index 0aa374d19d56cb..959c6bdae9669e 100644 --- a/deps/openssl/config/archs/linux64-mips64/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux64-mips64/no-asm/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [], @@ -157,7 +157,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,10 +206,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux64-mips64", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -396,7 +396,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -900,6 +899,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1056,9 +1058,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3436,9 +3435,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5830,9 +5826,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7215,6 +7208,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7423,10 +7420,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10208,7 +10201,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10259,7 +10251,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12462,9 +12453,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14856,9 +14844,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16223,10 +16208,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16828,7 +16809,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18287,6 +18267,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18449,9 +18433,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19824,7 +19805,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20158,6 +20138,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20210,7 +20191,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24336,7 +24316,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24363,7 +24342,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25604,9 +25582,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25688,9 +25663,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25821,6 +25793,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26133,12 +26111,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27530,8 +27502,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27558,7 +27530,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27575,8 +27547,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27594,7 +27566,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27616,7 +27588,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by 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 135ced7215d174..3b11689edb450b 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux64-mips64" -#define DATE "built on: Mon Sep 30 17:13:40 2024 UTC" +#define DATE "built on: Mon Mar 3 17:44:07 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux64-mips64/no-asm/include/progs.h b/deps/openssl/config/archs/linux64-mips64/no-asm/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/linux64-mips64/no-asm/include/progs.h +++ b/deps/openssl/config/archs/linux64-mips64/no-asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux64-mips64/no-asm/openssl.gypi b/deps/openssl/config/archs/linux64-mips64/no-asm/openssl.gypi index 0051a07280ecd4..d668c5608169c9 100644 --- a/deps/openssl/config/archs/linux64-mips64/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux64-mips64/no-asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/linux64-riscv64/no-asm/apps/progs.c b/deps/openssl/config/archs/linux64-riscv64/no-asm/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/linux64-riscv64/no-asm/apps/progs.c +++ b/deps/openssl/config/archs/linux64-riscv64/no-asm/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux64-riscv64/no-asm/configdata.pm b/deps/openssl/config/archs/linux64-riscv64/no-asm/configdata.pm index ce13ea66723d9f..68ceff41bdba60 100644 --- a/deps/openssl/config/archs/linux64-riscv64/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux64-riscv64/no-asm/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [], @@ -157,7 +157,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,10 +206,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux64-riscv64", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -394,7 +394,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -898,6 +897,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1054,9 +1056,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3434,9 +3433,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5828,9 +5824,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7213,6 +7206,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7421,10 +7418,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10206,7 +10199,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10257,7 +10249,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12460,9 +12451,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14854,9 +14842,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16221,10 +16206,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16826,7 +16807,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18285,6 +18265,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18447,9 +18431,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19822,7 +19803,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20156,6 +20136,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20208,7 +20189,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24334,7 +24314,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24361,7 +24340,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25602,9 +25580,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25686,9 +25661,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25819,6 +25791,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26131,12 +26109,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27528,8 +27500,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27556,7 +27528,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27573,8 +27545,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27592,7 +27564,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27614,7 +27586,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by 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 f5d77a05993d1a..b3ac448ae93c91 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux64-riscv64" -#define DATE "built on: Mon Sep 30 17:16:42 2024 UTC" +#define DATE "built on: Mon Mar 3 17:46:08 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux64-riscv64/no-asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux64-riscv64/no-asm/include/progs.h b/deps/openssl/config/archs/linux64-riscv64/no-asm/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/linux64-riscv64/no-asm/include/progs.h +++ b/deps/openssl/config/archs/linux64-riscv64/no-asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux64-riscv64/no-asm/openssl.gypi b/deps/openssl/config/archs/linux64-riscv64/no-asm/openssl.gypi index b4549cc91f5c0d..28788f4b84b746 100644 --- a/deps/openssl/config/archs/linux64-riscv64/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux64-riscv64/no-asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/linux64-s390x/asm/apps/progs.c b/deps/openssl/config/archs/linux64-s390x/asm/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/apps/progs.c +++ b/deps/openssl/config/archs/linux64-s390x/asm/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux64-s390x/asm/configdata.pm b/deps/openssl/config/archs/linux64-s390x/asm/configdata.pm index df0ce5c951f633..45b2d6db853b6c 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/configdata.pm +++ b/deps/openssl/config/archs/linux64-s390x/asm/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,10 +207,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux64-s390x", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -396,7 +396,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -899,6 +898,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1055,9 +1057,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3482,9 +3481,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5876,9 +5872,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7261,6 +7254,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7469,10 +7466,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10280,7 +10273,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10331,7 +10323,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12534,9 +12525,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14928,9 +14916,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16295,10 +16280,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16900,7 +16881,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18413,6 +18393,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18575,9 +18559,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19950,7 +19931,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20284,6 +20264,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20336,7 +20317,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24518,7 +24498,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24545,7 +24524,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25794,9 +25772,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25878,9 +25853,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -26011,6 +25983,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26323,12 +26301,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27717,8 +27689,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27745,7 +27717,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27762,8 +27734,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27781,7 +27753,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27803,7 +27775,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by 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 d7922fa6537630..0ea787b93c0cd2 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux64-s390x/asm/crypto/buildinf.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux64-s390x" -#define DATE "built on: Mon Sep 30 17:12:38 2024 UTC" +#define DATE "built on: Mon Mar 3 17:43:26 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux64-s390x/asm/include/progs.h b/deps/openssl/config/archs/linux64-s390x/asm/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/include/progs.h +++ b/deps/openssl/config/archs/linux64-s390x/asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux64-s390x/asm/openssl.gypi b/deps/openssl/config/archs/linux64-s390x/asm/openssl.gypi index 0e033968bf85be..3f54c7665d7c5d 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/openssl.gypi +++ b/deps/openssl/config/archs/linux64-s390x/asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/apps/progs.c b/deps/openssl/config/archs/linux64-s390x/asm_avx2/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/apps/progs.c +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux64-s390x/asm_avx2/configdata.pm index b106196b63ae5c..ca52cbf61a75f8 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -159,7 +159,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -207,10 +207,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux64-s390x", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -396,7 +396,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -899,6 +898,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1055,9 +1057,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3482,9 +3481,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5876,9 +5872,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7261,6 +7254,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7469,10 +7466,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10280,7 +10273,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10331,7 +10323,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12534,9 +12525,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14928,9 +14916,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16295,10 +16280,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16900,7 +16881,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18413,6 +18393,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18575,9 +18559,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19950,7 +19931,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20284,6 +20264,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20336,7 +20317,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24518,7 +24498,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24545,7 +24524,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25794,9 +25772,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25878,9 +25853,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -26011,6 +25983,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26323,12 +26301,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27717,8 +27689,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27745,7 +27717,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27762,8 +27734,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27781,7 +27753,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27803,7 +27775,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by 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 2c9106ca3ca56c..52aaaf17bdc568 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux64-s390x" -#define DATE "built on: Mon Sep 30 17:12:51 2024 UTC" +#define DATE "built on: Mon Mar 3 17:43:35 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/progs.h b/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux64-s390x/asm_avx2/openssl.gypi index d3994ecfaeb3e9..2624be71174e70 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', diff --git a/deps/openssl/config/archs/linux64-s390x/no-asm/apps/progs.c b/deps/openssl/config/archs/linux64-s390x/no-asm/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/linux64-s390x/no-asm/apps/progs.c +++ b/deps/openssl/config/archs/linux64-s390x/no-asm/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux64-s390x/no-asm/configdata.pm b/deps/openssl/config/archs/linux64-s390x/no-asm/configdata.pm index 1462cc41faebed..c3c1ad3164188b 100644 --- a/deps/openssl/config/archs/linux64-s390x/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux64-s390x/no-asm/configdata.pm @@ -142,7 +142,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [], @@ -157,7 +157,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -206,10 +206,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -259,11 +259,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned char", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "linux64-s390x", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -396,7 +396,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -900,6 +899,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1056,9 +1058,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3436,9 +3435,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5830,9 +5826,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7215,6 +7208,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7423,10 +7420,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10208,7 +10201,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10259,7 +10251,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12462,9 +12453,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14856,9 +14844,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16223,10 +16208,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16828,7 +16809,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18287,6 +18267,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18449,9 +18433,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19824,7 +19805,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20158,6 +20138,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20210,7 +20191,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24336,7 +24316,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24363,7 +24342,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25604,9 +25582,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25688,9 +25663,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25821,6 +25793,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26133,12 +26111,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27530,8 +27502,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27558,7 +27530,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27575,8 +27547,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27594,7 +27566,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27616,7 +27588,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by 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 65fd9d291b3df3..517566c703840b 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux64-s390x" -#define DATE "built on: Mon Sep 30 17:13:04 2024 UTC" +#define DATE "built on: Mon Mar 3 17:43:43 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/linux64-s390x/no-asm/include/progs.h b/deps/openssl/config/archs/linux64-s390x/no-asm/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/linux64-s390x/no-asm/include/progs.h +++ b/deps/openssl/config/archs/linux64-s390x/no-asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux64-s390x/no-asm/openssl.gypi b/deps/openssl/config/archs/linux64-s390x/no-asm/openssl.gypi index c1c132a136e21f..1fdc4dfb040e29 100644 --- a/deps/openssl/config/archs/linux64-s390x/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux64-s390x/no-asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/apps/progs.c b/deps/openssl/config/archs/solaris-x86-gcc/asm/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/apps/progs.c +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/configdata.pm b/deps/openssl/config/archs/solaris-x86-gcc/asm/configdata.pm index 15732afc0605eb..d9b38c8cd7bb56 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/configdata.pm +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/configdata.pm @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -204,10 +204,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -256,11 +256,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "solaris-x86-gcc", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -387,7 +387,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -890,6 +889,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1046,9 +1048,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3485,9 +3484,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5879,9 +5875,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7264,6 +7257,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7472,10 +7469,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10279,7 +10272,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10330,7 +10322,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12533,9 +12524,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14927,9 +14915,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16294,10 +16279,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16899,7 +16880,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18358,6 +18338,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18520,9 +18504,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19895,7 +19876,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20229,6 +20209,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20281,7 +20262,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24485,7 +24465,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24512,7 +24491,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25763,9 +25741,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25847,9 +25822,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25980,6 +25952,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26292,12 +26270,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27686,8 +27658,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27714,7 +27686,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27731,8 +27703,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27750,7 +27722,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27772,7 +27744,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/aes/aes-586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/aes/aes-586.S index 628a3b6333e9d3..9ee3fc9a57e8e1 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/aes/aes-586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/aes/aes-586.S @@ -2,10 +2,10 @@ .type _x86_AES_encrypt_compact,@function .align 16 _x86_AES_encrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -274,10 +274,10 @@ _x86_AES_encrypt_compact: .type _sse_AES_encrypt_compact,@function .align 16 _sse_AES_encrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pxor (%edi),%mm0 pxor 8(%edi),%mm4 @@ -436,10 +436,10 @@ _sse_AES_encrypt_compact: .type _x86_AES_encrypt,@function .align 16 _x86_AES_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -995,10 +995,10 @@ _x86_AES_encrypt: .align 16 AES_encrypt: .L_AES_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1063,10 +1063,10 @@ AES_encrypt: .type _x86_AES_decrypt_compact,@function .align 16 _x86_AES_decrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -1423,10 +1423,10 @@ _x86_AES_decrypt_compact: .type _sse_AES_decrypt_compact,@function .align 16 _sse_AES_decrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pxor (%edi),%mm0 pxor 8(%edi),%mm4 @@ -1644,10 +1644,10 @@ _sse_AES_decrypt_compact: .type _x86_AES_decrypt,@function .align 16 _x86_AES_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -2207,10 +2207,10 @@ _x86_AES_decrypt: .align 16 AES_decrypt: .L_AES_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2277,10 +2277,10 @@ AES_decrypt: .align 16 AES_cbc_encrypt: .L_AES_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2813,10 +2813,10 @@ AES_cbc_encrypt: .type _x86_AES_set_encrypt_key,@function .align 16 _x86_AES_set_encrypt_key: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3050,10 +3050,10 @@ _x86_AES_set_encrypt_key: .align 16 AES_set_encrypt_key: .L_AES_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call _x86_AES_set_encrypt_key ret @@ -3063,10 +3063,10 @@ AES_set_encrypt_key: .align 16 AES_set_decrypt_key: .L_AES_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call _x86_AES_set_encrypt_key cmpl $0,%eax diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/aes/aesni-x86.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/aes/aesni-x86.S index 9191466ee47a31..eb2d01b16630a1 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/aes/aesni-x86.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/aes/aesni-x86.S @@ -4,10 +4,10 @@ .align 16 aesni_encrypt: .L_aesni_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 12(%esp),%edx @@ -36,10 +36,10 @@ aesni_encrypt: .align 16 aesni_decrypt: .L_aesni_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 12(%esp),%edx @@ -66,10 +66,10 @@ aesni_decrypt: .type _aesni_encrypt2,@function .align 16 _aesni_encrypt2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -98,10 +98,10 @@ _aesni_encrypt2: .type _aesni_decrypt2,@function .align 16 _aesni_decrypt2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -130,10 +130,10 @@ _aesni_decrypt2: .type _aesni_encrypt3,@function .align 16 _aesni_encrypt3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -167,10 +167,10 @@ _aesni_encrypt3: .type _aesni_decrypt3,@function .align 16 _aesni_decrypt3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -204,10 +204,10 @@ _aesni_decrypt3: .type _aesni_encrypt4,@function .align 16 _aesni_encrypt4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 movups 16(%edx),%xmm1 @@ -247,10 +247,10 @@ _aesni_encrypt4: .type _aesni_decrypt4,@function .align 16 _aesni_decrypt4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 movups 16(%edx),%xmm1 @@ -290,10 +290,10 @@ _aesni_decrypt4: .type _aesni_encrypt6,@function .align 16 _aesni_encrypt6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -349,10 +349,10 @@ _aesni_encrypt6: .type _aesni_decrypt6,@function .align 16 _aesni_decrypt6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -410,10 +410,10 @@ _aesni_decrypt6: .align 16 aesni_ecb_encrypt: .L_aesni_ecb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -650,10 +650,10 @@ aesni_ecb_encrypt: .align 16 aesni_ccm64_encrypt_blocks: .L_aesni_ccm64_encrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -743,10 +743,10 @@ aesni_ccm64_encrypt_blocks: .align 16 aesni_ccm64_decrypt_blocks: .L_aesni_ccm64_decrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -871,10 +871,10 @@ aesni_ccm64_decrypt_blocks: .align 16 aesni_ctr32_encrypt_blocks: .L_aesni_ctr32_encrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1114,10 +1114,10 @@ aesni_ctr32_encrypt_blocks: .align 16 aesni_xts_encrypt: .L_aesni_xts_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1479,10 +1479,10 @@ aesni_xts_encrypt: .align 16 aesni_xts_decrypt: .L_aesni_xts_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1874,10 +1874,10 @@ aesni_xts_decrypt: .align 16 aesni_ocb_encrypt: .L_aesni_ocb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2274,10 +2274,10 @@ aesni_ocb_encrypt: .align 16 aesni_ocb_decrypt: .L_aesni_ocb_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2674,10 +2674,10 @@ aesni_ocb_decrypt: .align 16 aesni_cbc_encrypt: .L_aesni_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2938,10 +2938,10 @@ aesni_cbc_encrypt: .type _aesni_set_encrypt_key,@function .align 16 _aesni_set_encrypt_key: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3278,10 +3278,10 @@ _aesni_set_encrypt_key: .align 16 aesni_set_encrypt_key: .L_aesni_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%ecx @@ -3294,10 +3294,10 @@ aesni_set_encrypt_key: .align 16 aesni_set_decrypt_key: .L_aesni_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%ecx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/aes/vpaes-x86.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/aes/vpaes-x86.S index 39d00e772e56d9..f3adb70545a641 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/aes/vpaes-x86.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/aes/vpaes-x86.S @@ -59,10 +59,10 @@ .type _vpaes_preheat,@function .align 16 _vpaes_preheat: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%ebp movdqa -48(%ebp),%xmm7 @@ -72,10 +72,10 @@ _vpaes_preheat: .type _vpaes_encrypt_core,@function .align 16 _vpaes_encrypt_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $16,%ecx movl 240(%edx),%eax @@ -154,10 +154,10 @@ _vpaes_encrypt_core: .type _vpaes_decrypt_core,@function .align 16 _vpaes_decrypt_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif leal 608(%ebp),%ebx movl 240(%edx),%eax @@ -247,10 +247,10 @@ _vpaes_decrypt_core: .type _vpaes_schedule_core,@function .align 16 _vpaes_schedule_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%ebp movdqu (%esi),%xmm0 @@ -346,10 +346,10 @@ _vpaes_schedule_core: .type _vpaes_schedule_192_smear,@function .align 16 _vpaes_schedule_192_smear: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pshufd $128,%xmm6,%xmm1 pshufd $254,%xmm7,%xmm0 @@ -363,10 +363,10 @@ _vpaes_schedule_192_smear: .type _vpaes_schedule_round,@function .align 16 _vpaes_schedule_round: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa 8(%esp),%xmm2 pxor %xmm1,%xmm1 @@ -417,10 +417,10 @@ _vpaes_schedule_round: .type _vpaes_schedule_transform,@function .align 16 _vpaes_schedule_transform: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa -16(%ebp),%xmm2 movdqa %xmm2,%xmm1 @@ -437,10 +437,10 @@ _vpaes_schedule_transform: .type _vpaes_schedule_mangle,@function .align 16 _vpaes_schedule_mangle: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa %xmm0,%xmm4 movdqa 128(%ebp),%xmm5 @@ -503,10 +503,10 @@ _vpaes_schedule_mangle: .align 16 vpaes_set_encrypt_key: .L_vpaes_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -541,10 +541,10 @@ vpaes_set_encrypt_key: .align 16 vpaes_set_decrypt_key: .L_vpaes_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -584,10 +584,10 @@ vpaes_set_decrypt_key: .align 16 vpaes_encrypt: .L_vpaes_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -618,10 +618,10 @@ vpaes_encrypt: .align 16 vpaes_decrypt: .L_vpaes_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -652,10 +652,10 @@ vpaes_decrypt: .align 16 vpaes_cbc_encrypt: .L_vpaes_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bf/bf-586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bf/bf-586.S index a3ff8edf86bcde..801b28d56381f2 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bf/bf-586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bf/bf-586.S @@ -4,10 +4,10 @@ .align 16 BF_encrypt: .L_BF_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -359,10 +359,10 @@ BF_encrypt: .align 16 BF_decrypt: .L_BF_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -714,10 +714,10 @@ BF_decrypt: .align 16 BF_cbc_encrypt: .L_BF_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -782,55 +782,55 @@ BF_cbc_encrypt: xorl %edx,%edx jmp *%ebp .L006ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx .L007ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh .L008ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl .L009ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp .L010ejend .L011ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx .L012ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch .L013ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl .L010ejend: diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bn/bn-586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bn/bn-586.S index 2495ae69451647..a74e6470b438db 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bn/bn-586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bn/bn-586.S @@ -4,10 +4,10 @@ .align 16 bn_mul_add_words: .L_bn_mul_add_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L000PIC_me_up .L000PIC_me_up: @@ -292,10 +292,10 @@ bn_mul_add_words: .align 16 bn_mul_words: .L_bn_mul_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L010PIC_me_up .L010PIC_me_up: @@ -479,10 +479,10 @@ bn_mul_words: .align 16 bn_sqr_words: .L_bn_sqr_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L017PIC_me_up .L017PIC_me_up: @@ -625,10 +625,10 @@ bn_sqr_words: .align 16 bn_div_words: .L_bn_div_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax @@ -641,10 +641,10 @@ bn_div_words: .align 16 bn_add_words: .L_bn_add_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -828,10 +828,10 @@ bn_add_words: .align 16 bn_sub_words: .L_bn_sub_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1015,10 +1015,10 @@ bn_sub_words: .align 16 bn_sub_part_words: .L_bn_sub_part_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bn/co-586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bn/co-586.S index 9a90455392adee..bc8cd28886aeac 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bn/co-586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bn/co-586.S @@ -4,10 +4,10 @@ .align 16 bn_mul_comba8: .L_bn_mul_comba8_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi movl 12(%esp),%esi @@ -553,10 +553,10 @@ bn_mul_comba8: .align 16 bn_mul_comba4: .L_bn_mul_comba4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi movl 12(%esp),%esi @@ -726,10 +726,10 @@ bn_mul_comba4: .align 16 bn_sqr_comba8: .L_bn_sqr_comba8_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1139,10 +1139,10 @@ bn_sqr_comba8: .align 16 bn_sqr_comba4: .L_bn_sqr_comba4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bn/x86-gf2m.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bn/x86-gf2m.S index fcb54e967b4cbc..b784b7cbe310e1 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bn/x86-gf2m.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bn/x86-gf2m.S @@ -2,10 +2,10 @@ .type _mul_1x1_mmx,@function .align 16 _mul_1x1_mmx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif subl $36,%esp movl %eax,%ecx @@ -110,10 +110,10 @@ _mul_1x1_mmx: .type _mul_1x1_ialu,@function .align 16 _mul_1x1_ialu: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif subl $36,%esp movl %eax,%ecx @@ -249,10 +249,10 @@ _mul_1x1_ialu: .align 16 bn_GF2m_mul_2x2: .L_bn_GF2m_mul_2x2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L000PIC_me_up .L000PIC_me_up: diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bn/x86-mont.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bn/x86-mont.S index 7dddbf7d87f1d8..5d8a4c6cb31633 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bn/x86-mont.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bn/x86-mont.S @@ -4,10 +4,10 @@ .align 16 bn_mul_mont: .L_bn_mul_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx 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 fcd321c88356d4..0854fc5e58f5dc 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: solaris-x86-gcc" -#define DATE "built on: Mon Sep 30 17:13:52 2024 UTC" +#define DATE "built on: Mon Mar 3 17:44:14 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/camellia/cmll-x86.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/camellia/cmll-x86.S index bcbaf49e0ac210..f4b77edc3333cd 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/camellia/cmll-x86.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/camellia/cmll-x86.S @@ -4,10 +4,10 @@ .align 16 Camellia_EncryptBlock_Rounds: .L_Camellia_EncryptBlock_Rounds_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -63,10 +63,10 @@ Camellia_EncryptBlock_Rounds: .align 16 Camellia_EncryptBlock: .L_Camellia_EncryptBlock_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $128,%eax subl 4(%esp),%eax @@ -80,10 +80,10 @@ Camellia_EncryptBlock: .align 16 Camellia_encrypt: .L_Camellia_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -137,10 +137,10 @@ Camellia_encrypt: .type _x86_Camellia_encrypt,@function .align 16 _x86_Camellia_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl (%edi),%eax xorl 4(%edi),%ebx @@ -372,10 +372,10 @@ _x86_Camellia_encrypt: .align 16 Camellia_DecryptBlock_Rounds: .L_Camellia_DecryptBlock_Rounds_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -431,10 +431,10 @@ Camellia_DecryptBlock_Rounds: .align 16 Camellia_DecryptBlock: .L_Camellia_DecryptBlock_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $128,%eax subl 4(%esp),%eax @@ -448,10 +448,10 @@ Camellia_DecryptBlock: .align 16 Camellia_decrypt: .L_Camellia_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -505,10 +505,10 @@ Camellia_decrypt: .type _x86_Camellia_decrypt,@function .align 16 _x86_Camellia_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl (%edi),%eax xorl 4(%edi),%ebx @@ -740,10 +740,10 @@ _x86_Camellia_decrypt: .align 16 Camellia_Ekeygen: .L_Camellia_Ekeygen_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1586,10 +1586,10 @@ Camellia_Ekeygen: .align 16 Camellia_set_key: .L_Camellia_set_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ecx @@ -2143,10 +2143,10 @@ Camellia_set_key: .align 16 Camellia_cbc_encrypt: .L_Camellia_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/chacha/chacha-x86.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/chacha/chacha-x86.S index 9cc4027c738002..ec98cb32fd0e6e 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/chacha/chacha-x86.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/chacha/chacha-x86.S @@ -4,10 +4,10 @@ .align 16 ChaCha20_ctr32: .L_ChaCha20_ctr32_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -382,10 +382,10 @@ ChaCha20_ctr32: .align 16 ChaCha20_ssse3: .L_ChaCha20_ssse3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -979,10 +979,10 @@ ChaCha20_ssse3: .align 16 ChaCha20_xop: .L_ChaCha20_xop_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/des/crypt586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/des/crypt586.S index ac4b251ec0b12f..29ba0fa70a8e2b 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/des/crypt586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/des/crypt586.S @@ -4,10 +4,10 @@ .align 16 fcrypt_body: .L_fcrypt_body_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/des/des-586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/des/des-586.S index 90449e4fac6a0f..b3839fa8875df9 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/des/des-586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/des/des-586.S @@ -3,10 +3,10 @@ .type _x86_DES_encrypt,@function .align 16 _x86_DES_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ecx @@ -479,10 +479,10 @@ _x86_DES_encrypt: .type _x86_DES_decrypt,@function .align 16 _x86_DES_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ecx @@ -957,10 +957,10 @@ _x86_DES_decrypt: .align 16 DES_encrypt1: .L_DES_encrypt1_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1075,10 +1075,10 @@ DES_encrypt1: .align 16 DES_encrypt2: .L_DES_encrypt2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1123,10 +1123,10 @@ DES_encrypt2: .align 16 DES_encrypt3: .L_DES_encrypt3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ebx @@ -1249,10 +1249,10 @@ DES_encrypt3: .align 16 DES_decrypt3: .L_DES_decrypt3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ebx @@ -1375,10 +1375,10 @@ DES_decrypt3: .align 16 DES_ncbc_encrypt: .L_DES_ncbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -1441,55 +1441,55 @@ DES_ncbc_encrypt: xorl %edx,%edx jmp *%ebp .L012ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx .L013ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh .L014ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl .L015ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp .L016ejend .L017ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx .L018ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch .L019ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl .L016ejend: @@ -1595,10 +1595,10 @@ DES_ncbc_encrypt: .align 16 DES_ede3_cbc_encrypt: .L_DES_ede3_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -1665,55 +1665,55 @@ DES_ede3_cbc_encrypt: xorl %edx,%edx jmp *%ebp .L036ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx .L037ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh .L038ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl .L039ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp .L040ejend .L041ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx .L042ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch .L043ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl .L040ejend: diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/ec/ecp_nistz256-x86.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/ec/ecp_nistz256-x86.S index 4e17d5eb877efc..f822079f8a9fb7 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/ec/ecp_nistz256-x86.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/ec/ecp_nistz256-x86.S @@ -2387,10 +2387,10 @@ ecp_nistz256_precomputed: .align 16 ecp_nistz256_mul_by_2: .L_ecp_nistz256_mul_by_2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2411,10 +2411,10 @@ ecp_nistz256_mul_by_2: .align 16 ecp_nistz256_mul_by_3: .L_ecp_nistz256_mul_by_3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2441,10 +2441,10 @@ ecp_nistz256_mul_by_3: .align 16 ecp_nistz256_div_by_2: .L_ecp_nistz256_div_by_2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2462,10 +2462,10 @@ ecp_nistz256_div_by_2: .type _ecp_nistz256_div_by_2,@function .align 16 _ecp_nistz256_div_by_2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ebp xorl %edx,%edx @@ -2550,10 +2550,10 @@ _ecp_nistz256_div_by_2: .align 16 ecp_nistz256_add: .L_ecp_nistz256_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2572,10 +2572,10 @@ ecp_nistz256_add: .type _ecp_nistz256_add,@function .align 16 _ecp_nistz256_add: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%eax movl 4(%esi),%ebx @@ -2654,10 +2654,10 @@ _ecp_nistz256_add: .align 16 ecp_nistz256_sub: .L_ecp_nistz256_sub_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2676,10 +2676,10 @@ ecp_nistz256_sub: .type _ecp_nistz256_sub,@function .align 16 _ecp_nistz256_sub: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%eax movl 4(%esi),%ebx @@ -2739,10 +2739,10 @@ _ecp_nistz256_sub: .align 16 ecp_nistz256_neg: .L_ecp_nistz256_neg_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2772,10 +2772,10 @@ ecp_nistz256_neg: .type _picup_eax,@function .align 16 _picup_eax: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esp),%eax ret @@ -2785,10 +2785,10 @@ _picup_eax: .align 16 ecp_nistz256_to_mont: .L_ecp_nistz256_to_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2813,10 +2813,10 @@ ecp_nistz256_to_mont: .align 16 ecp_nistz256_from_mont: .L_ecp_nistz256_from_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2841,10 +2841,10 @@ ecp_nistz256_from_mont: .align 16 ecp_nistz256_mul_mont: .L_ecp_nistz256_mul_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2869,10 +2869,10 @@ ecp_nistz256_mul_mont: .align 16 ecp_nistz256_sqr_mont: .L_ecp_nistz256_sqr_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2895,10 +2895,10 @@ ecp_nistz256_sqr_mont: .type _ecp_nistz256_mul_mont,@function .align 16 _ecp_nistz256_mul_mont: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif andl $83886080,%eax cmpl $83886080,%eax @@ -3797,10 +3797,10 @@ _ecp_nistz256_mul_mont: .align 16 ecp_nistz256_scatter_w5: .L_ecp_nistz256_scatter_w5_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3835,10 +3835,10 @@ ecp_nistz256_scatter_w5: .align 16 ecp_nistz256_gather_w5: .L_ecp_nistz256_gather_w5_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3934,10 +3934,10 @@ ecp_nistz256_gather_w5: .align 16 ecp_nistz256_scatter_w7: .L_ecp_nistz256_scatter_w7_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3970,10 +3970,10 @@ ecp_nistz256_scatter_w7: .align 16 ecp_nistz256_gather_w7: .L_ecp_nistz256_gather_w7_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4189,10 +4189,10 @@ ecp_nistz256_gather_w7: .align 16 ecp_nistz256_point_double: .L_ecp_nistz256_point_double_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4320,10 +4320,10 @@ ecp_nistz256_point_double: .align 16 ecp_nistz256_point_add: .L_ecp_nistz256_point_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4838,10 +4838,10 @@ ecp_nistz256_point_add: .align 16 ecp_nistz256_point_add_affine: .L_ecp_nistz256_point_add_affine_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/md5/md5-586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/md5/md5-586.S index 33c01af676ab4d..7e96dc647ade2a 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/md5/md5-586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/md5/md5-586.S @@ -4,10 +4,10 @@ .align 16 ossl_md5_block_asm_data_order: .L_ossl_md5_block_asm_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/modes/ghash-x86.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/modes/ghash-x86.S index dd80e32c53beb3..9b3361acd3a552 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/modes/ghash-x86.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/modes/ghash-x86.S @@ -4,10 +4,10 @@ .align 16 gcm_gmult_4bit_x86: .L_gcm_gmult_4bit_x86_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -103,10 +103,10 @@ gcm_gmult_4bit_x86: .align 16 gcm_ghash_4bit_x86: .L_gcm_ghash_4bit_x86_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -217,10 +217,10 @@ gcm_ghash_4bit_x86: .align 16 gcm_gmult_4bit_mmx: .L_gcm_gmult_4bit_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -321,10 +321,10 @@ gcm_gmult_4bit_mmx: .align 16 gcm_ghash_4bit_mmx: .L_gcm_ghash_4bit_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -930,10 +930,10 @@ gcm_ghash_4bit_mmx: .align 16 gcm_init_clmul: .L_gcm_init_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax @@ -1004,10 +1004,10 @@ gcm_init_clmul: .align 16 gcm_gmult_clmul: .L_gcm_gmult_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%edx @@ -1062,10 +1062,10 @@ gcm_gmult_clmul: .align 16 gcm_ghash_clmul: .L_gcm_ghash_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/poly1305/poly1305-x86.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/poly1305/poly1305-x86.S index f95649faed3710..e76632cd1e7011 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/poly1305/poly1305-x86.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/poly1305/poly1305-x86.S @@ -5,10 +5,10 @@ .align 16 poly1305_init: .L_poly1305_init_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -71,10 +71,10 @@ poly1305_init: .align 16 poly1305_blocks: .L_poly1305_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -244,10 +244,10 @@ poly1305_blocks: .align 16 poly1305_emit: .L_poly1305_emit_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -308,10 +308,10 @@ poly1305_emit: .type _poly1305_init_sse2,@function .align 16 _poly1305_init_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqu 24(%edi),%xmm4 leal 48(%edi),%edi @@ -515,10 +515,10 @@ _poly1305_init_sse2: .type _poly1305_blocks_sse2,@function .align 16 _poly1305_blocks_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1281,10 +1281,10 @@ _poly1305_blocks_sse2: .type _poly1305_emit_sse2,@function .align 16 _poly1305_emit_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1379,10 +1379,10 @@ _poly1305_emit_sse2: .type _poly1305_init_avx2,@function .align 16 _poly1305_init_avx2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif vmovdqu 24(%edi),%xmm4 leal 48(%edi),%edi @@ -1555,10 +1555,10 @@ _poly1305_init_avx2: .type _poly1305_blocks_avx2,@function .align 16 _poly1305_blocks_avx2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/rc4/rc4-586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/rc4/rc4-586.S index da909a31e73010..a10b047a7ecd4b 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/rc4/rc4-586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/rc4/rc4-586.S @@ -4,10 +4,10 @@ .align 16 RC4: .L_RC4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -275,10 +275,10 @@ RC4: .align 16 RC4_set_key: .L_RC4_set_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -358,10 +358,10 @@ RC4_set_key: .align 16 RC4_options: .L_RC4_options_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L018pic_point .L018pic_point: diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/ripemd/rmd-586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/ripemd/rmd-586.S index 57b95af6dde072..4f3ea459c99d61 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/ripemd/rmd-586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/ripemd/rmd-586.S @@ -4,10 +4,10 @@ .align 16 ripemd160_block_asm_data_order: .L_ripemd160_block_asm_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/sha/sha1-586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/sha/sha1-586.S index ddc85b3d82df65..4b60a71ee8332a 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/sha/sha1-586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/sha/sha1-586.S @@ -4,10 +4,10 @@ .align 16 sha1_block_data_order: .L_sha1_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1403,10 +1403,10 @@ sha1_block_data_order: .type _sha1_block_data_order_shaext,@function .align 16 _sha1_block_data_order_shaext: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1578,10 +1578,10 @@ _sha1_block_data_order_shaext: .type _sha1_block_data_order_ssse3,@function .align 16 _sha1_block_data_order_ssse3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2802,10 +2802,10 @@ _sha1_block_data_order_ssse3: .type _sha1_block_data_order_avx,@function .align 16 _sha1_block_data_order_avx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/sha/sha256-586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/sha/sha256-586.S index 9436ca5e1d8c92..c8599bd582c669 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/sha/sha256-586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/sha/sha256-586.S @@ -4,10 +4,10 @@ .align 16 sha256_block_data_order: .L_sha256_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/sha/sha512-586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/sha/sha512-586.S index c7cf815b4e052e..99d198dd91dc83 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/sha/sha512-586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/sha/sha512-586.S @@ -4,10 +4,10 @@ .align 16 sha512_block_data_order: .L_sha512_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/whrlpool/wp-mmx.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/whrlpool/wp-mmx.S index 9fb9ca1e45efb9..ee571f6459470e 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/whrlpool/wp-mmx.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/whrlpool/wp-mmx.S @@ -4,10 +4,10 @@ .align 16 whirlpool_block_mmx: .L_whirlpool_block_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/x86cpuid.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/x86cpuid.S index eedacacfea8676..d4f2ec09e4e693 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/x86cpuid.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/x86cpuid.S @@ -4,10 +4,10 @@ .align 16 OPENSSL_ia32_cpuid: .L_OPENSSL_ia32_cpuid_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -153,10 +153,10 @@ OPENSSL_ia32_cpuid: .align 16 OPENSSL_rdtsc: .L_OPENSSL_rdtsc_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl %eax,%eax xorl %edx,%edx @@ -175,10 +175,10 @@ OPENSSL_rdtsc: .align 16 OPENSSL_instrument_halt: .L_OPENSSL_instrument_halt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L011PIC_me_up .L011PIC_me_up: @@ -212,10 +212,10 @@ OPENSSL_instrument_halt: .align 16 OPENSSL_far_spin: .L_OPENSSL_far_spin_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushfl popl %eax @@ -244,10 +244,10 @@ OPENSSL_far_spin: .align 16 OPENSSL_wipe_cpu: .L_OPENSSL_wipe_cpu_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl %eax,%eax xorl %edx,%edx @@ -280,10 +280,10 @@ OPENSSL_wipe_cpu: .align 16 OPENSSL_atomic_add: .L_OPENSSL_atomic_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%ecx @@ -304,10 +304,10 @@ OPENSSL_atomic_add: .align 16 OPENSSL_cleanse: .L_OPENSSL_cleanse_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%ecx @@ -346,10 +346,10 @@ OPENSSL_cleanse: .align 16 CRYPTO_memcmp: .L_CRYPTO_memcmp_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -380,10 +380,10 @@ CRYPTO_memcmp: .align 16 OPENSSL_instrument_bus: .L_OPENSSL_instrument_bus_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -433,10 +433,10 @@ OPENSSL_instrument_bus: .align 16 OPENSSL_instrument_bus2: .L_OPENSSL_instrument_bus2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -499,10 +499,10 @@ OPENSSL_instrument_bus2: .align 16 OPENSSL_ia32_rdrand_bytes: .L_OPENSSL_ia32_rdrand_bytes_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %ebx @@ -547,10 +547,10 @@ OPENSSL_ia32_rdrand_bytes: .align 16 OPENSSL_ia32_rdseed_bytes: .L_OPENSSL_ia32_rdseed_bytes_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/engines/e_padlock-x86.S b/deps/openssl/config/archs/solaris-x86-gcc/asm/engines/e_padlock-x86.S index 81e4ec050582c4..cea65eba34a03b 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/engines/e_padlock-x86.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/engines/e_padlock-x86.S @@ -4,10 +4,10 @@ .align 16 padlock_capability: .L_padlock_capability_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx pushfl @@ -69,10 +69,10 @@ padlock_capability: .align 16 padlock_key_bswap: .L_padlock_key_bswap_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 240(%edx),%ecx @@ -92,10 +92,10 @@ padlock_key_bswap: .align 16 padlock_verify_context: .L_padlock_verify_context_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx leal .Lpadlock_saved_context-.L004verify_pic_point,%eax @@ -108,10 +108,10 @@ padlock_verify_context: .type _padlock_verify_ctx,@function .align 16 _padlock_verify_ctx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%eax btl $30,4(%esp) @@ -129,10 +129,10 @@ _padlock_verify_ctx: .align 16 padlock_reload_key: .L_padlock_reload_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushfl popfl @@ -143,10 +143,10 @@ padlock_reload_key: .align 16 padlock_aes_block: .L_padlock_aes_block_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -168,10 +168,10 @@ padlock_aes_block: .align 16 padlock_ecb_encrypt: .L_padlock_ecb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -352,10 +352,10 @@ padlock_ecb_encrypt: .align 16 padlock_cbc_encrypt: .L_padlock_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -540,10 +540,10 @@ padlock_cbc_encrypt: .align 16 padlock_cfb_encrypt: .L_padlock_cfb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -667,10 +667,10 @@ padlock_cfb_encrypt: .align 16 padlock_ofb_encrypt: .L_padlock_ofb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -794,10 +794,10 @@ padlock_ofb_encrypt: .align 16 padlock_ctr32_encrypt: .L_padlock_ctr32_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -906,10 +906,10 @@ padlock_ctr32_encrypt: .align 16 padlock_xstore: .L_padlock_xstore_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi movl 8(%esp),%edi @@ -921,10 +921,10 @@ padlock_xstore: .type _win32_segv_handler,@function .align 16 _win32_segv_handler: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $1,%eax movl 4(%esp),%edx @@ -941,10 +941,10 @@ _win32_segv_handler: .align 16 padlock_sha1_oneshot: .L_padlock_sha1_oneshot_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -977,10 +977,10 @@ padlock_sha1_oneshot: .align 16 padlock_sha1_blocks: .L_padlock_sha1_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -1012,10 +1012,10 @@ padlock_sha1_blocks: .align 16 padlock_sha256_oneshot: .L_padlock_sha256_oneshot_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -1048,10 +1048,10 @@ padlock_sha256_oneshot: .align 16 padlock_sha256_blocks: .L_padlock_sha256_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -1083,10 +1083,10 @@ padlock_sha256_blocks: .align 16 padlock_sha512_blocks: .L_padlock_sha512_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/ssl.h b/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/include/progs.h b/deps/openssl/config/archs/solaris-x86-gcc/asm/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/include/progs.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl.gypi b/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl.gypi index 2037cbe79e9b30..1c98866c3f421f 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl.gypi +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl.gypi @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/apps/progs.c b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/apps/progs.c +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/configdata.pm b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/configdata.pm index 67a1475d1ddbe5..0e6f588ecf52bc 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 @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -204,10 +204,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -256,11 +256,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "solaris-x86-gcc", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -387,7 +387,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -890,6 +889,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1046,9 +1048,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3485,9 +3484,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5879,9 +5875,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7264,6 +7257,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7472,10 +7469,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10279,7 +10272,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10330,7 +10322,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12533,9 +12524,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14927,9 +14915,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16294,10 +16279,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16899,7 +16880,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18358,6 +18338,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18520,9 +18504,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19895,7 +19876,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20229,6 +20209,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20281,7 +20262,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24485,7 +24465,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24512,7 +24491,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25763,9 +25741,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25847,9 +25822,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25980,6 +25952,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26292,12 +26270,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27686,8 +27658,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27714,7 +27686,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27731,8 +27703,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27750,7 +27722,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27772,7 +27744,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/aes/aes-586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/aes/aes-586.S index 628a3b6333e9d3..9ee3fc9a57e8e1 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/aes/aes-586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/aes/aes-586.S @@ -2,10 +2,10 @@ .type _x86_AES_encrypt_compact,@function .align 16 _x86_AES_encrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -274,10 +274,10 @@ _x86_AES_encrypt_compact: .type _sse_AES_encrypt_compact,@function .align 16 _sse_AES_encrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pxor (%edi),%mm0 pxor 8(%edi),%mm4 @@ -436,10 +436,10 @@ _sse_AES_encrypt_compact: .type _x86_AES_encrypt,@function .align 16 _x86_AES_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -995,10 +995,10 @@ _x86_AES_encrypt: .align 16 AES_encrypt: .L_AES_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1063,10 +1063,10 @@ AES_encrypt: .type _x86_AES_decrypt_compact,@function .align 16 _x86_AES_decrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -1423,10 +1423,10 @@ _x86_AES_decrypt_compact: .type _sse_AES_decrypt_compact,@function .align 16 _sse_AES_decrypt_compact: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pxor (%edi),%mm0 pxor 8(%edi),%mm4 @@ -1644,10 +1644,10 @@ _sse_AES_decrypt_compact: .type _x86_AES_decrypt,@function .align 16 _x86_AES_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl %edi,20(%esp) xorl (%edi),%eax @@ -2207,10 +2207,10 @@ _x86_AES_decrypt: .align 16 AES_decrypt: .L_AES_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2277,10 +2277,10 @@ AES_decrypt: .align 16 AES_cbc_encrypt: .L_AES_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2813,10 +2813,10 @@ AES_cbc_encrypt: .type _x86_AES_set_encrypt_key,@function .align 16 _x86_AES_set_encrypt_key: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3050,10 +3050,10 @@ _x86_AES_set_encrypt_key: .align 16 AES_set_encrypt_key: .L_AES_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call _x86_AES_set_encrypt_key ret @@ -3063,10 +3063,10 @@ AES_set_encrypt_key: .align 16 AES_set_decrypt_key: .L_AES_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call _x86_AES_set_encrypt_key cmpl $0,%eax diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/aes/aesni-x86.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/aes/aesni-x86.S index 9191466ee47a31..eb2d01b16630a1 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/aes/aesni-x86.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/aes/aesni-x86.S @@ -4,10 +4,10 @@ .align 16 aesni_encrypt: .L_aesni_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 12(%esp),%edx @@ -36,10 +36,10 @@ aesni_encrypt: .align 16 aesni_decrypt: .L_aesni_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 12(%esp),%edx @@ -66,10 +66,10 @@ aesni_decrypt: .type _aesni_encrypt2,@function .align 16 _aesni_encrypt2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -98,10 +98,10 @@ _aesni_encrypt2: .type _aesni_decrypt2,@function .align 16 _aesni_decrypt2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -130,10 +130,10 @@ _aesni_decrypt2: .type _aesni_encrypt3,@function .align 16 _aesni_encrypt3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -167,10 +167,10 @@ _aesni_encrypt3: .type _aesni_decrypt3,@function .align 16 _aesni_decrypt3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -204,10 +204,10 @@ _aesni_decrypt3: .type _aesni_encrypt4,@function .align 16 _aesni_encrypt4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 movups 16(%edx),%xmm1 @@ -247,10 +247,10 @@ _aesni_encrypt4: .type _aesni_decrypt4,@function .align 16 _aesni_decrypt4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 movups 16(%edx),%xmm1 @@ -290,10 +290,10 @@ _aesni_decrypt4: .type _aesni_encrypt6,@function .align 16 _aesni_encrypt6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -349,10 +349,10 @@ _aesni_encrypt6: .type _aesni_decrypt6,@function .align 16 _aesni_decrypt6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movups (%edx),%xmm0 shll $4,%ecx @@ -410,10 +410,10 @@ _aesni_decrypt6: .align 16 aesni_ecb_encrypt: .L_aesni_ecb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -650,10 +650,10 @@ aesni_ecb_encrypt: .align 16 aesni_ccm64_encrypt_blocks: .L_aesni_ccm64_encrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -743,10 +743,10 @@ aesni_ccm64_encrypt_blocks: .align 16 aesni_ccm64_decrypt_blocks: .L_aesni_ccm64_decrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -871,10 +871,10 @@ aesni_ccm64_decrypt_blocks: .align 16 aesni_ctr32_encrypt_blocks: .L_aesni_ctr32_encrypt_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1114,10 +1114,10 @@ aesni_ctr32_encrypt_blocks: .align 16 aesni_xts_encrypt: .L_aesni_xts_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1479,10 +1479,10 @@ aesni_xts_encrypt: .align 16 aesni_xts_decrypt: .L_aesni_xts_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1874,10 +1874,10 @@ aesni_xts_decrypt: .align 16 aesni_ocb_encrypt: .L_aesni_ocb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2274,10 +2274,10 @@ aesni_ocb_encrypt: .align 16 aesni_ocb_decrypt: .L_aesni_ocb_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2674,10 +2674,10 @@ aesni_ocb_decrypt: .align 16 aesni_cbc_encrypt: .L_aesni_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2938,10 +2938,10 @@ aesni_cbc_encrypt: .type _aesni_set_encrypt_key,@function .align 16 _aesni_set_encrypt_key: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3278,10 +3278,10 @@ _aesni_set_encrypt_key: .align 16 aesni_set_encrypt_key: .L_aesni_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%ecx @@ -3294,10 +3294,10 @@ aesni_set_encrypt_key: .align 16 aesni_set_decrypt_key: .L_aesni_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%ecx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/aes/vpaes-x86.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/aes/vpaes-x86.S index 39d00e772e56d9..f3adb70545a641 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/aes/vpaes-x86.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/aes/vpaes-x86.S @@ -59,10 +59,10 @@ .type _vpaes_preheat,@function .align 16 _vpaes_preheat: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%ebp movdqa -48(%ebp),%xmm7 @@ -72,10 +72,10 @@ _vpaes_preheat: .type _vpaes_encrypt_core,@function .align 16 _vpaes_encrypt_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $16,%ecx movl 240(%edx),%eax @@ -154,10 +154,10 @@ _vpaes_encrypt_core: .type _vpaes_decrypt_core,@function .align 16 _vpaes_decrypt_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif leal 608(%ebp),%ebx movl 240(%edx),%eax @@ -247,10 +247,10 @@ _vpaes_decrypt_core: .type _vpaes_schedule_core,@function .align 16 _vpaes_schedule_core: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%ebp movdqu (%esi),%xmm0 @@ -346,10 +346,10 @@ _vpaes_schedule_core: .type _vpaes_schedule_192_smear,@function .align 16 _vpaes_schedule_192_smear: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pshufd $128,%xmm6,%xmm1 pshufd $254,%xmm7,%xmm0 @@ -363,10 +363,10 @@ _vpaes_schedule_192_smear: .type _vpaes_schedule_round,@function .align 16 _vpaes_schedule_round: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa 8(%esp),%xmm2 pxor %xmm1,%xmm1 @@ -417,10 +417,10 @@ _vpaes_schedule_round: .type _vpaes_schedule_transform,@function .align 16 _vpaes_schedule_transform: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa -16(%ebp),%xmm2 movdqa %xmm2,%xmm1 @@ -437,10 +437,10 @@ _vpaes_schedule_transform: .type _vpaes_schedule_mangle,@function .align 16 _vpaes_schedule_mangle: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqa %xmm0,%xmm4 movdqa 128(%ebp),%xmm5 @@ -503,10 +503,10 @@ _vpaes_schedule_mangle: .align 16 vpaes_set_encrypt_key: .L_vpaes_set_encrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -541,10 +541,10 @@ vpaes_set_encrypt_key: .align 16 vpaes_set_decrypt_key: .L_vpaes_set_decrypt_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -584,10 +584,10 @@ vpaes_set_decrypt_key: .align 16 vpaes_encrypt: .L_vpaes_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -618,10 +618,10 @@ vpaes_encrypt: .align 16 vpaes_decrypt: .L_vpaes_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -652,10 +652,10 @@ vpaes_decrypt: .align 16 vpaes_cbc_encrypt: .L_vpaes_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/bf/bf-586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/bf/bf-586.S index a3ff8edf86bcde..801b28d56381f2 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/bf/bf-586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/bf/bf-586.S @@ -4,10 +4,10 @@ .align 16 BF_encrypt: .L_BF_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -359,10 +359,10 @@ BF_encrypt: .align 16 BF_decrypt: .L_BF_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -714,10 +714,10 @@ BF_decrypt: .align 16 BF_cbc_encrypt: .L_BF_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -782,55 +782,55 @@ BF_cbc_encrypt: xorl %edx,%edx jmp *%ebp .L006ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx .L007ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh .L008ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl .L009ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp .L010ejend .L011ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx .L012ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch .L013ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl .L010ejend: diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/bn/bn-586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/bn/bn-586.S index 2495ae69451647..a74e6470b438db 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/bn/bn-586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/bn/bn-586.S @@ -4,10 +4,10 @@ .align 16 bn_mul_add_words: .L_bn_mul_add_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L000PIC_me_up .L000PIC_me_up: @@ -292,10 +292,10 @@ bn_mul_add_words: .align 16 bn_mul_words: .L_bn_mul_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L010PIC_me_up .L010PIC_me_up: @@ -479,10 +479,10 @@ bn_mul_words: .align 16 bn_sqr_words: .L_bn_sqr_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L017PIC_me_up .L017PIC_me_up: @@ -625,10 +625,10 @@ bn_sqr_words: .align 16 bn_div_words: .L_bn_div_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax @@ -641,10 +641,10 @@ bn_div_words: .align 16 bn_add_words: .L_bn_add_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -828,10 +828,10 @@ bn_add_words: .align 16 bn_sub_words: .L_bn_sub_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1015,10 +1015,10 @@ bn_sub_words: .align 16 bn_sub_part_words: .L_bn_sub_part_words_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/bn/co-586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/bn/co-586.S index 9a90455392adee..bc8cd28886aeac 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/bn/co-586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/bn/co-586.S @@ -4,10 +4,10 @@ .align 16 bn_mul_comba8: .L_bn_mul_comba8_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi movl 12(%esp),%esi @@ -553,10 +553,10 @@ bn_mul_comba8: .align 16 bn_mul_comba4: .L_bn_mul_comba4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi movl 12(%esp),%esi @@ -726,10 +726,10 @@ bn_mul_comba4: .align 16 bn_sqr_comba8: .L_bn_sqr_comba8_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1139,10 +1139,10 @@ bn_sqr_comba8: .align 16 bn_sqr_comba4: .L_bn_sqr_comba4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/bn/x86-gf2m.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/bn/x86-gf2m.S index fcb54e967b4cbc..b784b7cbe310e1 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/bn/x86-gf2m.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/bn/x86-gf2m.S @@ -2,10 +2,10 @@ .type _mul_1x1_mmx,@function .align 16 _mul_1x1_mmx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif subl $36,%esp movl %eax,%ecx @@ -110,10 +110,10 @@ _mul_1x1_mmx: .type _mul_1x1_ialu,@function .align 16 _mul_1x1_ialu: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif subl $36,%esp movl %eax,%ecx @@ -249,10 +249,10 @@ _mul_1x1_ialu: .align 16 bn_GF2m_mul_2x2: .L_bn_GF2m_mul_2x2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L000PIC_me_up .L000PIC_me_up: diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/bn/x86-mont.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/bn/x86-mont.S index 7dddbf7d87f1d8..5d8a4c6cb31633 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/bn/x86-mont.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/bn/x86-mont.S @@ -4,10 +4,10 @@ .align 16 bn_mul_mont: .L_bn_mul_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx 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 6e6e28436ecdbc..49410ec62dd453 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: solaris-x86-gcc" -#define DATE "built on: Mon Sep 30 17:14:05 2024 UTC" +#define DATE "built on: Mon Mar 3 17:44:23 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/camellia/cmll-x86.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/camellia/cmll-x86.S index bcbaf49e0ac210..f4b77edc3333cd 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/camellia/cmll-x86.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/camellia/cmll-x86.S @@ -4,10 +4,10 @@ .align 16 Camellia_EncryptBlock_Rounds: .L_Camellia_EncryptBlock_Rounds_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -63,10 +63,10 @@ Camellia_EncryptBlock_Rounds: .align 16 Camellia_EncryptBlock: .L_Camellia_EncryptBlock_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $128,%eax subl 4(%esp),%eax @@ -80,10 +80,10 @@ Camellia_EncryptBlock: .align 16 Camellia_encrypt: .L_Camellia_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -137,10 +137,10 @@ Camellia_encrypt: .type _x86_Camellia_encrypt,@function .align 16 _x86_Camellia_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl (%edi),%eax xorl 4(%edi),%ebx @@ -372,10 +372,10 @@ _x86_Camellia_encrypt: .align 16 Camellia_DecryptBlock_Rounds: .L_Camellia_DecryptBlock_Rounds_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -431,10 +431,10 @@ Camellia_DecryptBlock_Rounds: .align 16 Camellia_DecryptBlock: .L_Camellia_DecryptBlock_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $128,%eax subl 4(%esp),%eax @@ -448,10 +448,10 @@ Camellia_DecryptBlock: .align 16 Camellia_decrypt: .L_Camellia_decrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -505,10 +505,10 @@ Camellia_decrypt: .type _x86_Camellia_decrypt,@function .align 16 _x86_Camellia_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl (%edi),%eax xorl 4(%edi),%ebx @@ -740,10 +740,10 @@ _x86_Camellia_decrypt: .align 16 Camellia_Ekeygen: .L_Camellia_Ekeygen_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1586,10 +1586,10 @@ Camellia_Ekeygen: .align 16 Camellia_set_key: .L_Camellia_set_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ecx @@ -2143,10 +2143,10 @@ Camellia_set_key: .align 16 Camellia_cbc_encrypt: .L_Camellia_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/chacha/chacha-x86.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/chacha/chacha-x86.S index 9cc4027c738002..ec98cb32fd0e6e 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/chacha/chacha-x86.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/chacha/chacha-x86.S @@ -4,10 +4,10 @@ .align 16 ChaCha20_ctr32: .L_ChaCha20_ctr32_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -382,10 +382,10 @@ ChaCha20_ctr32: .align 16 ChaCha20_ssse3: .L_ChaCha20_ssse3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -979,10 +979,10 @@ ChaCha20_ssse3: .align 16 ChaCha20_xop: .L_ChaCha20_xop_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/des/crypt586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/des/crypt586.S index ac4b251ec0b12f..29ba0fa70a8e2b 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/des/crypt586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/des/crypt586.S @@ -4,10 +4,10 @@ .align 16 fcrypt_body: .L_fcrypt_body_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/des/des-586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/des/des-586.S index 90449e4fac6a0f..b3839fa8875df9 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/des/des-586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/des/des-586.S @@ -3,10 +3,10 @@ .type _x86_DES_encrypt,@function .align 16 _x86_DES_encrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ecx @@ -479,10 +479,10 @@ _x86_DES_encrypt: .type _x86_DES_decrypt,@function .align 16 _x86_DES_decrypt: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ecx @@ -957,10 +957,10 @@ _x86_DES_decrypt: .align 16 DES_encrypt1: .L_DES_encrypt1_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1075,10 +1075,10 @@ DES_encrypt1: .align 16 DES_encrypt2: .L_DES_encrypt2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -1123,10 +1123,10 @@ DES_encrypt2: .align 16 DES_encrypt3: .L_DES_encrypt3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ebx @@ -1249,10 +1249,10 @@ DES_encrypt3: .align 16 DES_decrypt3: .L_DES_decrypt3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx movl 8(%esp),%ebx @@ -1375,10 +1375,10 @@ DES_decrypt3: .align 16 DES_ncbc_encrypt: .L_DES_ncbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -1441,55 +1441,55 @@ DES_ncbc_encrypt: xorl %edx,%edx jmp *%ebp .L012ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx .L013ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh .L014ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl .L015ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp .L016ejend .L017ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx .L018ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch .L019ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl .L016ejend: @@ -1595,10 +1595,10 @@ DES_ncbc_encrypt: .align 16 DES_ede3_cbc_encrypt: .L_DES_ede3_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp @@ -1665,55 +1665,55 @@ DES_ede3_cbc_encrypt: xorl %edx,%edx jmp *%ebp .L036ej7: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 6(%esi),%dh shll $8,%edx .L037ej6: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 5(%esi),%dh .L038ej5: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 4(%esi),%dl .L039ej4: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ecx jmp .L040ejend .L041ej3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 2(%esi),%ch shll $8,%ecx .L042ej2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb 1(%esi),%ch .L043ej1: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movb (%esi),%cl .L040ejend: diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/ec/ecp_nistz256-x86.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/ec/ecp_nistz256-x86.S index 4e17d5eb877efc..f822079f8a9fb7 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/ec/ecp_nistz256-x86.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/ec/ecp_nistz256-x86.S @@ -2387,10 +2387,10 @@ ecp_nistz256_precomputed: .align 16 ecp_nistz256_mul_by_2: .L_ecp_nistz256_mul_by_2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2411,10 +2411,10 @@ ecp_nistz256_mul_by_2: .align 16 ecp_nistz256_mul_by_3: .L_ecp_nistz256_mul_by_3_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2441,10 +2441,10 @@ ecp_nistz256_mul_by_3: .align 16 ecp_nistz256_div_by_2: .L_ecp_nistz256_div_by_2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2462,10 +2462,10 @@ ecp_nistz256_div_by_2: .type _ecp_nistz256_div_by_2,@function .align 16 _ecp_nistz256_div_by_2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%ebp xorl %edx,%edx @@ -2550,10 +2550,10 @@ _ecp_nistz256_div_by_2: .align 16 ecp_nistz256_add: .L_ecp_nistz256_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2572,10 +2572,10 @@ ecp_nistz256_add: .type _ecp_nistz256_add,@function .align 16 _ecp_nistz256_add: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%eax movl 4(%esi),%ebx @@ -2654,10 +2654,10 @@ _ecp_nistz256_add: .align 16 ecp_nistz256_sub: .L_ecp_nistz256_sub_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2676,10 +2676,10 @@ ecp_nistz256_sub: .type _ecp_nistz256_sub,@function .align 16 _ecp_nistz256_sub: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esi),%eax movl 4(%esi),%ebx @@ -2739,10 +2739,10 @@ _ecp_nistz256_sub: .align 16 ecp_nistz256_neg: .L_ecp_nistz256_neg_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2772,10 +2772,10 @@ ecp_nistz256_neg: .type _picup_eax,@function .align 16 _picup_eax: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl (%esp),%eax ret @@ -2785,10 +2785,10 @@ _picup_eax: .align 16 ecp_nistz256_to_mont: .L_ecp_nistz256_to_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2813,10 +2813,10 @@ ecp_nistz256_to_mont: .align 16 ecp_nistz256_from_mont: .L_ecp_nistz256_from_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2841,10 +2841,10 @@ ecp_nistz256_from_mont: .align 16 ecp_nistz256_mul_mont: .L_ecp_nistz256_mul_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2869,10 +2869,10 @@ ecp_nistz256_mul_mont: .align 16 ecp_nistz256_sqr_mont: .L_ecp_nistz256_sqr_mont_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2895,10 +2895,10 @@ ecp_nistz256_sqr_mont: .type _ecp_nistz256_mul_mont,@function .align 16 _ecp_nistz256_mul_mont: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif andl $83886080,%eax cmpl $83886080,%eax @@ -3797,10 +3797,10 @@ _ecp_nistz256_mul_mont: .align 16 ecp_nistz256_scatter_w5: .L_ecp_nistz256_scatter_w5_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3835,10 +3835,10 @@ ecp_nistz256_scatter_w5: .align 16 ecp_nistz256_gather_w5: .L_ecp_nistz256_gather_w5_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3934,10 +3934,10 @@ ecp_nistz256_gather_w5: .align 16 ecp_nistz256_scatter_w7: .L_ecp_nistz256_scatter_w7_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -3970,10 +3970,10 @@ ecp_nistz256_scatter_w7: .align 16 ecp_nistz256_gather_w7: .L_ecp_nistz256_gather_w7_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4189,10 +4189,10 @@ ecp_nistz256_gather_w7: .align 16 ecp_nistz256_point_double: .L_ecp_nistz256_point_double_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4320,10 +4320,10 @@ ecp_nistz256_point_double: .align 16 ecp_nistz256_point_add: .L_ecp_nistz256_point_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -4838,10 +4838,10 @@ ecp_nistz256_point_add: .align 16 ecp_nistz256_point_add_affine: .L_ecp_nistz256_point_add_affine_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/md5/md5-586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/md5/md5-586.S index 33c01af676ab4d..7e96dc647ade2a 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/md5/md5-586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/md5/md5-586.S @@ -4,10 +4,10 @@ .align 16 ossl_md5_block_asm_data_order: .L_ossl_md5_block_asm_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/modes/ghash-x86.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/modes/ghash-x86.S index dd80e32c53beb3..9b3361acd3a552 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/modes/ghash-x86.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/modes/ghash-x86.S @@ -4,10 +4,10 @@ .align 16 gcm_gmult_4bit_x86: .L_gcm_gmult_4bit_x86_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -103,10 +103,10 @@ gcm_gmult_4bit_x86: .align 16 gcm_ghash_4bit_x86: .L_gcm_ghash_4bit_x86_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -217,10 +217,10 @@ gcm_ghash_4bit_x86: .align 16 gcm_gmult_4bit_mmx: .L_gcm_gmult_4bit_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -321,10 +321,10 @@ gcm_gmult_4bit_mmx: .align 16 gcm_ghash_4bit_mmx: .L_gcm_ghash_4bit_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -930,10 +930,10 @@ gcm_ghash_4bit_mmx: .align 16 gcm_init_clmul: .L_gcm_init_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax @@ -1004,10 +1004,10 @@ gcm_init_clmul: .align 16 gcm_gmult_clmul: .L_gcm_gmult_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%eax movl 8(%esp),%edx @@ -1062,10 +1062,10 @@ gcm_gmult_clmul: .align 16 gcm_ghash_clmul: .L_gcm_ghash_clmul_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/poly1305/poly1305-x86.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/poly1305/poly1305-x86.S index f95649faed3710..e76632cd1e7011 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/poly1305/poly1305-x86.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/poly1305/poly1305-x86.S @@ -5,10 +5,10 @@ .align 16 poly1305_init: .L_poly1305_init_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -71,10 +71,10 @@ poly1305_init: .align 16 poly1305_blocks: .L_poly1305_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -244,10 +244,10 @@ poly1305_blocks: .align 16 poly1305_emit: .L_poly1305_emit_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -308,10 +308,10 @@ poly1305_emit: .type _poly1305_init_sse2,@function .align 16 _poly1305_init_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movdqu 24(%edi),%xmm4 leal 48(%edi),%edi @@ -515,10 +515,10 @@ _poly1305_init_sse2: .type _poly1305_blocks_sse2,@function .align 16 _poly1305_blocks_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1281,10 +1281,10 @@ _poly1305_blocks_sse2: .type _poly1305_emit_sse2,@function .align 16 _poly1305_emit_sse2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1379,10 +1379,10 @@ _poly1305_emit_sse2: .type _poly1305_init_avx2,@function .align 16 _poly1305_init_avx2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif vmovdqu 24(%edi),%xmm4 leal 48(%edi),%edi @@ -1555,10 +1555,10 @@ _poly1305_init_avx2: .type _poly1305_blocks_avx2,@function .align 16 _poly1305_blocks_avx2: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/rc4/rc4-586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/rc4/rc4-586.S index da909a31e73010..a10b047a7ecd4b 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/rc4/rc4-586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/rc4/rc4-586.S @@ -4,10 +4,10 @@ .align 16 RC4: .L_RC4_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -275,10 +275,10 @@ RC4: .align 16 RC4_set_key: .L_RC4_set_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -358,10 +358,10 @@ RC4_set_key: .align 16 RC4_options: .L_RC4_options_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L018pic_point .L018pic_point: diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/ripemd/rmd-586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/ripemd/rmd-586.S index 57b95af6dde072..4f3ea459c99d61 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/ripemd/rmd-586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/ripemd/rmd-586.S @@ -4,10 +4,10 @@ .align 16 ripemd160_block_asm_data_order: .L_ripemd160_block_asm_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%eax diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/sha/sha1-586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/sha/sha1-586.S index ddc85b3d82df65..4b60a71ee8332a 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/sha/sha1-586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/sha/sha1-586.S @@ -4,10 +4,10 @@ .align 16 sha1_block_data_order: .L_sha1_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1403,10 +1403,10 @@ sha1_block_data_order: .type _sha1_block_data_order_shaext,@function .align 16 _sha1_block_data_order_shaext: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -1578,10 +1578,10 @@ _sha1_block_data_order_shaext: .type _sha1_block_data_order_ssse3,@function .align 16 _sha1_block_data_order_ssse3: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -2802,10 +2802,10 @@ _sha1_block_data_order_ssse3: .type _sha1_block_data_order_avx,@function .align 16 _sha1_block_data_order_avx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/sha/sha256-586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/sha/sha256-586.S index 9436ca5e1d8c92..c8599bd582c669 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/sha/sha256-586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/sha/sha256-586.S @@ -4,10 +4,10 @@ .align 16 sha256_block_data_order: .L_sha256_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/sha/sha512-586.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/sha/sha512-586.S index c7cf815b4e052e..99d198dd91dc83 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/sha/sha512-586.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/sha/sha512-586.S @@ -4,10 +4,10 @@ .align 16 sha512_block_data_order: .L_sha512_block_data_order_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/whrlpool/wp-mmx.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/whrlpool/wp-mmx.S index 9fb9ca1e45efb9..ee571f6459470e 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/whrlpool/wp-mmx.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/whrlpool/wp-mmx.S @@ -4,10 +4,10 @@ .align 16 whirlpool_block_mmx: .L_whirlpool_block_mmx_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/x86cpuid.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/x86cpuid.S index eedacacfea8676..d4f2ec09e4e693 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/x86cpuid.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/x86cpuid.S @@ -4,10 +4,10 @@ .align 16 OPENSSL_ia32_cpuid: .L_OPENSSL_ia32_cpuid_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -153,10 +153,10 @@ OPENSSL_ia32_cpuid: .align 16 OPENSSL_rdtsc: .L_OPENSSL_rdtsc_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl %eax,%eax xorl %edx,%edx @@ -175,10 +175,10 @@ OPENSSL_rdtsc: .align 16 OPENSSL_instrument_halt: .L_OPENSSL_instrument_halt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif call .L011PIC_me_up .L011PIC_me_up: @@ -212,10 +212,10 @@ OPENSSL_instrument_halt: .align 16 OPENSSL_far_spin: .L_OPENSSL_far_spin_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushfl popl %eax @@ -244,10 +244,10 @@ OPENSSL_far_spin: .align 16 OPENSSL_wipe_cpu: .L_OPENSSL_wipe_cpu_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif xorl %eax,%eax xorl %edx,%edx @@ -280,10 +280,10 @@ OPENSSL_wipe_cpu: .align 16 OPENSSL_atomic_add: .L_OPENSSL_atomic_add_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%ecx @@ -304,10 +304,10 @@ OPENSSL_atomic_add: .align 16 OPENSSL_cleanse: .L_OPENSSL_cleanse_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 8(%esp),%ecx @@ -346,10 +346,10 @@ OPENSSL_cleanse: .align 16 CRYPTO_memcmp: .L_CRYPTO_memcmp_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %esi pushl %edi @@ -380,10 +380,10 @@ CRYPTO_memcmp: .align 16 OPENSSL_instrument_bus: .L_OPENSSL_instrument_bus_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -433,10 +433,10 @@ OPENSSL_instrument_bus: .align 16 OPENSSL_instrument_bus2: .L_OPENSSL_instrument_bus2_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -499,10 +499,10 @@ OPENSSL_instrument_bus2: .align 16 OPENSSL_ia32_rdrand_bytes: .L_OPENSSL_ia32_rdrand_bytes_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %ebx @@ -547,10 +547,10 @@ OPENSSL_ia32_rdrand_bytes: .align 16 OPENSSL_ia32_rdseed_bytes: .L_OPENSSL_ia32_rdseed_bytes_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %ebx diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/engines/e_padlock-x86.S b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/engines/e_padlock-x86.S index 81e4ec050582c4..cea65eba34a03b 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/engines/e_padlock-x86.S +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/engines/e_padlock-x86.S @@ -4,10 +4,10 @@ .align 16 padlock_capability: .L_padlock_capability_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebx pushfl @@ -69,10 +69,10 @@ padlock_capability: .align 16 padlock_key_bswap: .L_padlock_key_bswap_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx movl 240(%edx),%ecx @@ -92,10 +92,10 @@ padlock_key_bswap: .align 16 padlock_verify_context: .L_padlock_verify_context_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl 4(%esp),%edx leal .Lpadlock_saved_context-.L004verify_pic_point,%eax @@ -108,10 +108,10 @@ padlock_verify_context: .type _padlock_verify_ctx,@function .align 16 _padlock_verify_ctx: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif addl (%esp),%eax btl $30,4(%esp) @@ -129,10 +129,10 @@ _padlock_verify_ctx: .align 16 padlock_reload_key: .L_padlock_reload_key_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushfl popfl @@ -143,10 +143,10 @@ padlock_reload_key: .align 16 padlock_aes_block: .L_padlock_aes_block_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -168,10 +168,10 @@ padlock_aes_block: .align 16 padlock_ecb_encrypt: .L_padlock_ecb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -352,10 +352,10 @@ padlock_ecb_encrypt: .align 16 padlock_cbc_encrypt: .L_padlock_cbc_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -540,10 +540,10 @@ padlock_cbc_encrypt: .align 16 padlock_cfb_encrypt: .L_padlock_cfb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -667,10 +667,10 @@ padlock_cfb_encrypt: .align 16 padlock_ofb_encrypt: .L_padlock_ofb_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -794,10 +794,10 @@ padlock_ofb_encrypt: .align 16 padlock_ctr32_encrypt: .L_padlock_ctr32_encrypt_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %ebp pushl %ebx @@ -906,10 +906,10 @@ padlock_ctr32_encrypt: .align 16 padlock_xstore: .L_padlock_xstore_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi movl 8(%esp),%edi @@ -921,10 +921,10 @@ padlock_xstore: .type _win32_segv_handler,@function .align 16 _win32_segv_handler: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif movl $1,%eax movl 4(%esp),%edx @@ -941,10 +941,10 @@ _win32_segv_handler: .align 16 padlock_sha1_oneshot: .L_padlock_sha1_oneshot_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -977,10 +977,10 @@ padlock_sha1_oneshot: .align 16 padlock_sha1_blocks: .L_padlock_sha1_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -1012,10 +1012,10 @@ padlock_sha1_blocks: .align 16 padlock_sha256_oneshot: .L_padlock_sha256_oneshot_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -1048,10 +1048,10 @@ padlock_sha256_oneshot: .align 16 padlock_sha256_blocks: .L_padlock_sha256_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi @@ -1083,10 +1083,10 @@ padlock_sha256_blocks: .align 16 padlock_sha512_blocks: .L_padlock_sha512_blocks_begin: - %ifdef __CET__ + #ifdef __CET__ .byte 243,15,30,251 - %endif + #endif pushl %edi pushl %esi diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/progs.h b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl.gypi b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl.gypi index 2f0dea41efd200..675580f4af2c98 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 @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', diff --git a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/apps/progs.c b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/apps/progs.c +++ b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/configdata.pm b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/configdata.pm index 6210b1d2a3a71f..4dd79b1a516e35 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 @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [], @@ -154,7 +154,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -203,10 +203,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -256,11 +256,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "solaris-x86-gcc", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -387,7 +387,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -891,6 +890,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1047,9 +1049,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3427,9 +3426,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5821,9 +5817,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7206,6 +7199,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7414,10 +7411,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10199,7 +10192,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10250,7 +10242,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12453,9 +12444,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14847,9 +14835,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16214,10 +16199,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16819,7 +16800,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18278,6 +18258,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18440,9 +18424,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19815,7 +19796,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20149,6 +20129,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20201,7 +20182,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24327,7 +24307,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24354,7 +24333,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25595,9 +25573,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25679,9 +25654,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25812,6 +25784,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26124,12 +26102,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27521,8 +27493,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27549,7 +27521,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27566,8 +27538,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27585,7 +27557,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27607,7 +27579,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by 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 4c9d7e40a9a713..3961f01b5756f2 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: solaris-x86-gcc" -#define DATE "built on: Mon Sep 30 17:14:18 2024 UTC" +#define DATE "built on: Mon Mar 3 17:44:32 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/progs.h b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/progs.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/openssl.gypi b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/openssl.gypi index 5af311edc163dc..65b9565d3dfa88 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 @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/apps/progs.c b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/apps/progs.c +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/configdata.pm b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/configdata.pm index b0a159b0cc7022..6715d68e9977e4 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 @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -204,10 +204,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -256,11 +256,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "solaris64-x86_64-gcc", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -388,7 +388,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -891,6 +890,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1047,9 +1049,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3491,9 +3490,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5885,9 +5881,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7270,6 +7263,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7478,10 +7475,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10321,7 +10314,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10372,7 +10364,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12575,9 +12566,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14969,9 +14957,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16336,10 +16321,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16941,7 +16922,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18400,6 +18380,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18562,9 +18546,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19937,7 +19918,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20271,6 +20251,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20323,7 +20304,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24618,7 +24598,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24645,7 +24624,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25909,9 +25887,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25993,9 +25968,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -26126,6 +26098,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26438,12 +26416,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27832,8 +27804,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27860,7 +27832,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27877,8 +27849,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27896,7 +27868,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27918,7 +27890,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by 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 d4ff152f987c38..5b8d82c43716fe 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: solaris64-x86_64-gcc" -#define DATE "built on: Mon Sep 30 17:14:30 2024 UTC" +#define DATE "built on: Mon Mar 3 17:44:39 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/opensslv.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/ssl.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/progs.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/progs.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl.gypi b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl.gypi index 24d9ad0e5c0bee..d9001667578d0c 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 @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/apps/progs.c b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/apps/progs.c +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/configdata.pm b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/configdata.pm index fe2ce273e36091..cac17c057b60fa 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 @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [ @@ -156,7 +156,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -204,10 +204,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -256,11 +256,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "solaris64-x86_64-gcc", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -388,7 +388,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -891,6 +890,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1047,9 +1049,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3491,9 +3490,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5885,9 +5881,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7270,6 +7263,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7478,10 +7475,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10321,7 +10314,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10372,7 +10364,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12575,9 +12566,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14969,9 +14957,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16336,10 +16321,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16941,7 +16922,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18400,6 +18380,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18562,9 +18546,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19937,7 +19918,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20271,6 +20251,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20323,7 +20304,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24618,7 +24598,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24645,7 +24624,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25909,9 +25887,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25993,9 +25968,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -26126,6 +26098,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26438,12 +26416,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27832,8 +27804,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27860,7 +27832,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27877,8 +27849,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27896,7 +27868,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27918,7 +27890,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by 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 8d026664c28a3b..8c9a8ef722d5bd 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: solaris64-x86_64-gcc" -#define DATE "built on: Mon Sep 30 17:14:46 2024 UTC" +#define DATE "built on: Mon Mar 3 17:44:51 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/opensslv.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/ssl.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/ssl.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/progs.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl.gypi b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl.gypi index 5bab94f70bb82a..d48b3cba951648 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 @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ecb.c', diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/apps/progs.c b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/apps/progs.c index 6f240203d77ae3..43cef00799b86e 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/apps/progs.c +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/configdata.pm b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/configdata.pm index 350e5fdcdfdef2..0a40a0b72b65da 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 @@ -139,7 +139,7 @@ our %config = ( "providers/implementations/kem/build.info", "providers/implementations/rands/seeding/build.info" ], - "build_metadata" => "+quic", + "build_metadata" => "", "build_type" => "release", "builddir" => ".", "cflags" => [], @@ -154,7 +154,7 @@ our %config = ( ], "dynamic_engines" => "0", "ex_libs" => [], - "full_version" => "3.0.15+quic", + "full_version" => "3.0.16", "includes" => [], "lflags" => [], "lib_defines" => [ @@ -203,10 +203,10 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "", "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic", - "patch" => "15", + "patch" => "16", "perl_archname" => "x86_64-linux-gnu-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.34.0", + "perl_version" => "5.30.0", "perlargv" => [ "no-comp", "no-shared", @@ -256,11 +256,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "3 Sep 2024", - "shlib_version" => "81.3", + "release_date" => "11 Feb 2025", + "shlib_version" => "3", "sourcedir" => ".", "target" => "solaris64-x86_64-gcc", - "version" => "3.0.15" + "version" => "3.0.16" ); our %target = ( "AR" => "ar", @@ -388,7 +388,6 @@ our @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -892,6 +891,9 @@ our %unified_info = ( "test/bio_prefix_text" => { "noinst" => "1" }, + "test/bio_pw_callback_test" => { + "noinst" => "1" + }, "test/bio_readbuffer_test" => { "noinst" => "1" }, @@ -1048,9 +1050,6 @@ our %unified_info = ( "test/buildtest_c_provider" => { "noinst" => "1" }, - "test/buildtest_c_quic" => { - "noinst" => "1" - }, "test/buildtest_c_rand" => { "noinst" => "1" }, @@ -3428,9 +3427,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -5822,9 +5818,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -7207,6 +7200,10 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a" ], + "test/bio_pw_callback_test" => [ + "libcrypto", + "test/libtestutil.a" + ], "test/bio_readbuffer_test" => [ "libcrypto", "test/libtestutil.a" @@ -7415,10 +7412,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_quic" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_rand" => [ "libcrypto", "libssl" @@ -10200,7 +10193,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -10251,7 +10243,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "products" => { @@ -12454,9 +12445,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_psk_client_callback.html" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/html/man3/SSL_CTX_set_quic_method.html" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/html/man3/SSL_CTX_set_quiet_shutdown.html" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -14848,9 +14836,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_psk_client_callback.3" => [ "doc/man3/SSL_CTX_set_psk_client_callback.pod" ], - "doc/man/man3/SSL_CTX_set_quic_method.3" => [ - "doc/man3/SSL_CTX_set_quic_method.pod" - ], "doc/man/man3/SSL_CTX_set_quiet_shutdown.3" => [ "doc/man3/SSL_CTX_set_quiet_shutdown.pod" ], @@ -16215,10 +16200,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "provider" ], - "test/buildtest_quic.c" => [ - "test/generate_buildtest.pl", - "quic" - ], "test/buildtest_rand.c" => [ "test/generate_buildtest.pl", "rand" @@ -16820,7 +16801,6 @@ our %unified_info = ( "doc/html/man3/SSL_CTX_set_num_tickets.html", "doc/html/man3/SSL_CTX_set_options.html", "doc/html/man3/SSL_CTX_set_psk_client_callback.html", - "doc/html/man3/SSL_CTX_set_quic_method.html", "doc/html/man3/SSL_CTX_set_quiet_shutdown.html", "doc/html/man3/SSL_CTX_set_read_ahead.html", "doc/html/man3/SSL_CTX_set_record_padding_callback.html", @@ -18279,6 +18259,10 @@ our %unified_info = ( "include", "apps/include" ], + "test/bio_pw_callback_test" => [ + "include", + "apps/include" + ], "test/bio_readbuffer_test" => [ "include", "apps/include" @@ -18441,9 +18425,6 @@ our %unified_info = ( "test/buildtest_c_provider" => [ "include" ], - "test/buildtest_c_quic" => [ - "include" - ], "test/buildtest_c_rand" => [ "include" ], @@ -19816,7 +19797,6 @@ our %unified_info = ( "doc/man/man3/SSL_CTX_set_num_tickets.3", "doc/man/man3/SSL_CTX_set_options.3", "doc/man/man3/SSL_CTX_set_psk_client_callback.3", - "doc/man/man3/SSL_CTX_set_quic_method.3", "doc/man/man3/SSL_CTX_set_quiet_shutdown.3", "doc/man/man3/SSL_CTX_set_read_ahead.3", "doc/man/man3/SSL_CTX_set_record_padding_callback.3", @@ -20150,6 +20130,7 @@ our %unified_info = ( "test/bio_enc_test", "test/bio_memleak_test", "test/bio_prefix_text", + "test/bio_pw_callback_test", "test/bio_readbuffer_test", "test/bioprinttest", "test/bn_internal_test", @@ -20202,7 +20183,6 @@ our %unified_info = ( "test/buildtest_c_pem2", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", - "test/buildtest_c_quic", "test/buildtest_c_rand", "test/buildtest_c_rc2", "test/buildtest_c_rc4", @@ -24328,7 +24308,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_init.o", "ssl/libssl-lib-ssl_lib.o", "ssl/libssl-lib-ssl_mcnf.o", - "ssl/libssl-lib-ssl_quic.o", "ssl/libssl-lib-ssl_rsa.o", "ssl/libssl-lib-ssl_rsa_legacy.o", "ssl/libssl-lib-ssl_sess.o", @@ -24355,7 +24334,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_clnt.o", "ssl/statem/libssl-lib-statem_dtls.o", "ssl/statem/libssl-lib-statem_lib.o", - "ssl/statem/libssl-lib-statem_quic.o", "ssl/statem/libssl-lib-statem_srvr.o" ], "providers/common/der/libcommon-lib-der_digests_gen.o" => [ @@ -25596,9 +25574,6 @@ our %unified_info = ( "ssl/libssl-lib-ssl_mcnf.o" => [ "ssl/ssl_mcnf.c" ], - "ssl/libssl-lib-ssl_quic.o" => [ - "ssl/ssl_quic.c" - ], "ssl/libssl-lib-ssl_rsa.o" => [ "ssl/ssl_rsa.c" ], @@ -25680,9 +25655,6 @@ our %unified_info = ( "ssl/statem/libssl-lib-statem_lib.o" => [ "ssl/statem/statem_lib.c" ], - "ssl/statem/libssl-lib-statem_quic.o" => [ - "ssl/statem/statem_quic.c" - ], "ssl/statem/libssl-lib-statem_srvr.o" => [ "ssl/statem/statem_srvr.c" ], @@ -25813,6 +25785,12 @@ our %unified_info = ( "test/bio_prefix_text-bin-bio_prefix_text.o" => [ "test/bio_prefix_text.c" ], + "test/bio_pw_callback_test" => [ + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" + ], + "test/bio_pw_callback_test-bin-bio_pw_callback_test.o" => [ + "test/bio_pw_callback_test.c" + ], "test/bio_readbuffer_test" => [ "test/bio_readbuffer_test-bin-bio_readbuffer_test.o" ], @@ -26125,12 +26103,6 @@ our %unified_info = ( "test/buildtest_c_provider-bin-buildtest_provider.o" => [ "test/buildtest_provider.c" ], - "test/buildtest_c_quic" => [ - "test/buildtest_c_quic-bin-buildtest_quic.o" - ], - "test/buildtest_c_quic-bin-buildtest_quic.o" => [ - "test/buildtest_quic.c" - ], "test/buildtest_c_rand" => [ "test/buildtest_c_rand-bin-buildtest_rand.o" ], @@ -27522,8 +27494,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/runner/work/node/node/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27550,7 +27522,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; + use lib '/node/deps/openssl/openssl/Configurations'; use gentemplate; open my $buildfile_template_fh, ">$buildfile_template" @@ -27567,8 +27539,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/runner/work/node/node/deps/openssl/openssl/util/perl'; -use lib '/home/runner/work/node/node/deps/openssl/openssl/Configurations'; +use lib '/node/deps/openssl/openssl/util/perl'; +use lib '/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ @@ -27586,7 +27558,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -27608,7 +27580,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by 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 f750c629cde372..e689dd4ce7fb1e 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 @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: solaris64-x86_64-gcc" -#define DATE "built on: Mon Sep 30 17:15:02 2024 UTC" +#define DATE "built on: Mon Mar 3 17:45:02 2025 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/opensslv.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/opensslv.h index 819878c21bf304..8e11963343e9fa 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/opensslv.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -42,7 +42,7 @@ extern "C" { # define OPENSSL_VERSION_PRE_RELEASE "" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -# define OPENSSL_VERSION_BUILD_METADATA "+quic" +# define OPENSSL_VERSION_BUILD_METADATA "" /* * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA @@ -57,7 +57,7 @@ extern "C" { * be related to the API version expressed with the macros above. * This is defined in free form. */ -# define OPENSSL_SHLIB_VERSION 81.3 +# define OPENSSL_SHLIB_VERSION 3 /* * SECTION 2: USEFUL MACROS @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15+quic" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15+quic 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/ssl.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/ssl.h index 0f1915755ae8a4..3df725c56d6c5e 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/ssl.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/ssl.h @@ -2593,75 +2593,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/progs.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/progs.h index f1d15624839fbb..be55f61503d405 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/progs.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/openssl.gypi b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/openssl.gypi index 18879acfa1918b..44ff54ede30479 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 @@ -19,7 +19,6 @@ 'openssl/ssl/ssl_init.c', 'openssl/ssl/ssl_lib.c', 'openssl/ssl/ssl_mcnf.c', - 'openssl/ssl/ssl_quic.c', 'openssl/ssl/ssl_rsa.c', 'openssl/ssl/ssl_rsa_legacy.c', 'openssl/ssl/ssl_sess.c', @@ -46,7 +45,6 @@ 'openssl/ssl/statem/statem_clnt.c', 'openssl/ssl/statem/statem_dtls.c', 'openssl/ssl/statem/statem_lib.c', - 'openssl/ssl/statem/statem_quic.c', 'openssl/ssl/statem/statem_srvr.c', 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/aes/aes_cfb.c', diff --git a/deps/openssl/openssl/CHANGES.md b/deps/openssl/openssl/CHANGES.md index be359160542604..5b0193bc3955c6 100644 --- a/deps/openssl/openssl/CHANGES.md +++ b/deps/openssl/openssl/CHANGES.md @@ -28,11 +28,36 @@ breaking changes, and mappings for the large list of deprecated functions. [Migration guide]: https://github.com/openssl/openssl/tree/master/doc/man7/migration_guide.pod -### Changes between 3.0.15 and 3.0.15+quic [3 Sep 2024] +### Changes between 3.0.15 and 3.0.16 [11 Feb 2025] -* Add QUIC API support from BoringSSL + * Fixed timing side-channel in ECDSA signature computation. - *Todd Short* + There is a timing signal of around 300 nanoseconds when the top word of + the inverted ECDSA nonce value is zero. This can happen with significant + probability only for some of the supported elliptic curves. In particular + the NIST P-521 curve is affected. To be able to measure this leak, the + attacker process must either be located in the same physical computer or + must have a very fast network connection with low latency. + + ([CVE-2024-13176]) + + *Tomáš Mráz* + + * Fixed possible OOB memory access with invalid low-level GF(2^m) elliptic + curve parameters. + + Use of the low-level GF(2^m) elliptic curve APIs with untrusted + explicit values for the field polynomial can lead to out-of-bounds memory + reads or writes. + Applications working with "exotic" explicit binary (GF(2^m)) curve + parameters, that make it possible to represent invalid field polynomials + with a zero constant term, via the above or similar APIs, may terminate + abruptly as a result of reading or writing outside of array bounds. Remote + code execution cannot easily be ruled out. + + ([CVE-2024-9143]) + + *Viktor Dukhovni* ### Changes between 3.0.14 and 3.0.15 [3 Sep 2024] @@ -19928,6 +19953,8 @@ ndif +[CVE-2024-13176]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-13176 +[CVE-2024-9143]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-9143 [CVE-2024-6119]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-6119 [CVE-2024-5535]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-5535 [CVE-2024-4741]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-4741 diff --git a/deps/openssl/openssl/Configurations/unix-Makefile.tmpl b/deps/openssl/openssl/Configurations/unix-Makefile.tmpl index 644540397de596..d2b0797a7edf9d 100644 --- a/deps/openssl/openssl/Configurations/unix-Makefile.tmpl +++ b/deps/openssl/openssl/Configurations/unix-Makefile.tmpl @@ -1688,7 +1688,7 @@ EOF } elsif ($makedep_scheme eq 'gcc' && !grep /\.rc$/, @srcs) { $recipe .= <<"EOF"; $obj: $deps - $cmd $incs $defs $cmdflags -MMD -MF $dep.tmp -MT \$\@ -c -o \$\@ $srcs + $cmd $incs $defs $cmdflags -MMD -MF $dep.tmp -c -o \$\@ $srcs \@touch $dep.tmp \@if cmp $dep.tmp $dep > /dev/null 2> /dev/null; then \\ rm -f $dep.tmp; \\ diff --git a/deps/openssl/openssl/Configure b/deps/openssl/openssl/Configure index 1aa660a46c4dc4..0c60d1da1659bd 100755 --- a/deps/openssl/openssl/Configure +++ b/deps/openssl/openssl/Configure @@ -467,7 +467,6 @@ my @disablables = ( "poly1305", "posix-io", "psk", - "quic", "rc2", "rc4", "rc5", @@ -578,7 +577,6 @@ my @disable_cascades = ( "sm3", "sm4", "srp", "srtp", "ssl3-method", "ssl-trace", "ts", "ui-console", "whirlpool", - "quic", "fips-securitychecks" ], sub { $config{processor} eq "386" } => [ "sse2" ], @@ -586,7 +584,7 @@ my @disable_cascades = ( "ssl3-method" => [ "ssl3" ], "zlib" => [ "zlib-dynamic" ], "des" => [ "mdc2" ], - "ec" => [ "ec2m", "ecdsa", "ecdh", "sm2", "gost", "quic" ], + "ec" => [ "ec2m", "ecdsa", "ecdh", "sm2", "gost" ], "dgram" => [ "dtls", "sctp" ], "sock" => [ "dgram" ], "dtls" => [ @dtls ], @@ -637,7 +635,6 @@ my @disable_cascades = ( "legacy" => [ "md2" ], "cmp" => [ "crmf" ], - "tls1_3" => [ "quic" ], "fips" => [ "fips-securitychecks", "acvp-tests" ], diff --git a/deps/openssl/openssl/INSTALL.md b/deps/openssl/openssl/INSTALL.md index 107a9b56e4c689..47d64b1a39d8e2 100644 --- a/deps/openssl/openssl/INSTALL.md +++ b/deps/openssl/openssl/INSTALL.md @@ -829,10 +829,6 @@ Don't use POSIX IO capabilities. Don't build support for Pre-Shared Key based ciphersuites. -### no-quic - -Don't build support for QUIC API from BoringSSL. - ### no-rdrand Don't use hardware RDRAND capabilities. diff --git a/deps/openssl/openssl/NEWS.md b/deps/openssl/openssl/NEWS.md index e0a81703ee8dc3..007fc9786ef810 100644 --- a/deps/openssl/openssl/NEWS.md +++ b/deps/openssl/openssl/NEWS.md @@ -18,6 +18,20 @@ OpenSSL Releases OpenSSL 3.0 ----------- +### Major changes between OpenSSL 3.0.15 and OpenSSL 3.0.16 [11 Feb 2025] + +OpenSSL 3.0.16 is a security patch release. The most severe CVE fixed in this +release is Low. + +This release incorporates the following bug fixes and mitigations: + + * Fixed timing side-channel in ECDSA signature computation. + ([CVE-2024-13176]) + + * Fixed possible OOB memory access with invalid low-level GF(2^m) elliptic + curve parameters. + ([CVE-2024-9143]) + ### Major changes between OpenSSL 3.0.14 and OpenSSL 3.0.15 [3 Sep 2024] OpenSSL 3.0.15 is a security patch release. The most severe CVE fixed in this @@ -1495,6 +1509,8 @@ OpenSSL 0.9.x +[CVE-2024-13176]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-13176 +[CVE-2024-9143]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-9143 [CVE-2024-6119]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-6119 [CVE-2024-5535]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-5535 [CVE-2024-4741]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-4741 diff --git a/deps/openssl/openssl/NOTES-NONSTOP.md b/deps/openssl/openssl/NOTES-NONSTOP.md index ab13de7d3a760a..9441647604c7bb 100644 --- a/deps/openssl/openssl/NOTES-NONSTOP.md +++ b/deps/openssl/openssl/NOTES-NONSTOP.md @@ -119,12 +119,9 @@ correctly, you also need the `COMP_ROOT` set, as in: `COMP_ROOT` needs to be in Windows form. -`Configure` must specify the `no-makedepend` option otherwise errors will -result when running the build because the c99 cross-compiler does not support -the `gcc -MT` option. An example of a `Configure` command to be run from the -OpenSSL directory is: +An example of a `Configure` command to be run from the OpenSSL directory is: - ./Configure nonstop-nsx_64 no-makedepend --with-rand-seed=rdcpu + ./Configure nonstop-nsx_64 --with-rand-seed=rdcpu Do not forget to include any OpenSSL cross-compiling prefix and certificate options when creating your libraries. diff --git a/deps/openssl/openssl/README-OpenSSL.md b/deps/openssl/openssl/README-OpenSSL.md deleted file mode 100644 index 5184a461bb17cd..00000000000000 --- a/deps/openssl/openssl/README-OpenSSL.md +++ /dev/null @@ -1,224 +0,0 @@ -Welcome to the OpenSSL Project -============================== - -[![openssl logo]][www.openssl.org] - -[![github actions ci badge]][github actions ci] -[![appveyor badge]][appveyor jobs] - -OpenSSL is a robust, commercial-grade, full-featured Open Source Toolkit -for the Transport Layer Security (TLS) protocol formerly known as the -Secure Sockets Layer (SSL) protocol. The protocol implementation is based -on a full-strength general purpose cryptographic library, which can also -be used stand-alone. - -OpenSSL is descended from the SSLeay library developed by Eric A. Young -and Tim J. Hudson. - -The official Home Page of the OpenSSL Project is [www.openssl.org]. - -Table of Contents -================= - - - [Overview](#overview) - - [Download](#download) - - [Build and Install](#build-and-install) - - [Documentation](#documentation) - - [License](#license) - - [Support](#support) - - [Contributing](#contributing) - - [Legalities](#legalities) - -Overview -======== - -The OpenSSL toolkit includes: - -- **libssl** - an implementation of all TLS protocol versions up to TLSv1.3 ([RFC 8446]). - -- **libcrypto** - a full-strength general purpose cryptographic library. It constitutes the - basis of the TLS implementation, but can also be used independently. - -- **openssl** - the OpenSSL command line tool, a swiss army knife for cryptographic tasks, - testing and analyzing. It can be used for - - creation of key parameters - - creation of X.509 certificates, CSRs and CRLs - - calculation of message digests - - encryption and decryption - - SSL/TLS client and server tests - - handling of S/MIME signed or encrypted mail - - and more... - -Download -======== - -For Production Use ------------------- - -Source code tarballs of the official releases can be downloaded from -[www.openssl.org/source](https://www.openssl.org/source). -The OpenSSL project does not distribute the toolkit in binary form. - -However, for a large variety of operating systems precompiled versions -of the OpenSSL toolkit are available. In particular on Linux and other -Unix operating systems it is normally recommended to link against the -precompiled shared libraries provided by the distributor or vendor. - -For Testing and Development ---------------------------- - -Although testing and development could in theory also be done using -the source tarballs, having a local copy of the git repository with -the entire project history gives you much more insight into the -code base. - -The official OpenSSL Git Repository is located at [git.openssl.org]. -There is a GitHub mirror of the repository at [github.com/openssl/openssl], -which is updated automatically from the former on every commit. - -A local copy of the Git Repository can be obtained by cloning it from -the original OpenSSL repository using - - git clone git://git.openssl.org/openssl.git - -or from the GitHub mirror using - - git clone https://github.com/openssl/openssl.git - -If you intend to contribute to OpenSSL, either to fix bugs or contribute -new features, you need to fork the OpenSSL repository openssl/openssl on -GitHub and clone your public fork instead. - - git clone https://github.com/yourname/openssl.git - -This is necessary, because all development of OpenSSL nowadays is done via -GitHub pull requests. For more details, see [Contributing](#contributing). - -Build and Install -================= - -After obtaining the Source, have a look at the [INSTALL](INSTALL.md) file for -detailed instructions about building and installing OpenSSL. For some -platforms, the installation instructions are amended by a platform specific -document. - - * [Notes for UNIX-like platforms](NOTES-UNIX.md) - * [Notes for Android platforms](NOTES-ANDROID.md) - * [Notes for Windows platforms](NOTES-WINDOWS.md) - * [Notes for the DOS platform with DJGPP](NOTES-DJGPP.md) - * [Notes for the OpenVMS platform](NOTES-VMS.md) - * [Notes on Perl](NOTES-PERL.md) - * [Notes on Valgrind](NOTES-VALGRIND.md) - -Specific notes on upgrading to OpenSSL 3.0 from previous versions can be found -in the [migration_guide(7ossl)] manual page. - -Documentation -============= - -Manual Pages ------------- - -The manual pages for the master branch and all current stable releases are -available online. - -- [OpenSSL master](https://www.openssl.org/docs/manmaster) -- [OpenSSL 3.0](https://www.openssl.org/docs/man3.0) -- [OpenSSL 1.1.1](https://www.openssl.org/docs/man1.1.1) - -Wiki ----- - -There is a Wiki at [wiki.openssl.org] which is currently not very active. -It contains a lot of useful information, not all of which is up to date. - -License -======= - -OpenSSL is licensed under the Apache License 2.0, which means that -you are free to get and use it for commercial and non-commercial -purposes as long as you fulfill its conditions. - -See the [LICENSE.txt](LICENSE.txt) file for more details. - -Support -======= - -There are various ways to get in touch. The correct channel depends on -your requirement. see the [SUPPORT](SUPPORT.md) file for more details. - -Contributing -============ - -If you are interested and willing to contribute to the OpenSSL project, -please take a look at the [CONTRIBUTING](CONTRIBUTING.md) file. - -Legalities -========== - -A number of nations restrict the use or export of cryptography. If you are -potentially subject to such restrictions you should seek legal advice before -attempting to develop or distribute cryptographic code. - -Copyright -========= - -Copyright (c) 1998-2024 The OpenSSL Project - -Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson - -All rights reserved. - - - -[www.openssl.org]: - - "OpenSSL Homepage" - -[git.openssl.org]: - - "OpenSSL Git Repository" - -[git.openssl.org]: - - "OpenSSL Git Repository" - -[github.com/openssl/openssl]: - - "OpenSSL GitHub Mirror" - -[wiki.openssl.org]: - - "OpenSSL Wiki" - -[migration_guide(7ossl)]: - - "OpenSSL Migration Guide" - -[RFC 8446]: - - - - -[openssl logo]: - doc/images/openssl.svg - "OpenSSL Logo" - -[github actions ci badge]: - - "GitHub Actions CI Status" - -[github actions ci]: - - "GitHub Actions CI" - -[appveyor badge]: - - "AppVeyor Build Status" - -[appveyor jobs]: - - "AppVeyor Jobs" diff --git a/deps/openssl/openssl/README.md b/deps/openssl/openssl/README.md index 702cc3979a1826..477f5cbb7d1273 100644 --- a/deps/openssl/openssl/README.md +++ b/deps/openssl/openssl/README.md @@ -1,113 +1,212 @@ -What This Is -============ +Welcome to the OpenSSL Project +============================== -This is a fork of [OpenSSL](https://www.openssl.org) to enable QUIC. In addition -to the website, the official source distribution is at -. The OpenSSL `README` can be found at -[README-OpenSSL.md](https://github.com/quictls/openssl/blob/openssl-3.0.15%2Bquic/README-OpenSSL.md) +[![openssl logo]][www.openssl.org] -This fork adds APIs that can be used by QUIC implementations for connection -handshakes. Quoting the IETF Working group -[charter](https://datatracker.ietf.org/wg/quic/about/), QUIC is a "UDP-based, -stream-multiplexing, encrypted transport protocol." If you don't need QUIC, you -should use the official OpenSSL distributions. +[![github actions ci badge]][github actions ci] +[![appveyor badge]][appveyor jobs] -The APIs here are used by Microsoft's -[MsQuic](https://github.com/microsoft/msquic) and Google's -[Chromium QUIC](https://chromium.googlesource.com/chromium/src/+/master/net/quic/) +OpenSSL is a robust, commercial-grade, full-featured Open Source Toolkit +for the Transport Layer Security (TLS) protocol formerly known as the +Secure Sockets Layer (SSL) protocol. The protocol implementation is based +on a full-strength general purpose cryptographic library, which can also +be used stand-alone. -We are not in competition with OpenSSL project. We informed them of -our plans to fork the code before we went public. We do not speak for the -OpenSSL project, and can only point to a -[blog post](https://www.openssl.org/blog/blog/2020/02/17/QUIC-and-OpenSSL/) and -[openssl-project email](https://github.com/quictls/openssl/discussions/54) -that provides their view of QUIC support. +OpenSSL is descended from the SSLeay library developed by Eric A. Young +and Tim J. Hudson. -As stated in their blog post, the OpenSSL team is focused on their 3.0 release -(released 2021-09-07), and does not intend to add QUIC functionality to 1.1.x. -There is a community need for a QUIC-capable TLS library. This fork is intended -as stopgap solution to enable higher level frameworks and runtimes to use QUIC -with the proven and reliable TLS functionality from OpenSSL. This fork will be -maintained until OpenSSL officially provides reasonable support for QUIC -implementations. +The official Home Page of the OpenSSL Project is [www.openssl.org]. -This fork can be considered a supported version of -[OpenSSL PR 8797](https://github.com/openssl/openssl/pull/8797). -We will endeavor to track OpenSSL releases within a day or so, and there is an -item below about how we'll follow their tagging. +Table of Contents +================= -On to the questions and answers. + - [Overview](#overview) + - [Download](#download) + - [Build and Install](#build-and-install) + - [Documentation](#documentation) + - [License](#license) + - [Support](#support) + - [Contributing](#contributing) + - [Legalities](#legalities) -What about branches? --------------------- +Overview +======== -We don't want to conflict with OpenSSL branch names. Our current plan is to append -`+quic`. Release tags are likely to be the QUIC branch with `-releaseX` appended. -For example, the OpenSSL tag `openssl-3.0.0` would have a branch named -`openssl-3.0.0+quic` and a release tag of `openssl-3.0.0+quic-release1`. +The OpenSSL toolkit includes: -How are you keeping current with OpenSSL? ------------------------------------------ +- **libssl** + an implementation of all TLS protocol versions up to TLSv1.3 ([RFC 8446]). -(In other words, "What about rebasing?") +- **libcrypto** + a full-strength general purpose cryptographic library. It constitutes the + basis of the TLS implementation, but can also be used independently. -Our plan is to always rebase on top of an upstream release tag. In particular: +- **openssl** + the OpenSSL command line tool, a swiss army knife for cryptographic tasks, + testing and analyzing. It can be used for + - creation of key parameters + - creation of X.509 certificates, CSRs and CRLs + - calculation of message digests + - encryption and decryption + - SSL/TLS client and server tests + - handling of S/MIME signed or encrypted mail + - and more... -- The changes for QUIC will always be at the tip of the branch -- you will know what - is from the original OpenSSL and what is for QUIC. -- New versions are quickly created once upstream creates a new tag. -- The use of git commands (such as `cherry`) can be used to ensure that all changes - have moved forward with minimal or no changes. You will be able to see - "QUIC: Add X" on all branches and the commit itself will be nearly identical on - all branches, and any changes to that can be easily identified. +Download +======== -What about library names? -------------------------- +For Production Use +------------------ -Library names will be the same, but will use a different version number. The version -numbers for the current OpenSSL libraries are `1.1` (for the 1.1.0 and 1.1.1 branches) -and `3` (for the 3.0 branch). We will be prefixing `81` (ASCII for 'Q') to -the version numbers to generate a unique version number. +Source code tarballs of the official releases can be downloaded from +[openssl-library.org/source/](https://openssl-library.org/source/). +The OpenSSL project does not distribute the toolkit in binary form. -- `libcrypto.so.81.3` vs `libcrypto.so.3` -- `libcrypto.so.81.1.1` vs `libcrypto.so.1.1` -- `libssl.so.81.3` vs `libssl.so.3` -- `libssl.so.81.1.1` vs `libssl.so.1.1` +However, for a large variety of operating systems precompiled versions +of the OpenSSL toolkit are available. In particular on Linux and other +Unix operating systems it is normally recommended to link against the +precompiled shared libraries provided by the distributor or vendor. -The SONAME of these libraries are all different, guaranteeing the correct library -will be used. +For Testing and Development +--------------------------- -...and the executable? ----------------------- +Although testing and development could in theory also be done using +the source tarballs, having a local copy of the git repository with +the entire project history gives you much more insight into the +code base. -We currently do not have any plans to change the name, mainly because we -haven't made any changes there. If you see a need, please open an issue. +The main OpenSSL Git repository is private. +There is a public GitHub mirror of it at [github.com/openssl/openssl], +which is updated automatically from the former on every commit. -The `openssl version` command will report that it is `+quic` enabled. +A local copy of the Git repository can be obtained by cloning it from +the GitHub mirror using -...and FIPS? ------------- + git clone https://github.com/openssl/openssl.git + +If you intend to contribute to OpenSSL, either to fix bugs or contribute +new features, you need to fork the GitHub mirror and clone your public fork +instead. + + git clone https://github.com/yourname/openssl.git + +This is necessary, because all development of OpenSSL nowadays is done via +GitHub pull requests. For more details, see [Contributing](#contributing). + +Build and Install +================= + +After obtaining the Source, have a look at the [INSTALL](INSTALL.md) file for +detailed instructions about building and installing OpenSSL. For some +platforms, the installation instructions are amended by a platform specific +document. + + * [Notes for UNIX-like platforms](NOTES-UNIX.md) + * [Notes for Android platforms](NOTES-ANDROID.md) + * [Notes for Windows platforms](NOTES-WINDOWS.md) + * [Notes for the DOS platform with DJGPP](NOTES-DJGPP.md) + * [Notes for the OpenVMS platform](NOTES-VMS.md) + * [Notes on Perl](NOTES-PERL.md) + * [Notes on Valgrind](NOTES-VALGRIND.md) + +Specific notes on upgrading to OpenSSL 3.0 from previous versions can be found +in the [migration_guide(7ossl)] manual page. + +Documentation +============= -We are not doing anything with FIPS. This is actually good news: you should -be able to load the OpenSSL 3.0 FIPS module into an application built against -this fork and everything should Just Work™. - -How can I contribute? ---------------------- - -We want any code here to be acceptable to OpenSSL. This means that all contributors -must have signed the appropriate -[contributor license agreements](https://www.openssl.org/policies/cla.html). We -will not ask for copies of any paperwork, you just need to tell us that you've -done so (and we might verify with OpenSSL). We are only interested in making it -easier and better for at least the mentioned QUIC implementations to use a variant -of OpenSSL. If you have a pull request that changes the TLS protocol, or adds -assembly support for a new CPU, or otherwise is not specific to enabling QUIC, -please contribute that to OpenSSL. This fork is intended to be a clean extension -to OpenSSL, with the deltas being specific to QUIC. - -Who are you? +Manual Pages ------------ -This is a collaborative effort between [Akamai](https://www.akamai.com) and -[Microsoft](https://www.microsoft.com). We welcome anyone to contribute! +The manual pages for the master branch and all current stable releases are +available online. + +- [OpenSSL master](https://www.openssl.org/docs/manmaster) +- [OpenSSL 3.0](https://www.openssl.org/docs/man3.0) +- [OpenSSL 1.1.1](https://www.openssl.org/docs/man1.1.1) + +Wiki +---- + +There is a Wiki at [wiki.openssl.org] which is currently not very active. +It contains a lot of useful information, not all of which is up to date. + +License +======= + +OpenSSL is licensed under the Apache License 2.0, which means that +you are free to get and use it for commercial and non-commercial +purposes as long as you fulfill its conditions. + +See the [LICENSE.txt](LICENSE.txt) file for more details. + +Support +======= + +There are various ways to get in touch. The correct channel depends on +your requirement. see the [SUPPORT](SUPPORT.md) file for more details. + +Contributing +============ + +If you are interested and willing to contribute to the OpenSSL project, +please take a look at the [CONTRIBUTING](CONTRIBUTING.md) file. + +Legalities +========== + +A number of nations restrict the use or export of cryptography. If you are +potentially subject to such restrictions you should seek legal advice before +attempting to develop or distribute cryptographic code. + +Copyright +========= + +Copyright (c) 1998-2025 The OpenSSL Project + +Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson + +All rights reserved. + + + +[www.openssl.org]: + + "OpenSSL Homepage" + +[github.com/openssl/openssl]: + + "OpenSSL GitHub Mirror" + +[wiki.openssl.org]: + + "OpenSSL Wiki" + +[migration_guide(7ossl)]: + + "OpenSSL Migration Guide" + +[RFC 8446]: + + + + +[openssl logo]: + doc/images/openssl.svg + "OpenSSL Logo" + +[github actions ci badge]: + + "GitHub Actions CI Status" + +[github actions ci]: + + "GitHub Actions CI" + +[appveyor badge]: + + "AppVeyor Build Status" + +[appveyor jobs]: + + "AppVeyor Jobs" diff --git a/deps/openssl/openssl/VERSION.dat b/deps/openssl/openssl/VERSION.dat index 9f3b18e8899778..4b7eb91a451a90 100644 --- a/deps/openssl/openssl/VERSION.dat +++ b/deps/openssl/openssl/VERSION.dat @@ -1,7 +1,7 @@ MAJOR=3 MINOR=0 -PATCH=15 +PATCH=16 PRE_RELEASE_TAG= -BUILD_METADATA=quic -RELEASE_DATE="3 Sep 2024" -SHLIB_VERSION=81.3 +BUILD_METADATA= +RELEASE_DATE="11 Feb 2025" +SHLIB_VERSION=3 diff --git a/deps/openssl/openssl/apps/asn1parse.c b/deps/openssl/openssl/apps/asn1parse.c index f0bfd1d45fc423..129b867c8cc744 100644 --- a/deps/openssl/openssl/apps/asn1parse.c +++ b/deps/openssl/openssl/apps/asn1parse.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -127,7 +127,8 @@ int asn1parse_main(int argc, char **argv) dump = strtol(opt_arg(), NULL, 0); break; case OPT_STRPARSE: - sk_OPENSSL_STRING_push(osk, opt_arg()); + if (sk_OPENSSL_STRING_push(osk, opt_arg()) <= 0) + goto end; break; case OPT_GENSTR: genstr = opt_arg(); diff --git a/deps/openssl/openssl/apps/cms.c b/deps/openssl/openssl/apps/cms.c index abb9f196a76090..dce227ef2db5ab 100644 --- a/deps/openssl/openssl/apps/cms.c +++ b/deps/openssl/openssl/apps/cms.c @@ -1,5 +1,5 @@ /* - * Copyright 2008-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2008-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -494,13 +494,15 @@ int cms_main(int argc, char **argv) if (rr_from == NULL && (rr_from = sk_OPENSSL_STRING_new_null()) == NULL) goto end; - sk_OPENSSL_STRING_push(rr_from, opt_arg()); + if (sk_OPENSSL_STRING_push(rr_from, opt_arg()) <= 0) + goto end; break; case OPT_RR_TO: if (rr_to == NULL && (rr_to = sk_OPENSSL_STRING_new_null()) == NULL) goto end; - sk_OPENSSL_STRING_push(rr_to, opt_arg()); + if (sk_OPENSSL_STRING_push(rr_to, opt_arg()) <= 0) + goto end; break; case OPT_PRINT: noout = print = 1; @@ -577,13 +579,15 @@ int cms_main(int argc, char **argv) if (sksigners == NULL && (sksigners = sk_OPENSSL_STRING_new_null()) == NULL) goto end; - sk_OPENSSL_STRING_push(sksigners, signerfile); + if (sk_OPENSSL_STRING_push(sksigners, signerfile) <= 0) + goto end; if (keyfile == NULL) keyfile = signerfile; if (skkeys == NULL && (skkeys = sk_OPENSSL_STRING_new_null()) == NULL) goto end; - sk_OPENSSL_STRING_push(skkeys, keyfile); + if (sk_OPENSSL_STRING_push(skkeys, keyfile) <= 0) + goto end; keyfile = NULL; } signerfile = opt_arg(); @@ -601,12 +605,14 @@ int cms_main(int argc, char **argv) if (sksigners == NULL && (sksigners = sk_OPENSSL_STRING_new_null()) == NULL) goto end; - sk_OPENSSL_STRING_push(sksigners, signerfile); + if (sk_OPENSSL_STRING_push(sksigners, signerfile) <= 0) + goto end; signerfile = NULL; if (skkeys == NULL && (skkeys = sk_OPENSSL_STRING_new_null()) == NULL) goto end; - sk_OPENSSL_STRING_push(skkeys, keyfile); + if (sk_OPENSSL_STRING_push(skkeys, keyfile) <= 0) + goto end; } keyfile = opt_arg(); break; @@ -660,7 +666,8 @@ int cms_main(int argc, char **argv) key_param->next = nparam; key_param = nparam; } - sk_OPENSSL_STRING_push(key_param->param, opt_arg()); + if (sk_OPENSSL_STRING_push(key_param->param, opt_arg()) <= 0) + goto end; break; case OPT_V_CASES: if (!opt_verify(o, vpm)) @@ -749,12 +756,14 @@ int cms_main(int argc, char **argv) if (sksigners == NULL && (sksigners = sk_OPENSSL_STRING_new_null()) == NULL) goto end; - sk_OPENSSL_STRING_push(sksigners, signerfile); + if (sk_OPENSSL_STRING_push(sksigners, signerfile) <= 0) + goto end; if (skkeys == NULL && (skkeys = sk_OPENSSL_STRING_new_null()) == NULL) goto end; if (keyfile == NULL) keyfile = signerfile; - sk_OPENSSL_STRING_push(skkeys, keyfile); + if (sk_OPENSSL_STRING_push(skkeys, keyfile) <= 0) + goto end; } if (sksigners == NULL) { BIO_printf(bio_err, "No signer certificate specified\n"); @@ -1014,8 +1023,15 @@ int cms_main(int argc, char **argv) pwri_tmp = NULL; } if (!(flags & CMS_STREAM)) { - if (!CMS_final(cms, in, NULL, flags)) + if (!CMS_final(cms, in, NULL, flags)) { + if (originator != NULL + && ERR_GET_REASON(ERR_peek_error()) + == CMS_R_ERROR_UNSUPPORTED_STATIC_KEY_AGREEMENT) { + BIO_printf(bio_err, "Cannot use originator for encryption\n"); + goto end; + } goto end; + } } } else if (operation == SMIME_ENCRYPTED_ENCRYPT) { cms = CMS_EncryptedData_encrypt_ex(in, cipher, secret_key, @@ -1261,6 +1277,7 @@ int cms_main(int argc, char **argv) X509_free(cert); X509_free(recip); X509_free(signer); + X509_free(originator); EVP_PKEY_free(key); EVP_CIPHER_free(cipher); EVP_CIPHER_free(wrap_cipher); diff --git a/deps/openssl/openssl/apps/engine.c b/deps/openssl/openssl/apps/engine.c index 1b0f64309c6f97..c83bdfc150c388 100644 --- a/deps/openssl/openssl/apps/engine.c +++ b/deps/openssl/openssl/apps/engine.c @@ -1,5 +1,5 @@ /* - * Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2000-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -352,10 +352,12 @@ int engine_main(int argc, char **argv) test_avail++; break; case OPT_PRE: - sk_OPENSSL_STRING_push(pre_cmds, opt_arg()); + if (sk_OPENSSL_STRING_push(pre_cmds, opt_arg()) <= 0) + goto end; break; case OPT_POST: - sk_OPENSSL_STRING_push(post_cmds, opt_arg()); + if (sk_OPENSSL_STRING_push(post_cmds, opt_arg()) <= 0) + goto end; break; } } diff --git a/deps/openssl/openssl/apps/info.c b/deps/openssl/openssl/apps/info.c index 66f3ef2587e2ef..c68603652f218b 100644 --- a/deps/openssl/openssl/apps/info.c +++ b/deps/openssl/openssl/apps/info.c @@ -10,15 +10,11 @@ #include #include "apps.h" #include "progs.h" -#include typedef enum OPTION_choice { OPT_COMMON, OPT_CONFIGDIR, OPT_ENGINESDIR, OPT_MODULESDIR, OPT_DSOEXT, OPT_DIRNAMESEP, OPT_LISTSEP, OPT_SEEDS, OPT_CPUSETTINGS -#ifndef OPENSSL_NO_QUIC - , OPT_QUIC -#endif } OPTION_CHOICE; const OPTIONS info_options[] = { @@ -36,9 +32,6 @@ const OPTIONS info_options[] = { {"listsep", OPT_LISTSEP, '-', "List separator character"}, {"seeds", OPT_SEEDS, '-', "Seed sources"}, {"cpusettings", OPT_CPUSETTINGS, '-', "CPU settings info"}, -#ifndef OPENSSL_NO_QUIC - {"quic", OPT_QUIC, '-', "QUIC info"}, -#endif {NULL} }; @@ -91,12 +84,6 @@ int info_main(int argc, char **argv) type = OPENSSL_INFO_CPU_SETTINGS; dirty++; break; -#ifndef OPENSSL_NO_QUIC - case OPT_QUIC: - type = OPENSSL_INFO_QUIC; - dirty++; - break; -#endif } } if (opt_num_rest() != 0) diff --git a/deps/openssl/openssl/apps/lib/http_server.c b/deps/openssl/openssl/apps/lib/http_server.c index a7fe5e1a58b0ab..33ae886d4a1cbe 100644 --- a/deps/openssl/openssl/apps/lib/http_server.c +++ b/deps/openssl/openssl/apps/lib/http_server.c @@ -220,14 +220,17 @@ BIO *http_server_init_bio(const char *prog, const char *port) { BIO *acbio = NULL, *bufbio; int asock; + char name[40]; + snprintf(name, sizeof(name), "[::]:%s", port); /* port may be "0" */ bufbio = BIO_new(BIO_f_buffer()); if (bufbio == NULL) goto err; acbio = BIO_new(BIO_s_accept()); if (acbio == NULL - || BIO_set_bind_mode(acbio, BIO_BIND_REUSEADDR) < 0 - || BIO_set_accept_port(acbio, port) < 0) { + || BIO_set_accept_ip_family(acbio, BIO_FAMILY_IPANY) <= 0 /* IPv4/6 */ + || BIO_set_bind_mode(acbio, BIO_BIND_REUSEADDR) <= 0 + || BIO_set_accept_name(acbio, name) <= 0) { log_message(prog, LOG_ERR, "Error setting up accept BIO"); goto err; } diff --git a/deps/openssl/openssl/apps/lib/s_cb.c b/deps/openssl/openssl/apps/lib/s_cb.c index 6440b496099e2d..9f33c24c4e352f 100644 --- a/deps/openssl/openssl/apps/lib/s_cb.c +++ b/deps/openssl/openssl/apps/lib/s_cb.c @@ -240,10 +240,10 @@ static const char *get_sigtype(int nid) return "ECDSA"; case NID_ED25519: - return "Ed25519"; + return "ed25519"; case NID_ED448: - return "Ed448"; + return "ed448"; case NID_id_GostR3410_2001: return "gost2001"; @@ -288,6 +288,26 @@ static int do_print_sigalgs(BIO *out, SSL *s, int shared) SSL_get_sigalgs(s, i, &sign_nid, &hash_nid, NULL, &rsign, &rhash); if (i) BIO_puts(out, ":"); + switch (rsign | rhash << 8) { + case 0x0809: + BIO_puts(out, "rsa_pss_pss_sha256"); + continue; + case 0x080a: + BIO_puts(out, "rsa_pss_pss_sha384"); + continue; + case 0x080b: + BIO_puts(out, "rsa_pss_pss_sha512"); + continue; + case 0x081a: + BIO_puts(out, "ecdsa_brainpoolP256r1_sha256"); + continue; + case 0x081b: + BIO_puts(out, "ecdsa_brainpoolP384r1_sha384"); + continue; + case 0x081c: + BIO_puts(out, "ecdsa_brainpoolP512r1_sha512"); + continue; + } sstr = get_sigtype(sign_nid); if (sstr) BIO_printf(out, "%s", sstr); diff --git a/deps/openssl/openssl/apps/lib/s_socket.c b/deps/openssl/openssl/apps/lib/s_socket.c index 059afe47b90491..8c6020d01692c7 100644 --- a/deps/openssl/openssl/apps/lib/s_socket.c +++ b/deps/openssl/openssl/apps/lib/s_socket.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -380,6 +380,12 @@ int do_server(int *accept_sock, const char *host, const char *port, BIO_closesocket(asock); break; } + + if (naccept != -1) + naccept--; + if (naccept == 0) + BIO_closesocket(asock); + BIO_set_tcp_ndelay(sock, 1); i = (*cb)(sock, type, protocol, context); @@ -410,11 +416,12 @@ int do_server(int *accept_sock, const char *host, const char *port, BIO_closesocket(sock); } else { + if (naccept != -1) + naccept--; + i = (*cb)(asock, type, protocol, context); } - if (naccept != -1) - naccept--; if (i < 0 || naccept == 0) { BIO_closesocket(asock); ret = i; diff --git a/deps/openssl/openssl/apps/lib/vms_term_sock.c b/deps/openssl/openssl/apps/lib/vms_term_sock.c index 97fb3943265c42..1a413376b20b44 100644 --- a/deps/openssl/openssl/apps/lib/vms_term_sock.c +++ b/deps/openssl/openssl/apps/lib/vms_term_sock.c @@ -353,7 +353,7 @@ static int CreateSocketPair (int SocketFamily, /* ** Get the binary (64-bit) time of the specified timeout value */ - sprintf (AscTimeBuff, "0 0:0:%02d.00", SOCKET_PAIR_TIMEOUT_VALUE); + BIO_snprintf(AscTimeBuff, sizeof(AscTimeBuff), "0 0:0:%02d.00", SOCKET_PAIR_TIMEOUT_VALUE); AscTimeDesc.dsc$w_length = strlen (AscTimeBuff); AscTimeDesc.dsc$a_pointer = AscTimeBuff; status = sys$bintim (&AscTimeDesc, BinTimeBuff); @@ -567,10 +567,10 @@ static void LogMessage (char *msg, ...) /* ** Format the message buffer */ - sprintf (MsgBuff, "%02d-%s-%04d %02d:%02d:%02d [%08X] %s\n", - LocTime->tm_mday, Month[LocTime->tm_mon], - (LocTime->tm_year + 1900), LocTime->tm_hour, LocTime->tm_min, - LocTime->tm_sec, pid, msg); + BIO_snprintf(MsgBuff, sizeof(MsgBuff), "%02d-%s-%04d %02d:%02d:%02d [%08X] %s\n", + LocTime->tm_mday, Month[LocTime->tm_mon], + (LocTime->tm_year + 1900), LocTime->tm_hour, LocTime->tm_min, + LocTime->tm_sec, pid, msg); /* ** Get any variable arguments and add them to the print of the message diff --git a/deps/openssl/openssl/apps/passwd.c b/deps/openssl/openssl/apps/passwd.c index 64b2e76c147ae4..31d8bdd87cb6d9 100644 --- a/deps/openssl/openssl/apps/passwd.c +++ b/deps/openssl/openssl/apps/passwd.c @@ -589,7 +589,8 @@ static char *shacrypt(const char *passwd, const char *magic, const char *salt) OPENSSL_strlcat(out_buf, ascii_dollar, sizeof(out_buf)); if (rounds_custom) { char tmp_buf[80]; /* "rounds=999999999" */ - sprintf(tmp_buf, "rounds=%u", rounds); + + BIO_snprintf(tmp_buf, sizeof(tmp_buf), "rounds=%u", rounds); #ifdef CHARSET_EBCDIC /* In case we're really on a ASCII based platform and just pretend */ if (tmp_buf[0] != 0x72) /* ASCII 'r' */ diff --git a/deps/openssl/openssl/apps/pkcs12.c b/deps/openssl/openssl/apps/pkcs12.c index ab78903ee9cdcf..5146699f1672a5 100644 --- a/deps/openssl/openssl/apps/pkcs12.c +++ b/deps/openssl/openssl/apps/pkcs12.c @@ -1,5 +1,5 @@ /* - * Copyright 1999-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1999-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -305,7 +305,8 @@ int pkcs12_main(int argc, char **argv) if (canames == NULL && (canames = sk_OPENSSL_STRING_new_null()) == NULL) goto end; - sk_OPENSSL_STRING_push(canames, opt_arg()); + if (sk_OPENSSL_STRING_push(canames, opt_arg()) <= 0) + goto end; break; case OPT_IN: infile = opt_arg(); diff --git a/deps/openssl/openssl/apps/pkeyutl.c b/deps/openssl/openssl/apps/pkeyutl.c index 3c9f9025a1609d..5e5047137632b6 100644 --- a/deps/openssl/openssl/apps/pkeyutl.c +++ b/deps/openssl/openssl/apps/pkeyutl.c @@ -81,10 +81,11 @@ const OPTIONS pkeyutl_options[] = { OPT_SECTION("Output"), {"out", OPT_OUT, '>', "Output file - default stdout"}, - {"asn1parse", OPT_ASN1PARSE, '-', "asn1parse the output data"}, + {"asn1parse", OPT_ASN1PARSE, '-', + "parse the output as ASN.1 data to check its DER encoding and print errors"}, {"hexdump", OPT_HEXDUMP, '-', "Hex dump output"}, {"verifyrecover", OPT_VERIFYRECOVER, '-', - "Verify with public key, recover original data"}, + "Verify RSA signature, recovering original signature input data"}, OPT_SECTION("Signing/Derivation"), {"digest", OPT_DIGEST, 's', diff --git a/deps/openssl/openssl/apps/rehash.c b/deps/openssl/openssl/apps/rehash.c index 85eee3857942dd..6e0ca3642c4027 100644 --- a/deps/openssl/openssl/apps/rehash.c +++ b/deps/openssl/openssl/apps/rehash.c @@ -559,6 +559,11 @@ int rehash_main(int argc, char **argv) } else if ((env = getenv(X509_get_default_cert_dir_env())) != NULL) { char lsc[2] = { LIST_SEPARATOR_CHAR, '\0' }; m = OPENSSL_strdup(env); + if (m == NULL) { + BIO_puts(bio_err, "out of memory\n"); + errs = 1; + goto end; + } for (e = strtok(m, lsc); e != NULL; e = strtok(NULL, lsc)) errs += do_dir(e, h); OPENSSL_free(m); diff --git a/deps/openssl/openssl/apps/smime.c b/deps/openssl/openssl/apps/smime.c index 651294e46daa92..790a8d06ad0c3d 100644 --- a/deps/openssl/openssl/apps/smime.c +++ b/deps/openssl/openssl/apps/smime.c @@ -1,5 +1,5 @@ /* - * Copyright 1999-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1999-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -279,13 +279,15 @@ int smime_main(int argc, char **argv) if (sksigners == NULL && (sksigners = sk_OPENSSL_STRING_new_null()) == NULL) goto end; - sk_OPENSSL_STRING_push(sksigners, signerfile); + if (sk_OPENSSL_STRING_push(sksigners, signerfile) <= 0) + goto end; if (keyfile == NULL) keyfile = signerfile; if (skkeys == NULL && (skkeys = sk_OPENSSL_STRING_new_null()) == NULL) goto end; - sk_OPENSSL_STRING_push(skkeys, keyfile); + if (sk_OPENSSL_STRING_push(skkeys, keyfile) <= 0) + goto end; keyfile = NULL; } signerfile = opt_arg(); @@ -310,12 +312,14 @@ int smime_main(int argc, char **argv) if (sksigners == NULL && (sksigners = sk_OPENSSL_STRING_new_null()) == NULL) goto end; - sk_OPENSSL_STRING_push(sksigners, signerfile); + if (sk_OPENSSL_STRING_push(sksigners, signerfile) <= 0) + goto end; signerfile = NULL; if (skkeys == NULL && (skkeys = sk_OPENSSL_STRING_new_null()) == NULL) goto end; - sk_OPENSSL_STRING_push(skkeys, keyfile); + if (sk_OPENSSL_STRING_push(skkeys, keyfile) <= 0) + goto end; } keyfile = opt_arg(); break; @@ -390,12 +394,14 @@ int smime_main(int argc, char **argv) if (sksigners == NULL && (sksigners = sk_OPENSSL_STRING_new_null()) == NULL) goto end; - sk_OPENSSL_STRING_push(sksigners, signerfile); + if (sk_OPENSSL_STRING_push(sksigners, signerfile) <= 0) + goto end; if (!skkeys && (skkeys = sk_OPENSSL_STRING_new_null()) == NULL) goto end; if (!keyfile) keyfile = signerfile; - sk_OPENSSL_STRING_push(skkeys, keyfile); + if (sk_OPENSSL_STRING_push(skkeys, keyfile) <= 0) + goto end; } if (sksigners == NULL) { BIO_printf(bio_err, "No signer certificate specified\n"); diff --git a/deps/openssl/openssl/apps/speed.c b/deps/openssl/openssl/apps/speed.c index d8e2c70e6128b5..bafcacf7775ef6 100644 --- a/deps/openssl/openssl/apps/speed.c +++ b/deps/openssl/openssl/apps/speed.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved * * Licensed under the Apache License 2.0 (the "License"). You may not use @@ -456,6 +456,14 @@ static double sm2_results[SM2_NUM][2]; /* 2 ops: sign then verify */ #define COND(unused_cond) (run && count < INT_MAX) #define COUNT(d) (count) +#define TAG_LEN 16 + +static unsigned int mode_op; /* AE Mode of operation */ +static unsigned int aead = 0; /* AEAD flag */ +static unsigned char aead_iv[12]; /* For AEAD modes */ +static unsigned char aad[EVP_AEAD_TLS1_AAD_LEN] = { 0xcc }; +static int aead_ivlen = sizeof(aead_iv); + typedef struct loopargs_st { ASYNC_JOB *inprogress_job; ASYNC_WAIT_CTX *wait_ctx; @@ -464,6 +472,7 @@ typedef struct loopargs_st { unsigned char *buf_malloc; unsigned char *buf2_malloc; unsigned char *key; + unsigned char tag[TAG_LEN]; size_t buflen; size_t sigsize; EVP_PKEY_CTX *rsa_sign_ctx[RSA_NUM]; @@ -727,12 +736,8 @@ static int EVP_Update_loop(void *args) unsigned char *buf = tempargs->buf; EVP_CIPHER_CTX *ctx = tempargs->ctx; int outl, count, rc; - unsigned char faketag[16] = { 0xcc }; if (decrypt) { - if (EVP_CIPHER_get_flags(EVP_CIPHER_CTX_get0_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER) { - (void)EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG, sizeof(faketag), faketag); - } for (count = 0; COND(c[D_EVP][testnum]); count++) { rc = EVP_DecryptUpdate(ctx, buf, &outl, buf, lengths[testnum]); if (rc != 1) { @@ -757,74 +762,159 @@ static int EVP_Update_loop(void *args) } /* + * To make AEAD benchmarking more relevant perform TLS-like operations, + * 13-byte AAD followed by payload. But don't use TLS-formatted AAD, as + * payload length is not actually limited by 16KB... * CCM does not support streaming. For the purpose of performance measurement, * each message is encrypted using the same (key,iv)-pair. Do not use this * code in your application. */ -static int EVP_Update_loop_ccm(void *args) +static int EVP_Update_loop_aead_enc(void *args) { loopargs_t *tempargs = *(loopargs_t **) args; unsigned char *buf = tempargs->buf; + unsigned char *key = tempargs->key; EVP_CIPHER_CTX *ctx = tempargs->ctx; - int outl, count; - unsigned char tag[12]; - - if (decrypt) { - for (count = 0; COND(c[D_EVP][testnum]); count++) { - (void)EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG, sizeof(tag), - tag); - /* reset iv */ - (void)EVP_DecryptInit_ex(ctx, NULL, NULL, NULL, iv); - /* counter is reset on every update */ - (void)EVP_DecryptUpdate(ctx, buf, &outl, buf, lengths[testnum]); + int outl, count, realcount = 0; + + for (count = 0; COND(c[D_EVP][testnum]); count++) { + /* Set length of iv (Doesn't apply to SIV mode) */ + if (mode_op != EVP_CIPH_SIV_MODE) { + if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_IVLEN, + aead_ivlen, NULL)) { + BIO_printf(bio_err, "\nFailed to set iv length\n"); + ERR_print_errors(bio_err); + exit(1); + } } - } else { - for (count = 0; COND(c[D_EVP][testnum]); count++) { - /* restore iv length field */ - (void)EVP_EncryptUpdate(ctx, NULL, &outl, NULL, lengths[testnum]); - /* counter is reset on every update */ - (void)EVP_EncryptUpdate(ctx, buf, &outl, buf, lengths[testnum]); + /* Set tag_len (Not for GCM/SIV at encryption stage) */ + if (mode_op != EVP_CIPH_GCM_MODE + && mode_op != EVP_CIPH_SIV_MODE) { + if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG, + TAG_LEN, NULL)) { + BIO_printf(bio_err, "\nFailed to set tag length\n"); + ERR_print_errors(bio_err); + exit(1); + } + } + if (!EVP_CipherInit_ex(ctx, NULL, NULL, key, aead_iv, -1)) { + BIO_printf(bio_err, "\nFailed to set key and iv\n"); + ERR_print_errors(bio_err); + exit(1); + } + /* Set total length of input. Only required for CCM */ + if (mode_op == EVP_CIPH_CCM_MODE) { + if (!EVP_EncryptUpdate(ctx, NULL, &outl, + NULL, lengths[testnum])) { + BIO_printf(bio_err, "\nCouldn't set input text length\n"); + ERR_print_errors(bio_err); + exit(1); + } } + if (aead) { + if (!EVP_EncryptUpdate(ctx, NULL, &outl, aad, sizeof(aad))) { + BIO_printf(bio_err, "\nCouldn't insert AAD when encrypting\n"); + ERR_print_errors(bio_err); + exit(1); + } + } + if (!EVP_EncryptUpdate(ctx, buf, &outl, buf, lengths[testnum])) { + BIO_printf(bio_err, "\nFailed to encrypt the data\n"); + ERR_print_errors(bio_err); + exit(1); + } + if (EVP_EncryptFinal_ex(ctx, buf, &outl)) + realcount++; } - if (decrypt) - (void)EVP_DecryptFinal_ex(ctx, buf, &outl); - else - (void)EVP_EncryptFinal_ex(ctx, buf, &outl); - return count; + return realcount; } /* * To make AEAD benchmarking more relevant perform TLS-like operations, * 13-byte AAD followed by payload. But don't use TLS-formatted AAD, as * payload length is not actually limited by 16KB... + * CCM does not support streaming. For the purpose of performance measurement, + * each message is decrypted using the same (key,iv)-pair. Do not use this + * code in your application. + * For decryption, we will use buf2 to preserve the input text in buf. */ -static int EVP_Update_loop_aead(void *args) +static int EVP_Update_loop_aead_dec(void *args) { loopargs_t *tempargs = *(loopargs_t **) args; unsigned char *buf = tempargs->buf; + unsigned char *outbuf = tempargs->buf2; + unsigned char *key = tempargs->key; + unsigned char tag[TAG_LEN]; EVP_CIPHER_CTX *ctx = tempargs->ctx; - int outl, count; - unsigned char aad[13] = { 0xcc }; - unsigned char faketag[16] = { 0xcc }; + int outl, count, realcount = 0; + + for (count = 0; COND(c[D_EVP][testnum]); count++) { + /* Set the length of iv (Doesn't apply to SIV mode) */ + if (mode_op != EVP_CIPH_SIV_MODE) { + if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_IVLEN, + aead_ivlen, NULL)) { + BIO_printf(bio_err, "\nFailed to set iv length\n"); + ERR_print_errors(bio_err); + exit(1); + } + } - if (decrypt) { - for (count = 0; COND(c[D_EVP][testnum]); count++) { - (void)EVP_DecryptInit_ex(ctx, NULL, NULL, NULL, iv); - (void)EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG, - sizeof(faketag), faketag); - (void)EVP_DecryptUpdate(ctx, NULL, &outl, aad, sizeof(aad)); - (void)EVP_DecryptUpdate(ctx, buf, &outl, buf, lengths[testnum]); - (void)EVP_DecryptFinal_ex(ctx, buf + outl, &outl); + /* Set the tag length (Doesn't apply to SIV mode) */ + if (mode_op != EVP_CIPH_SIV_MODE + && mode_op != EVP_CIPH_GCM_MODE) { + if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG, + TAG_LEN, NULL)) { + BIO_printf(bio_err, "\nFailed to set tag length\n"); + ERR_print_errors(bio_err); + exit(1); + } } - } else { - for (count = 0; COND(c[D_EVP][testnum]); count++) { - (void)EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, iv); - (void)EVP_EncryptUpdate(ctx, NULL, &outl, aad, sizeof(aad)); - (void)EVP_EncryptUpdate(ctx, buf, &outl, buf, lengths[testnum]); - (void)EVP_EncryptFinal_ex(ctx, buf + outl, &outl); + if (!EVP_CipherInit_ex(ctx, NULL, NULL, key, aead_iv, -1)) { + BIO_printf(bio_err, "\nFailed to set key and iv\n"); + ERR_print_errors(bio_err); + exit(1); + } + /* Set iv before decryption (Doesn't apply to SIV mode) */ + if (mode_op != EVP_CIPH_SIV_MODE) { + if (!EVP_DecryptInit_ex(ctx, NULL, NULL, NULL, aead_iv)) { + BIO_printf(bio_err, "\nFailed to set iv\n"); + ERR_print_errors(bio_err); + exit(1); + } + } + memcpy(tag, tempargs->tag, TAG_LEN); + + if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG, + TAG_LEN, tag)) { + BIO_printf(bio_err, "\nFailed to set tag\n"); + ERR_print_errors(bio_err); + exit(1); + } + /* Set the total length of cipher text. Only required for CCM */ + if (mode_op == EVP_CIPH_CCM_MODE) { + if (!EVP_DecryptUpdate(ctx, NULL, &outl, + NULL, lengths[testnum])) { + BIO_printf(bio_err, "\nCouldn't set cipher text length\n"); + ERR_print_errors(bio_err); + exit(1); + } + } + if (aead) { + if (!EVP_DecryptUpdate(ctx, NULL, &outl, aad, sizeof(aad))) { + BIO_printf(bio_err, "\nCouldn't insert AAD when decrypting\n"); + ERR_print_errors(bio_err); + exit(1); + } + } + if (!EVP_DecryptUpdate(ctx, outbuf, &outl, buf, lengths[testnum])) { + BIO_printf(bio_err, "\nFailed to decrypt the data\n"); + ERR_print_errors(bio_err); + exit(1); } + if (EVP_DecryptFinal_ex(ctx, outbuf, &outl)) + realcount++; } - return count; + return realcount; } static long rsa_c[RSA_NUM][2]; /* # RSA iteration test */ @@ -1370,11 +1460,11 @@ int speed_main(int argc, char **argv) OPTION_CHOICE o; int async_init = 0, multiblock = 0, pr_header = 0; uint8_t doit[ALGOR_NUM] = { 0 }; - int ret = 1, misalign = 0, lengths_single = 0, aead = 0; + int ret = 1, misalign = 0, lengths_single = 0; long count = 0; unsigned int size_num = SIZE_NUM; unsigned int i, k, loopargs_len = 0, async_jobs = 0; - int keylen; + int keylen = 0; int buflen; BIGNUM *bn = NULL; EVP_PKEY_CTX *genctx = NULL; @@ -2001,15 +2091,14 @@ int speed_main(int argc, char **argv) if (doit[D_HMAC]) { static const char hmac_key[] = "This is a key..."; int len = strlen(hmac_key); + size_t hmac_name_len = sizeof("hmac()") + strlen(evp_mac_mdname); OSSL_PARAM params[3]; mac = EVP_MAC_fetch(app_get0_libctx(), "HMAC", app_get0_propq()); if (mac == NULL || evp_mac_mdname == NULL) goto end; - - evp_hmac_name = app_malloc(sizeof("hmac()") + strlen(evp_mac_mdname), - "HMAC name"); - sprintf(evp_hmac_name, "hmac(%s)", evp_mac_mdname); + evp_hmac_name = app_malloc(hmac_name_len, "HMAC name"); + BIO_snprintf(evp_hmac_name, hmac_name_len, "hmac(%s)", evp_mac_mdname); names[D_HMAC] = evp_hmac_name; params[0] = @@ -2213,12 +2302,20 @@ int speed_main(int argc, char **argv) } } + /*- + * There are three scenarios for D_EVP: + * 1- Using authenticated encryption (AE) e.g. CCM, GCM, OCB etc. + * 2- Using AE + associated data (AD) i.e. AEAD using CCM, GCM, OCB etc. + * 3- Not using AE or AD e.g. ECB, CBC, CFB etc. + */ if (doit[D_EVP]) { if (evp_cipher != NULL) { - int (*loopfunc) (void *) = EVP_Update_loop; + int (*loopfunc) (void *); + int outlen = 0; + unsigned int ae_mode = 0; - if (multiblock && (EVP_CIPHER_get_flags(evp_cipher) & - EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK)) { + if (multiblock && (EVP_CIPHER_get_flags(evp_cipher) + & EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK)) { multiblock_speed(evp_cipher, lengths_single, &seconds); ret = 0; goto end; @@ -2226,16 +2323,26 @@ int speed_main(int argc, char **argv) names[D_EVP] = EVP_CIPHER_get0_name(evp_cipher); - if (EVP_CIPHER_get_mode(evp_cipher) == EVP_CIPH_CCM_MODE) { - loopfunc = EVP_Update_loop_ccm; - } else if (aead && (EVP_CIPHER_get_flags(evp_cipher) & - EVP_CIPH_FLAG_AEAD_CIPHER)) { - loopfunc = EVP_Update_loop_aead; + mode_op = EVP_CIPHER_get_mode(evp_cipher); + + if (aead) { if (lengths == lengths_list) { lengths = aead_lengths_list; size_num = OSSL_NELEM(aead_lengths_list); } } + if (mode_op == EVP_CIPH_GCM_MODE + || mode_op == EVP_CIPH_CCM_MODE + || mode_op == EVP_CIPH_OCB_MODE + || mode_op == EVP_CIPH_SIV_MODE) { + ae_mode = 1; + if (decrypt) + loopfunc = EVP_Update_loop_aead_dec; + else + loopfunc = EVP_Update_loop_aead_enc; + } else { + loopfunc = EVP_Update_loop; + } for (testnum = 0; testnum < size_num; testnum++) { print_message(names[D_EVP], c[D_EVP][testnum], lengths[testnum], @@ -2247,37 +2354,144 @@ int speed_main(int argc, char **argv) BIO_printf(bio_err, "\nEVP_CIPHER_CTX_new failure\n"); exit(1); } - if (!EVP_CipherInit_ex(loopargs[k].ctx, evp_cipher, NULL, - NULL, iv, decrypt ? 0 : 1)) { - BIO_printf(bio_err, "\nEVP_CipherInit_ex failure\n"); + + /* + * For AE modes, we must first encrypt the data to get + * a valid tag that enables us to decrypt. If we don't + * encrypt first, we won't have a valid tag that enables + * authenticity and hence decryption will fail. + */ + if (!EVP_CipherInit_ex(loopargs[k].ctx, + evp_cipher, NULL, NULL, NULL, + ae_mode ? 1 : !decrypt)) { + BIO_printf(bio_err, "\nCouldn't init the context\n"); ERR_print_errors(bio_err); exit(1); } + /* Padding isn't needed */ EVP_CIPHER_CTX_set_padding(loopargs[k].ctx, 0); keylen = EVP_CIPHER_CTX_get_key_length(loopargs[k].ctx); loopargs[k].key = app_malloc(keylen, "evp_cipher key"); EVP_CIPHER_CTX_rand_key(loopargs[k].ctx, loopargs[k].key); - if (!EVP_CipherInit_ex(loopargs[k].ctx, NULL, NULL, - loopargs[k].key, NULL, -1)) { - BIO_printf(bio_err, "\nEVP_CipherInit_ex failure\n"); - ERR_print_errors(bio_err); - exit(1); - } - OPENSSL_clear_free(loopargs[k].key, keylen); - /* SIV mode only allows for a single Update operation */ - if (EVP_CIPHER_get_mode(evp_cipher) == EVP_CIPH_SIV_MODE) - (void)EVP_CIPHER_CTX_ctrl(loopargs[k].ctx, - EVP_CTRL_SET_SPEED, 1, NULL); + if (!ae_mode) { + if (!EVP_CipherInit_ex(loopargs[k].ctx, NULL, NULL, + loopargs[k].key, iv, -1)) { + BIO_printf(bio_err, "\nFailed to set the key\n"); + ERR_print_errors(bio_err); + exit(1); + } + } else if (mode_op == EVP_CIPH_SIV_MODE) { + EVP_CIPHER_CTX_ctrl(loopargs[k].ctx, + EVP_CTRL_SET_SPEED, 1, NULL); + } + if (ae_mode && decrypt) { + /* Set length of iv (Doesn't apply to SIV mode) */ + if (mode_op != EVP_CIPH_SIV_MODE) { + if (!EVP_CIPHER_CTX_ctrl(loopargs[k].ctx, + EVP_CTRL_AEAD_SET_IVLEN, + aead_ivlen, NULL)) { + BIO_printf(bio_err, "\nFailed to set iv length\n"); + ERR_print_errors(bio_err); + exit(1); + } + } + /* Set tag_len (Not for SIV at encryption stage) */ + if (mode_op != EVP_CIPH_GCM_MODE + && mode_op != EVP_CIPH_SIV_MODE) { + if (!EVP_CIPHER_CTX_ctrl(loopargs[k].ctx, + EVP_CTRL_AEAD_SET_TAG, + TAG_LEN, NULL)) { + BIO_printf(bio_err, + "\nFailed to set tag length\n"); + ERR_print_errors(bio_err); + exit(1); + } + } + if (!EVP_CipherInit_ex(loopargs[k].ctx, NULL, NULL, + loopargs[k].key, aead_iv, -1)) { + BIO_printf(bio_err, "\nFailed to set the key\n"); + ERR_print_errors(bio_err); + exit(1); + } + /* Set total length of input. Only required for CCM */ + if (mode_op == EVP_CIPH_CCM_MODE) { + if (!EVP_EncryptUpdate(loopargs[k].ctx, NULL, + &outlen, NULL, + lengths[testnum])) { + BIO_printf(bio_err, + "\nCouldn't set input text length\n"); + ERR_print_errors(bio_err); + exit(1); + } + } + if (aead) { + if (!EVP_EncryptUpdate(loopargs[k].ctx, NULL, + &outlen, aad, sizeof(aad))) { + BIO_printf(bio_err, + "\nCouldn't insert AAD when encrypting\n"); + ERR_print_errors(bio_err); + exit(1); + } + } + if (!EVP_EncryptUpdate(loopargs[k].ctx, loopargs[k].buf, + &outlen, loopargs[k].buf, + lengths[testnum])) { + BIO_printf(bio_err, + "\nFailed to to encrypt the data\n"); + ERR_print_errors(bio_err); + exit(1); + } + + if (!EVP_EncryptFinal_ex(loopargs[k].ctx, + loopargs[k].buf, &outlen)) { + BIO_printf(bio_err, + "\nFailed finalize the encryption\n"); + ERR_print_errors(bio_err); + exit(1); + } + + if (!EVP_CIPHER_CTX_ctrl(loopargs[k].ctx, + EVP_CTRL_AEAD_GET_TAG, + TAG_LEN, &loopargs[k].tag)) { + BIO_printf(bio_err, "\nFailed to get the tag\n"); + ERR_print_errors(bio_err); + exit(1); + } + + EVP_CIPHER_CTX_free(loopargs[k].ctx); + loopargs[k].ctx = EVP_CIPHER_CTX_new(); + if (loopargs[k].ctx == NULL) { + BIO_printf(bio_err, + "\nEVP_CIPHER_CTX_new failure\n"); + exit(1); + } + if (!EVP_CipherInit_ex(loopargs[k].ctx, evp_cipher, + NULL, NULL, NULL, 0)) { + BIO_printf(bio_err, + "\nFailed initializing the context\n"); + ERR_print_errors(bio_err); + exit(1); + } + + EVP_CIPHER_CTX_set_padding(loopargs[k].ctx, 0); + + /* SIV only allows for one Update operation */ + if (mode_op == EVP_CIPH_SIV_MODE) + EVP_CIPHER_CTX_ctrl(loopargs[k].ctx, + EVP_CTRL_SET_SPEED, 1, NULL); + } } Time_F(START); count = run_benchmark(async_jobs, loopfunc, loopargs); d = Time_F(STOP); - for (k = 0; k < loopargs_len; k++) + for (k = 0; k < loopargs_len; k++) { + OPENSSL_clear_free(loopargs[k].key, keylen); EVP_CIPHER_CTX_free(loopargs[k].ctx); + } print_result(D_EVP, testnum, count, d); } } else if (evp_md_name != NULL) { @@ -2297,6 +2511,7 @@ int speed_main(int argc, char **argv) } if (doit[D_EVP_CMAC]) { + size_t len = sizeof("cmac()") + strlen(evp_mac_ciphername); OSSL_PARAM params[3]; EVP_CIPHER *cipher = NULL; @@ -2312,9 +2527,8 @@ int speed_main(int argc, char **argv) BIO_printf(bio_err, "\nRequested CMAC cipher with unsupported key length.\n"); goto end; } - evp_cmac_name = app_malloc(sizeof("cmac()") - + strlen(evp_mac_ciphername), "CMAC name"); - sprintf(evp_cmac_name, "cmac(%s)", evp_mac_ciphername); + evp_cmac_name = app_malloc(len, "CMAC name"); + BIO_snprintf(evp_cmac_name, len, "cmac(%s)", evp_mac_ciphername); names[D_EVP_CMAC] = evp_cmac_name; params[0] = OSSL_PARAM_construct_utf8_string(OSSL_ALG_PARAM_CIPHER, @@ -3675,7 +3889,6 @@ static void multiblock_speed(const EVP_CIPHER *evp_cipher, int lengths_single, print_message(alg_name, 0, mblengths[j], seconds->sym); Time_F(START); for (count = 0; run && count < INT_MAX; count++) { - unsigned char aad[EVP_AEAD_TLS1_AAD_LEN]; EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM mb_param; size_t len = mblengths[j]; int packlen; diff --git a/deps/openssl/openssl/configdata.pm.in b/deps/openssl/openssl/configdata.pm.in index 04b901144f4779..a4ae907299953f 100644 --- a/deps/openssl/openssl/configdata.pm.in +++ b/deps/openssl/openssl/configdata.pm.in @@ -145,7 +145,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close BUILDFILE; rename("$buildfile.new", $buildfile) or die "Trying to rename $buildfile.new to $buildfile: $!"; @@ -167,7 +167,7 @@ _____ # defined in one template stick around for the # next, making them combinable PACKAGE => 'OpenSSL::safe') - or die $Text::Template::ERROR; + or die $OpenSSL::Template::ERROR; close CONFIGURATION_H; # When using stat() on Windows, we can get it to perform better by diff --git a/deps/openssl/openssl/crypto/asn1/a_bitstr.c b/deps/openssl/openssl/crypto/asn1/a_bitstr.c index 4930d5022ee393..549c0e88554978 100644 --- a/deps/openssl/openssl/crypto/asn1/a_bitstr.c +++ b/deps/openssl/openssl/crypto/asn1/a_bitstr.c @@ -36,25 +36,30 @@ int ossl_i2c_ASN1_BIT_STRING(ASN1_BIT_STRING *a, unsigned char **pp) if (a->data[len - 1]) break; } - j = a->data[len - 1]; - if (j & 0x01) + + if (len == 0) { bits = 0; - else if (j & 0x02) - bits = 1; - else if (j & 0x04) - bits = 2; - else if (j & 0x08) - bits = 3; - else if (j & 0x10) - bits = 4; - else if (j & 0x20) - bits = 5; - else if (j & 0x40) - bits = 6; - else if (j & 0x80) - bits = 7; - else - bits = 0; /* should not happen */ + } else { + j = a->data[len - 1]; + if (j & 0x01) + bits = 0; + else if (j & 0x02) + bits = 1; + else if (j & 0x04) + bits = 2; + else if (j & 0x08) + bits = 3; + else if (j & 0x10) + bits = 4; + else if (j & 0x20) + bits = 5; + else if (j & 0x40) + bits = 6; + else if (j & 0x80) + bits = 7; + else + bits = 0; /* should not happen */ + } } } else bits = 0; diff --git a/deps/openssl/openssl/crypto/asn1/a_strnid.c b/deps/openssl/openssl/crypto/asn1/a_strnid.c index d052935661d362..20cfabc8a7a41c 100644 --- a/deps/openssl/openssl/crypto/asn1/a_strnid.c +++ b/deps/openssl/openssl/crypto/asn1/a_strnid.c @@ -1,5 +1,5 @@ /* - * Copyright 1999-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1999-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -39,10 +39,10 @@ unsigned long ASN1_STRING_get_default_mask(void) * This function sets the default to various "flavours" of configuration. * based on an ASCII string. Currently this is: * MASK:XXXX : a numerical mask value. - * nobmp : Don't use BMPStrings (just Printable, T61). - * pkix : PKIX recommendation in RFC2459. - * utf8only : only use UTF8Strings (RFC2459 recommendation for 2004). - * default: the default value, Printable, T61, BMP. + * default : use Printable, IA5, T61, BMP, and UTF8 string types + * nombstr : any string type except variable-sized BMPStrings or UTF8Strings + * pkix : PKIX recommendation in RFC2459 + * utf8only : this is the default, use UTF8Strings */ int ASN1_STRING_set_default_mask_asc(const char *p) diff --git a/deps/openssl/openssl/crypto/asn1/a_time.c b/deps/openssl/openssl/crypto/asn1/a_time.c index 9b3074e47e84a5..5ef6d0d1cd1c64 100644 --- a/deps/openssl/openssl/crypto/asn1/a_time.c +++ b/deps/openssl/openssl/crypto/asn1/a_time.c @@ -1,5 +1,5 @@ /* - * Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1999-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -488,9 +488,9 @@ int ASN1_TIME_print_ex(BIO *bp, const ASN1_TIME *tm, unsigned long flags) int ossl_asn1_time_print_ex(BIO *bp, const ASN1_TIME *tm, unsigned long flags) { char *v; - int gmt = 0, l; + int l; struct tm stm; - const char upper_z = 0x5A, period = 0x2E; + const char period = 0x2E; /* ossl_asn1_time_to_tm will check the time type */ if (!ossl_asn1_time_to_tm(&stm, tm)) @@ -498,8 +498,6 @@ int ossl_asn1_time_print_ex(BIO *bp, const ASN1_TIME *tm, unsigned long flags) l = tm->length; v = (char *)tm->data; - if (v[l - 1] == upper_z) - gmt = 1; if (tm->type == V_ASN1_GENERALIZEDTIME) { char *f = NULL; @@ -510,39 +508,36 @@ int ossl_asn1_time_print_ex(BIO *bp, const ASN1_TIME *tm, unsigned long flags) * 'fraction point' in a GeneralizedTime string. */ if (tm->length > 15 && v[14] == period) { - f = &v[14]; - f_len = 1; - while (14 + f_len < l && ossl_ascii_isdigit(f[f_len])) + /* exclude the . itself */ + f = &v[15]; + f_len = 0; + while (15 + f_len < l && ossl_ascii_isdigit(f[f_len])) ++f_len; } - if ((flags & ASN1_DTFLGS_TYPE_MASK) == ASN1_DTFLGS_ISO8601) { - return BIO_printf(bp, "%4d-%02d-%02d %02d:%02d:%02d%.*s%s", - stm.tm_year + 1900, stm.tm_mon + 1, - stm.tm_mday, stm.tm_hour, - stm.tm_min, stm.tm_sec, f_len, f, - (gmt ? "Z" : "")) > 0; - } - else { - return BIO_printf(bp, "%s %2d %02d:%02d:%02d%.*s %d%s", - _asn1_mon[stm.tm_mon], stm.tm_mday, stm.tm_hour, - stm.tm_min, stm.tm_sec, f_len, f, stm.tm_year + 1900, - (gmt ? " GMT" : "")) > 0; + if (f_len > 0) { + if ((flags & ASN1_DTFLGS_TYPE_MASK) == ASN1_DTFLGS_ISO8601) { + return BIO_printf(bp, "%4d-%02d-%02d %02d:%02d:%02d.%.*sZ", + stm.tm_year + 1900, stm.tm_mon + 1, + stm.tm_mday, stm.tm_hour, + stm.tm_min, stm.tm_sec, f_len, f) > 0; + } else { + return BIO_printf(bp, "%s %2d %02d:%02d:%02d.%.*s %d GMT", + _asn1_mon[stm.tm_mon], stm.tm_mday, stm.tm_hour, + stm.tm_min, stm.tm_sec, f_len, f, + stm.tm_year + 1900) > 0; + } } - } else { - if ((flags & ASN1_DTFLGS_TYPE_MASK) == ASN1_DTFLGS_ISO8601) { - return BIO_printf(bp, "%4d-%02d-%02d %02d:%02d:%02d%s", + } + if ((flags & ASN1_DTFLGS_TYPE_MASK) == ASN1_DTFLGS_ISO8601) { + return BIO_printf(bp, "%4d-%02d-%02d %02d:%02d:%02dZ", stm.tm_year + 1900, stm.tm_mon + 1, stm.tm_mday, stm.tm_hour, - stm.tm_min, stm.tm_sec, - (gmt ? "Z" : "")) > 0; - } - else { - return BIO_printf(bp, "%s %2d %02d:%02d:%02d %d%s", + stm.tm_min, stm.tm_sec) > 0; + } else { + return BIO_printf(bp, "%s %2d %02d:%02d:%02d %d GMT", _asn1_mon[stm.tm_mon], stm.tm_mday, stm.tm_hour, - stm.tm_min, stm.tm_sec, stm.tm_year + 1900, - (gmt ? " GMT" : "")) > 0; - } + stm.tm_min, stm.tm_sec, stm.tm_year + 1900) > 0; } } diff --git a/deps/openssl/openssl/crypto/asn1/asn1_gen.c b/deps/openssl/openssl/crypto/asn1/asn1_gen.c index 402ab34e6a46f7..152dc870a5580b 100644 --- a/deps/openssl/openssl/crypto/asn1/asn1_gen.c +++ b/deps/openssl/openssl/crypto/asn1/asn1_gen.c @@ -1,5 +1,5 @@ /* - * Copyright 2002-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2002-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -498,7 +498,8 @@ static int append_exp(tag_exp_arg *arg, int exp_tag, int exp_class, static int asn1_str2tag(const char *tagstr, int len) { unsigned int i; - static const struct tag_name_st *tntmp, tnst[] = { + const struct tag_name_st *tntmp; + static const struct tag_name_st tnst[] = { ASN1_GEN_STR("BOOL", V_ASN1_BOOLEAN), ASN1_GEN_STR("BOOLEAN", V_ASN1_BOOLEAN), ASN1_GEN_STR("NULL", V_ASN1_NULL), diff --git a/deps/openssl/openssl/crypto/asn1/asn_mime.c b/deps/openssl/openssl/crypto/asn1/asn_mime.c index 9fc52d0476264a..8bb7089292d0f3 100644 --- a/deps/openssl/openssl/crypto/asn1/asn_mime.c +++ b/deps/openssl/openssl/crypto/asn1/asn_mime.c @@ -300,6 +300,8 @@ int SMIME_write_ASN1_ex(BIO *bio, ASN1_VALUE *val, BIO *data, int flags, if (ctype_nid == NID_pkcs7_enveloped) { msg_type = "enveloped-data"; + } else if (ctype_nid == NID_id_smime_ct_authEnvelopedData) { + msg_type = "authEnveloped-data"; } else if (ctype_nid == NID_pkcs7_signed) { if (econt_nid == NID_id_smime_ct_receipt) msg_type = "signed-receipt"; diff --git a/deps/openssl/openssl/crypto/bio/bio_addr.c b/deps/openssl/openssl/crypto/bio/bio_addr.c index 04d62f45b198ef..d462f424d3a406 100644 --- a/deps/openssl/openssl/crypto/bio/bio_addr.c +++ b/deps/openssl/openssl/crypto/bio/bio_addr.c @@ -1,5 +1,5 @@ /* - * Copyright 2016-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -547,8 +547,13 @@ int BIO_parse_hostserv(const char *hostserv, char **host, char **service, *service = NULL; } else { *service = OPENSSL_strndup(p, pl); - if (*service == NULL) + if (*service == NULL) { + if (h != NULL && host != NULL) { + OPENSSL_free(*host); + *host = NULL; + } goto memerr; + } } } diff --git a/deps/openssl/openssl/crypto/bio/bio_sock.c b/deps/openssl/openssl/crypto/bio/bio_sock.c index 12e6a68e3a25d8..84496de6f6bda4 100644 --- a/deps/openssl/openssl/crypto/bio/bio_sock.c +++ b/deps/openssl/openssl/crypto/bio/bio_sock.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -222,7 +222,7 @@ int BIO_get_accept_socket(char *host, int bind_mode) return INVALID_SOCKET; if (BIO_sock_init() != 1) - return INVALID_SOCKET; + goto err; if (BIO_lookup(h, p, BIO_LOOKUP_SERVER, AF_UNSPEC, SOCK_STREAM, &res) != 0) goto err; diff --git a/deps/openssl/openssl/crypto/bio/bss_log.c b/deps/openssl/openssl/crypto/bio/bss_log.c index 82abfd5cec6305..63b30e300fec49 100644 --- a/deps/openssl/openssl/crypto/bio/bss_log.c +++ b/deps/openssl/openssl/crypto/bio/bss_log.c @@ -281,7 +281,7 @@ static void xsyslog(BIO *bp, int priority, const char *string) break; } - sprintf(pidbuf, "[%lu] ", GetCurrentProcessId()); + BIO_snprintf(pidbuf, sizeof(pidbuf), "[%lu] ", GetCurrentProcessId()); lpszStrings[0] = pidbuf; lpszStrings[1] = string; diff --git a/deps/openssl/openssl/crypto/bn/asm/armv8-mont.pl b/deps/openssl/openssl/crypto/bn/asm/armv8-mont.pl index 54d2e8245f15a8..3192eab3092a7b 100755 --- a/deps/openssl/openssl/crypto/bn/asm/armv8-mont.pl +++ b/deps/openssl/openssl/crypto/bn/asm/armv8-mont.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2015-2021 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2015-2025 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the Apache License 2.0 (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -84,10 +84,12 @@ cmp $num,#32 b.le .Lscalar_impl #ifndef __KERNEL__ +#ifndef __AARCH64EB__ adrp x17,OPENSSL_armv8_rsa_neonized ldr w17,[x17,#:lo12:OPENSSL_armv8_rsa_neonized] cbnz w17, bn_mul8x_mont_neon #endif +#endif .Lscalar_impl: tst $num,#7 diff --git a/deps/openssl/openssl/crypto/bn/bn_exp.c b/deps/openssl/openssl/crypto/bn/bn_exp.c index 598a592ca13972..0e563ad823c728 100644 --- a/deps/openssl/openssl/crypto/bn/bn_exp.c +++ b/deps/openssl/openssl/crypto/bn/bn_exp.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -606,7 +606,7 @@ static int MOD_EXP_CTIME_COPY_FROM_PREBUF(BIGNUM *b, int top, * out by Colin Percival, * http://www.daemonology.net/hyperthreading-considered-harmful/) */ -int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, +int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *in_mont) { @@ -623,10 +623,6 @@ int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, unsigned int t4 = 0; #endif - bn_check_top(a); - bn_check_top(p); - bn_check_top(m); - if (!BN_is_odd(m)) { ERR_raise(ERR_LIB_BN, BN_R_CALLED_WITH_EVEN_MODULUS); return 0; @@ -1146,7 +1142,7 @@ int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, goto err; } else #endif - if (!BN_from_montgomery(rr, &tmp, mont, ctx)) + if (!bn_from_mont_fixed_top(rr, &tmp, mont, ctx)) goto err; ret = 1; err: @@ -1160,6 +1156,19 @@ int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, return ret; } +int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, + const BIGNUM *m, BN_CTX *ctx, + BN_MONT_CTX *in_mont) +{ + bn_check_top(a); + bn_check_top(p); + bn_check_top(m); + if (!bn_mod_exp_mont_fixed_top(rr, a, p, m, ctx, in_mont)) + return 0; + bn_correct_top(rr); + return 1; +} + int BN_mod_exp_mont_word(BIGNUM *rr, BN_ULONG a, const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *in_mont) { diff --git a/deps/openssl/openssl/crypto/bn/bn_gf2m.c b/deps/openssl/openssl/crypto/bn/bn_gf2m.c index c811ae82d6b15a..bcc66613cc14d7 100644 --- a/deps/openssl/openssl/crypto/bn/bn_gf2m.c +++ b/deps/openssl/openssl/crypto/bn/bn_gf2m.c @@ -15,6 +15,7 @@ #include "bn_local.h" #ifndef OPENSSL_NO_EC2M +# include /* * Maximum number of iterations before BN_GF2m_mod_solve_quad_arr should @@ -1140,16 +1141,26 @@ int BN_GF2m_mod_solve_quad(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, /* * Convert the bit-string representation of a polynomial ( \sum_{i=0}^n a_i * * x^i) into an array of integers corresponding to the bits with non-zero - * coefficient. Array is terminated with -1. Up to max elements of the array - * will be filled. Return value is total number of array elements that would - * be filled if array was large enough. + * coefficient. The array is intended to be suitable for use with + * `BN_GF2m_mod_arr()`, and so the constant term of the polynomial must not be + * zero. This translates to a requirement that the input BIGNUM `a` is odd. + * + * Given sufficient room, the array is terminated with -1. Up to max elements + * of the array will be filled. + * + * The return value is total number of array elements that would be filled if + * array was large enough, including the terminating `-1`. It is `0` when `a` + * is not odd or the constant term is zero contrary to requirement. + * + * The return value is also `0` when the leading exponent exceeds + * `OPENSSL_ECC_MAX_FIELD_BITS`, this guards against CPU exhaustion attacks, */ int BN_GF2m_poly2arr(const BIGNUM *a, int p[], int max) { int i, j, k = 0; BN_ULONG mask; - if (BN_is_zero(a)) + if (!BN_is_odd(a)) return 0; for (i = a->top - 1; i >= 0; i--) { @@ -1167,12 +1178,13 @@ int BN_GF2m_poly2arr(const BIGNUM *a, int p[], int max) } } - if (k < max) { + if (k > 0 && p[0] > OPENSSL_ECC_MAX_FIELD_BITS) + return 0; + + if (k < max) p[k] = -1; - k++; - } - return k; + return k + 1; } /* diff --git a/deps/openssl/openssl/crypto/bn/rsaz_exp_x2.c b/deps/openssl/openssl/crypto/bn/rsaz_exp_x2.c index b19050dfee8c86..4a2a6752f672ed 100644 --- a/deps/openssl/openssl/crypto/bn/rsaz_exp_x2.c +++ b/deps/openssl/openssl/crypto/bn/rsaz_exp_x2.c @@ -1,5 +1,5 @@ /* - * Copyright 2020-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2020-2025 The OpenSSL Project Authors. All Rights Reserved. * Copyright (c) 2020, Intel Corporation. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use @@ -495,11 +495,7 @@ static void to_words52(BN_ULONG *out, int out_len, out_len--; } - while (out_len > 0) { - *out = 0; - out_len--; - out++; - } + memset(out, 0, out_len * sizeof(BN_ULONG)); } static ossl_inline void put_digit52(uint8_t *pStr, int strLen, uint64_t digit) diff --git a/deps/openssl/openssl/crypto/cmp/cmp_client.c b/deps/openssl/openssl/crypto/cmp/cmp_client.c index df334cc0019822..4c8dbfdcd739ad 100644 --- a/deps/openssl/openssl/crypto/cmp/cmp_client.c +++ b/deps/openssl/openssl/crypto/cmp/cmp_client.c @@ -107,9 +107,12 @@ static int save_statusInfo(OSSL_CMP_CTX *ctx, OSSL_CMP_PKISI *si) ss = si->statusString; /* may be NULL */ for (i = 0; i < sk_ASN1_UTF8STRING_num(ss); i++) { ASN1_UTF8STRING *str = sk_ASN1_UTF8STRING_value(ss, i); + ASN1_UTF8STRING *dup = ASN1_STRING_dup(str); - if (!sk_ASN1_UTF8STRING_push(ctx->statusString, ASN1_STRING_dup(str))) + if (dup == NULL || !sk_ASN1_UTF8STRING_push(ctx->statusString, dup)) { + ASN1_UTF8STRING_free(dup); return 0; + } } return 1; } diff --git a/deps/openssl/openssl/crypto/cms/cms_asn1.c b/deps/openssl/openssl/crypto/cms/cms_asn1.c index 72cd14317d47ea..95095201592323 100644 --- a/deps/openssl/openssl/crypto/cms/cms_asn1.c +++ b/deps/openssl/openssl/crypto/cms/cms_asn1.c @@ -51,6 +51,7 @@ static int cms_si_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, EVP_PKEY_free(si->pkey); X509_free(si->signer); EVP_MD_CTX_free(si->mctx); + EVP_PKEY_CTX_free(si->pctx); } return 1; } @@ -89,11 +90,21 @@ ASN1_SEQUENCE(CMS_OriginatorInfo) = { ASN1_IMP_SET_OF_OPT(CMS_OriginatorInfo, crls, CMS_RevocationInfoChoice, 1) } static_ASN1_SEQUENCE_END(CMS_OriginatorInfo) -ASN1_NDEF_SEQUENCE(CMS_EncryptedContentInfo) = { +static int cms_ec_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, + void *exarg) +{ + CMS_EncryptedContentInfo *ec = (CMS_EncryptedContentInfo *)*pval; + + if (operation == ASN1_OP_FREE_POST) + OPENSSL_clear_free(ec->key, ec->keylen); + return 1; +} + +ASN1_NDEF_SEQUENCE_cb(CMS_EncryptedContentInfo, cms_ec_cb) = { ASN1_SIMPLE(CMS_EncryptedContentInfo, contentType, ASN1_OBJECT), ASN1_SIMPLE(CMS_EncryptedContentInfo, contentEncryptionAlgorithm, X509_ALGOR), ASN1_IMP_OPT(CMS_EncryptedContentInfo, encryptedContent, ASN1_OCTET_STRING_NDEF, 0) -} static_ASN1_NDEF_SEQUENCE_END(CMS_EncryptedContentInfo) +} ASN1_NDEF_SEQUENCE_END_cb(CMS_EncryptedContentInfo, CMS_EncryptedContentInfo) ASN1_SEQUENCE(CMS_KeyTransRecipientInfo) = { ASN1_EMBED(CMS_KeyTransRecipientInfo, version, INT32), @@ -317,6 +328,10 @@ static int cms_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, return 0; break; + case ASN1_OP_FREE_POST: + OPENSSL_free(cms->ctx.propq); + break; + } return 1; } diff --git a/deps/openssl/openssl/crypto/cms/cms_dh.c b/deps/openssl/openssl/crypto/cms/cms_dh.c index 2f54ed2673a988..3f931d6e6fef32 100644 --- a/deps/openssl/openssl/crypto/cms/cms_dh.c +++ b/deps/openssl/openssl/crypto/cms/cms_dh.c @@ -34,7 +34,7 @@ static int dh_cms_set_peerkey(EVP_PKEY_CTX *pctx, if (OBJ_obj2nid(aoid) != NID_dhpublicnumber) goto err; /* Only absent parameters allowed in RFC XXXX */ - if (atype != V_ASN1_UNDEF && atype == V_ASN1_NULL) + if (atype != V_ASN1_UNDEF && atype != V_ASN1_NULL) goto err; pk = EVP_PKEY_CTX_get0_pkey(pctx); diff --git a/deps/openssl/openssl/crypto/cms/cms_env.c b/deps/openssl/openssl/crypto/cms/cms_env.c index 99cf1dcb396ca5..445a16fb771f27 100644 --- a/deps/openssl/openssl/crypto/cms/cms_env.c +++ b/deps/openssl/openssl/crypto/cms/cms_env.c @@ -51,15 +51,6 @@ static int cms_get_enveloped_type(const CMS_ContentInfo *cms) return ret; } -void ossl_cms_env_enc_content_free(const CMS_ContentInfo *cinf) -{ - if (cms_get_enveloped_type_simple(cinf) != 0) { - CMS_EncryptedContentInfo *ec = ossl_cms_get0_env_enc_content(cinf); - if (ec != NULL) - OPENSSL_clear_free(ec->key, ec->keylen); - } -} - CMS_EnvelopedData *ossl_cms_get0_enveloped(CMS_ContentInfo *cms) { if (OBJ_obj2nid(cms->contentType) != NID_pkcs7_enveloped) { diff --git a/deps/openssl/openssl/crypto/cms/cms_err.c b/deps/openssl/openssl/crypto/cms/cms_err.c index 4bd6a0dc1bf101..e67d783be29078 100644 --- a/deps/openssl/openssl/crypto/cms/cms_err.c +++ b/deps/openssl/openssl/crypto/cms/cms_err.c @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -20,77 +20,79 @@ static const ERR_STRING_DATA CMS_str_reasons[] = { {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_ADD_SIGNER_ERROR), "add signer error"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_ATTRIBUTE_ERROR), "attribute error"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CERTIFICATE_ALREADY_PRESENT), - "certificate already present"}, + "certificate already present"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CERTIFICATE_HAS_NO_KEYID), - "certificate has no keyid"}, + "certificate has no keyid"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CERTIFICATE_VERIFY_ERROR), - "certificate verify error"}, + "certificate verify error"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CIPHER_AEAD_SET_TAG_ERROR), - "cipher aead set tag error"}, + "cipher aead set tag error"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CIPHER_GET_TAG), "cipher get tag"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CIPHER_INITIALISATION_ERROR), - "cipher initialisation error"}, + "cipher initialisation error"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CIPHER_PARAMETER_INITIALISATION_ERROR), - "cipher parameter initialisation error"}, + "cipher parameter initialisation error"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CMS_DATAFINAL_ERROR), - "cms datafinal error"}, + "cms datafinal error"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CMS_LIB), "cms lib"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CONTENTIDENTIFIER_MISMATCH), - "contentidentifier mismatch"}, + "contentidentifier mismatch"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CONTENT_NOT_FOUND), "content not found"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CONTENT_TYPE_MISMATCH), - "content type mismatch"}, + "content type mismatch"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CONTENT_TYPE_NOT_COMPRESSED_DATA), - "content type not compressed data"}, + "content type not compressed data"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CONTENT_TYPE_NOT_ENVELOPED_DATA), - "content type not enveloped data"}, + "content type not enveloped data"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CONTENT_TYPE_NOT_SIGNED_DATA), - "content type not signed data"}, + "content type not signed data"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CONTENT_VERIFY_ERROR), - "content verify error"}, + "content verify error"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CTRL_ERROR), "ctrl error"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CTRL_FAILURE), "ctrl failure"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_DECODE_ERROR), "decode error"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_DECRYPT_ERROR), "decrypt error"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_ERROR_GETTING_PUBLIC_KEY), - "error getting public key"}, + "error getting public key"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_ERROR_READING_MESSAGEDIGEST_ATTRIBUTE), - "error reading messagedigest attribute"}, + "error reading messagedigest attribute"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_ERROR_SETTING_KEY), "error setting key"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_ERROR_SETTING_RECIPIENTINFO), - "error setting recipientinfo"}, + "error setting recipientinfo"}, + {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_ERROR_UNSUPPORTED_STATIC_KEY_AGREEMENT), + "error unsupported static key agreement"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_ESS_SIGNING_CERTID_MISMATCH_ERROR), - "ess signing certid mismatch error"}, + "ess signing certid mismatch error"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_INVALID_ENCRYPTED_KEY_LENGTH), - "invalid encrypted key length"}, + "invalid encrypted key length"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_INVALID_KEY_ENCRYPTION_PARAMETER), - "invalid key encryption parameter"}, + "invalid key encryption parameter"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_INVALID_KEY_LENGTH), "invalid key length"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_INVALID_LABEL), "invalid label"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_INVALID_OAEP_PARAMETERS), - "invalid oaep parameters"}, + "invalid oaep parameters"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_KDF_PARAMETER_ERROR), - "kdf parameter error"}, + "kdf parameter error"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_MD_BIO_INIT_ERROR), "md bio init error"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_MESSAGEDIGEST_ATTRIBUTE_WRONG_LENGTH), - "messagedigest attribute wrong length"}, + "messagedigest attribute wrong length"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_MESSAGEDIGEST_WRONG_LENGTH), - "messagedigest wrong length"}, + "messagedigest wrong length"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_MSGSIGDIGEST_ERROR), "msgsigdigest error"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_MSGSIGDIGEST_VERIFICATION_FAILURE), - "msgsigdigest verification failure"}, + "msgsigdigest verification failure"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_MSGSIGDIGEST_WRONG_LENGTH), - "msgsigdigest wrong length"}, + "msgsigdigest wrong length"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NEED_ONE_SIGNER), "need one signer"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NOT_A_SIGNED_RECEIPT), - "not a signed receipt"}, + "not a signed receipt"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NOT_ENCRYPTED_DATA), "not encrypted data"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NOT_KEK), "not kek"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NOT_KEY_AGREEMENT), "not key agreement"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NOT_KEY_TRANSPORT), "not key transport"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NOT_PWRI), "not pwri"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NOT_SUPPORTED_FOR_THIS_KEY_TYPE), - "not supported for this key type"}, + "not supported for this key type"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_CIPHER), "no cipher"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_CONTENT), "no content"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_CONTENT_TYPE), "no content type"}, @@ -100,9 +102,9 @@ static const ERR_STRING_DATA CMS_str_reasons[] = { {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_KEY_OR_CERT), "no key or cert"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_MATCHING_DIGEST), "no matching digest"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_MATCHING_RECIPIENT), - "no matching recipient"}, + "no matching recipient"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_MATCHING_SIGNATURE), - "no matching signature"}, + "no matching signature"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_MSGSIGDIGEST), "no msgsigdigest"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_PASSWORD), "no password"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_PRIVATE_KEY), "no private key"}, @@ -111,56 +113,56 @@ static const ERR_STRING_DATA CMS_str_reasons[] = { {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_SIGNERS), "no signers"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_PEER_KEY_ERROR), "peer key error"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE), - "private key does not match certificate"}, + "private key does not match certificate"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_RECEIPT_DECODE_ERROR), - "receipt decode error"}, + "receipt decode error"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_RECIPIENT_ERROR), "recipient error"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_SHARED_INFO_ERROR), "shared info error"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_SIGNER_CERTIFICATE_NOT_FOUND), - "signer certificate not found"}, + "signer certificate not found"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_SIGNFINAL_ERROR), "signfinal error"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_SMIME_TEXT_ERROR), "smime text error"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_STORE_INIT_ERROR), "store init error"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_TYPE_NOT_COMPRESSED_DATA), - "type not compressed data"}, + "type not compressed data"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_TYPE_NOT_DATA), "type not data"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_TYPE_NOT_DIGESTED_DATA), - "type not digested data"}, + "type not digested data"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_TYPE_NOT_ENCRYPTED_DATA), - "type not encrypted data"}, + "type not encrypted data"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_TYPE_NOT_ENVELOPED_DATA), - "type not enveloped data"}, + "type not enveloped data"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNABLE_TO_FINALIZE_CONTEXT), - "unable to finalize context"}, + "unable to finalize context"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNKNOWN_CIPHER), "unknown cipher"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNKNOWN_DIGEST_ALGORITHM), - "unknown digest algorithm"}, + "unknown digest algorithm"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNKNOWN_ID), "unknown id"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_COMPRESSION_ALGORITHM), - "unsupported compression algorithm"}, + "unsupported compression algorithm"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_CONTENT_ENCRYPTION_ALGORITHM), - "unsupported content encryption algorithm"}, + "unsupported content encryption algorithm"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_CONTENT_TYPE), - "unsupported content type"}, + "unsupported content type"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_ENCRYPTION_TYPE), - "unsupported encryption type"}, + "unsupported encryption type"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_KEK_ALGORITHM), - "unsupported kek algorithm"}, + "unsupported kek algorithm"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_KEY_ENCRYPTION_ALGORITHM), - "unsupported key encryption algorithm"}, + "unsupported key encryption algorithm"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_LABEL_SOURCE), - "unsupported label source"}, + "unsupported label source"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_RECIPIENTINFO_TYPE), - "unsupported recipientinfo type"}, + "unsupported recipientinfo type"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_RECIPIENT_TYPE), - "unsupported recipient type"}, + "unsupported recipient type"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_SIGNATURE_ALGORITHM), - "unsupported signature algorithm"}, + "unsupported signature algorithm"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_TYPE), "unsupported type"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNWRAP_ERROR), "unwrap error"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNWRAP_FAILURE), "unwrap failure"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_VERIFICATION_FAILURE), - "verification failure"}, + "verification failure"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_WRAP_ERROR), "wrap error"}, {0, NULL} }; diff --git a/deps/openssl/openssl/crypto/cms/cms_kari.c b/deps/openssl/openssl/crypto/cms/cms_kari.c index a2f422a78d8b5c..8e9e6a5d148c8e 100644 --- a/deps/openssl/openssl/crypto/cms/cms_kari.c +++ b/deps/openssl/openssl/crypto/cms/cms_kari.c @@ -1,5 +1,5 @@ /* - * Copyright 2013-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2013-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -502,6 +502,13 @@ int ossl_cms_RecipientInfo_kari_encrypt(const CMS_ContentInfo *cms, oik->d.originatorKey = M_ASN1_new_of(CMS_OriginatorPublicKey); if (!oik->d.originatorKey) return 0; + } else { + /* + * Currently it is not possible to get public key as it is not stored + * during kari initialization. + */ + ERR_raise(ERR_LIB_CMS, CMS_R_ERROR_UNSUPPORTED_STATIC_KEY_AGREEMENT); + return 0; } /* Initialise KDF algorithm */ if (!ossl_cms_env_asn1_ctrl(ri, 0)) diff --git a/deps/openssl/openssl/crypto/cms/cms_lib.c b/deps/openssl/openssl/crypto/cms/cms_lib.c index 8b135e95aacc81..67b35627ba5e6b 100644 --- a/deps/openssl/openssl/crypto/cms/cms_lib.c +++ b/deps/openssl/openssl/crypto/cms/cms_lib.c @@ -22,6 +22,7 @@ static STACK_OF(CMS_CertificateChoices) **cms_get0_certificate_choices(CMS_ContentInfo *cms); +IMPLEMENT_ASN1_ALLOC_FUNCTIONS(CMS_ContentInfo) IMPLEMENT_ASN1_PRINT_FUNCTION(CMS_ContentInfo) CMS_ContentInfo *d2i_CMS_ContentInfo(CMS_ContentInfo **a, @@ -68,20 +69,6 @@ CMS_ContentInfo *CMS_ContentInfo_new_ex(OSSL_LIB_CTX *libctx, const char *propq) return ci; } -CMS_ContentInfo *CMS_ContentInfo_new(void) -{ - return CMS_ContentInfo_new_ex(NULL, NULL); -} - -void CMS_ContentInfo_free(CMS_ContentInfo *cms) -{ - if (cms != NULL) { - ossl_cms_env_enc_content_free(cms); - OPENSSL_free(cms->ctx.propq); - ASN1_item_free((ASN1_VALUE *)cms, ASN1_ITEM_rptr(CMS_ContentInfo)); - } -} - const CMS_CTX *ossl_cms_get0_cmsctx(const CMS_ContentInfo *cms) { return cms != NULL ? &cms->ctx : NULL; diff --git a/deps/openssl/openssl/crypto/cms/cms_local.h b/deps/openssl/openssl/crypto/cms/cms_local.h index 253f6819e43542..1e0e0910d1d181 100644 --- a/deps/openssl/openssl/crypto/cms/cms_local.h +++ b/deps/openssl/openssl/crypto/cms/cms_local.h @@ -368,6 +368,7 @@ struct CMS_Receipt_st { DECLARE_ASN1_FUNCTIONS(CMS_ContentInfo) DECLARE_ASN1_ITEM(CMS_SignerInfo) +DECLARE_ASN1_ITEM(CMS_EncryptedContentInfo) DECLARE_ASN1_ITEM(CMS_IssuerAndSerialNumber) DECLARE_ASN1_ITEM(CMS_Attributes_Sign) DECLARE_ASN1_ITEM(CMS_Attributes_Verify) @@ -444,7 +445,6 @@ BIO *ossl_cms_EnvelopedData_init_bio(CMS_ContentInfo *cms); int ossl_cms_EnvelopedData_final(CMS_ContentInfo *cms, BIO *chain); BIO *ossl_cms_AuthEnvelopedData_init_bio(CMS_ContentInfo *cms); int ossl_cms_AuthEnvelopedData_final(CMS_ContentInfo *cms, BIO *cmsbio); -void ossl_cms_env_enc_content_free(const CMS_ContentInfo *cinf); CMS_EnvelopedData *ossl_cms_get0_enveloped(CMS_ContentInfo *cms); CMS_AuthEnvelopedData *ossl_cms_get0_auth_enveloped(CMS_ContentInfo *cms); CMS_EncryptedContentInfo *ossl_cms_get0_env_enc_content(const CMS_ContentInfo *cms); diff --git a/deps/openssl/openssl/crypto/cms/cms_rsa.c b/deps/openssl/openssl/crypto/cms/cms_rsa.c index 12bc8184389701..5e26e89d501223 100644 --- a/deps/openssl/openssl/crypto/cms/cms_rsa.c +++ b/deps/openssl/openssl/crypto/cms/cms_rsa.c @@ -223,7 +223,10 @@ static int rsa_cms_sign(CMS_SignerInfo *si) os = ossl_rsa_ctx_to_pss_string(pkctx); if (os == NULL) return 0; - return X509_ALGOR_set0(alg, OBJ_nid2obj(EVP_PKEY_RSA_PSS), V_ASN1_SEQUENCE, os); + if (X509_ALGOR_set0(alg, OBJ_nid2obj(EVP_PKEY_RSA_PSS), V_ASN1_SEQUENCE, os)) + return 1; + ASN1_STRING_free(os); + return 0; } params[0] = OSSL_PARAM_construct_octet_string( diff --git a/deps/openssl/openssl/crypto/cms/cms_sd.c b/deps/openssl/openssl/crypto/cms/cms_sd.c index 3a21664e9da212..4758d048386eb0 100644 --- a/deps/openssl/openssl/crypto/cms/cms_sd.c +++ b/deps/openssl/openssl/crypto/cms/cms_sd.c @@ -482,8 +482,12 @@ CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms, ossl_cms_ctx_get0_libctx(ctx), ossl_cms_ctx_get0_propq(ctx), pk, NULL) <= 0) { + si->pctx = NULL; goto err; } + else { + EVP_MD_CTX_set_flags(si->mctx, EVP_MD_CTX_FLAG_KEEP_PKEY_CTX); + } } if (!sd->signerInfos) @@ -725,6 +729,7 @@ static int cms_SignerInfo_content_sign(CMS_ContentInfo *cms, unsigned int mdlen; pctx = si->pctx; + si->pctx = NULL; if (!EVP_DigestFinal_ex(mctx, md, &mdlen)) goto err; siglen = EVP_PKEY_get_size(si->pkey); @@ -813,6 +818,7 @@ int CMS_SignerInfo_sign(CMS_SignerInfo *si) ossl_cms_ctx_get0_propq(ctx), si->pkey, NULL) <= 0) goto err; + EVP_MD_CTX_set_flags(mctx, EVP_MD_CTX_FLAG_KEEP_PKEY_CTX); si->pctx = pctx; } @@ -884,9 +890,16 @@ int CMS_SignerInfo_verify(CMS_SignerInfo *si) goto err; } mctx = si->mctx; + if (si->pctx != NULL) { + EVP_PKEY_CTX_free(si->pctx); + si->pctx = NULL; + } if (EVP_DigestVerifyInit_ex(mctx, &si->pctx, EVP_MD_get0_name(md), libctx, - propq, si->pkey, NULL) <= 0) + propq, si->pkey, NULL) <= 0) { + si->pctx = NULL; goto err; + } + EVP_MD_CTX_set_flags(mctx, EVP_MD_CTX_FLAG_KEEP_PKEY_CTX); if (!cms_sd_asn1_ctrl(si, 1)) goto err; @@ -1003,8 +1016,11 @@ int CMS_SignerInfo_verify_content(CMS_SignerInfo *si, BIO *chain) if (EVP_PKEY_CTX_set_signature_md(pkctx, md) <= 0) goto err; si->pctx = pkctx; - if (!cms_sd_asn1_ctrl(si, 1)) + if (!cms_sd_asn1_ctrl(si, 1)) { + si->pctx = NULL; goto err; + } + si->pctx = NULL; r = EVP_PKEY_verify(pkctx, si->signature->data, si->signature->length, mval, mlen); if (r <= 0) { diff --git a/deps/openssl/openssl/crypto/cms/cms_smime.c b/deps/openssl/openssl/crypto/cms/cms_smime.c index d7719267c8c83d..65da2452fcea7e 100644 --- a/deps/openssl/openssl/crypto/cms/cms_smime.c +++ b/deps/openssl/openssl/crypto/cms/cms_smime.c @@ -236,7 +236,7 @@ CMS_ContentInfo *CMS_EncryptedData_encrypt_ex(BIO *in, const EVP_CIPHER *cipher, if (cms == NULL) return NULL; if (!CMS_EncryptedData_set1_key(cms, cipher, key, keylen)) - return NULL; + goto err; if (!(flags & CMS_DETACHED)) CMS_set_detached(cms, 0); @@ -245,6 +245,7 @@ CMS_ContentInfo *CMS_EncryptedData_encrypt_ex(BIO *in, const EVP_CIPHER *cipher, || CMS_final(cms, in, NULL, flags)) return cms; + err: CMS_ContentInfo_free(cms); return NULL; } diff --git a/deps/openssl/openssl/crypto/core_fetch.c b/deps/openssl/openssl/crypto/core_fetch.c index 38db36ee1f75e9..c063515fc04d92 100644 --- a/deps/openssl/openssl/crypto/core_fetch.c +++ b/deps/openssl/openssl/crypto/core_fetch.c @@ -1,5 +1,5 @@ /* - * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2019-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -120,7 +120,8 @@ static void ossl_method_construct_this(OSSL_PROVIDER *provider, * It is *expected* that the put function increments the refcnt * of the passed method. */ - data->mcm->put(data->store, method, provider, algo->algorithm_names, + data->mcm->put(no_store ? data->store : NULL, + method, provider, algo->algorithm_names, algo->property_definition, data->mcm_data); /* refcnt-- because we're dropping the reference */ diff --git a/deps/openssl/openssl/crypto/dso/dso_dl.c b/deps/openssl/openssl/crypto/dso/dso_dl.c index f4e6e5f4573f66..05b63cf1d9c232 100644 --- a/deps/openssl/openssl/crypto/dso/dso_dl.c +++ b/deps/openssl/openssl/crypto/dso/dso_dl.c @@ -235,13 +235,12 @@ static char *dl_name_converter(DSO *dso, const char *filename) ERR_raise(ERR_LIB_DSO, DSO_R_NAME_TRANSLATION_FAILED); return NULL; } - if (transform) { - if ((DSO_flags(dso) & DSO_FLAG_NAME_TRANSLATION_EXT_ONLY) == 0) - sprintf(translated, "lib%s%s", filename, DSO_EXTENSION); - else - sprintf(translated, "%s%s", filename, DSO_EXTENSION); - } else - sprintf(translated, "%s", filename); + if (transform) + BIO_snprintf(translated, rsize, + (DSO_flags(dso) & DSO_FLAG_NAME_TRANSLATION_EXT_ONLY) == 0 + ? "lib%s%s" : "%s%s", filename, DSO_EXTENSION); + else + BIO_snprintf(translated, rsize, "%s", filename); return translated; } diff --git a/deps/openssl/openssl/crypto/dso/dso_dlfcn.c b/deps/openssl/openssl/crypto/dso/dso_dlfcn.c index 6a988cc727913e..1107da5fe6575e 100644 --- a/deps/openssl/openssl/crypto/dso/dso_dlfcn.c +++ b/deps/openssl/openssl/crypto/dso/dso_dlfcn.c @@ -271,11 +271,12 @@ static char *dlfcn_name_converter(DSO *dso, const char *filename) } if (transform) { if ((DSO_flags(dso) & DSO_FLAG_NAME_TRANSLATION_EXT_ONLY) == 0) - sprintf(translated, "lib%s" DSO_EXTENSION, filename); + BIO_snprintf(translated, rsize, "lib%s" DSO_EXTENSION, filename); else - sprintf(translated, "%s" DSO_EXTENSION, filename); - } else - sprintf(translated, "%s", filename); + BIO_snprintf(translated, rsize, "%s" DSO_EXTENSION, filename); + } else { + BIO_snprintf(translated, rsize, "%s", filename); + } return translated; } diff --git a/deps/openssl/openssl/crypto/dso/dso_win32.c b/deps/openssl/openssl/crypto/dso/dso_win32.c index 4d3059d43879f8..91a1a9d9aeb577 100644 --- a/deps/openssl/openssl/crypto/dso/dso_win32.c +++ b/deps/openssl/openssl/crypto/dso/dso_win32.c @@ -454,24 +454,20 @@ static char *win32_name_converter(DSO *dso, const char *filename) char *translated; int len, transform; - len = strlen(filename); transform = ((strstr(filename, "/") == NULL) && (strstr(filename, "\\") == NULL) && (strstr(filename, ":") == NULL)); + /* If transform != 0, then we convert to %s.dll, else just dupe filename */ + + len = strlen(filename) + 1; if (transform) - /* We will convert this to "%s.dll" */ - translated = OPENSSL_malloc(len + 5); - else - /* We will simply duplicate filename */ - translated = OPENSSL_malloc(len + 1); + len += strlen(".dll"); + translated = OPENSSL_malloc(len); if (translated == NULL) { ERR_raise(ERR_LIB_DSO, DSO_R_NAME_TRANSLATION_FAILED); return NULL; } - if (transform) - sprintf(translated, "%s.dll", filename); - else - sprintf(translated, "%s", filename); + BIO_snprintf(translated, len, "%s%s", filename, transform ? ".dll" : ""); return translated; } diff --git a/deps/openssl/openssl/crypto/ec/ec_asn1.c b/deps/openssl/openssl/crypto/ec/ec_asn1.c index 7a0b35a594311b..c018f392894d9e 100644 --- a/deps/openssl/openssl/crypto/ec/ec_asn1.c +++ b/deps/openssl/openssl/crypto/ec/ec_asn1.c @@ -1161,7 +1161,7 @@ int i2o_ECPublicKey(const EC_KEY *a, unsigned char **out) size_t buf_len = 0; int new_buffer = 0; - if (a == NULL) { + if (a == NULL || a->pub_key == NULL) { ERR_raise(ERR_LIB_EC, ERR_R_PASSED_NULL_PARAMETER); return 0; } diff --git a/deps/openssl/openssl/crypto/ec/ec_backend.c b/deps/openssl/openssl/crypto/ec/ec_backend.c index 98e2c418e416c8..cad576fc48a142 100644 --- a/deps/openssl/openssl/crypto/ec/ec_backend.c +++ b/deps/openssl/openssl/crypto/ec/ec_backend.c @@ -616,14 +616,8 @@ EC_KEY *ossl_ec_key_dup(const EC_KEY *src, int selection) || !EC_GROUP_copy(ret->group, src->group)) goto err; - if (src->meth != NULL) { -#if !defined(OPENSSL_NO_ENGINE) && !defined(FIPS_MODULE) - if (src->engine != NULL && ENGINE_init(src->engine) == 0) - goto err; - ret->engine = src->engine; -#endif + if (src->meth != NULL) ret->meth = src->meth; - } } /* copy the public key */ diff --git a/deps/openssl/openssl/crypto/ec/ec_lib.c b/deps/openssl/openssl/crypto/ec/ec_lib.c index b1696d93bd6dd0..a082876fb4798e 100644 --- a/deps/openssl/openssl/crypto/ec/ec_lib.c +++ b/deps/openssl/openssl/crypto/ec/ec_lib.c @@ -1,5 +1,5 @@ /* - * Copyright 2001-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2001-2025 The OpenSSL Project Authors. All Rights Reserved. * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved * * Licensed under the Apache License 2.0 (the "License"). You may not use @@ -20,6 +20,7 @@ #include #include #include "crypto/ec.h" +#include "crypto/bn.h" #include "internal/nelem.h" #include "ec_local.h" @@ -1262,10 +1263,10 @@ static int ec_field_inverse_mod_ord(const EC_GROUP *group, BIGNUM *r, if (!BN_sub(e, group->order, e)) goto err; /*- - * Exponent e is public. - * No need for scatter-gather or BN_FLG_CONSTTIME. + * Although the exponent is public we want the result to be + * fixed top. */ - if (!BN_mod_exp_mont(r, x, e, group->order, ctx, group->mont_data)) + if (!bn_mod_exp_mont_fixed_top(r, x, e, group->order, ctx, group->mont_data)) goto err; ret = 1; diff --git a/deps/openssl/openssl/crypto/ec/ec_oct.c b/deps/openssl/openssl/crypto/ec/ec_oct.c index 790a0b29077176..2b77e9738883e0 100644 --- a/deps/openssl/openssl/crypto/ec/ec_oct.c +++ b/deps/openssl/openssl/crypto/ec/ec_oct.c @@ -74,6 +74,10 @@ size_t EC_POINT_point2oct(const EC_GROUP *group, const EC_POINT *point, point_conversion_form_t form, unsigned char *buf, size_t len, BN_CTX *ctx) { + if (point == NULL) { + ERR_raise(ERR_LIB_EC, ERR_R_PASSED_NULL_PARAMETER); + return 0; + } if (group->meth->point2oct == 0 && !(group->meth->flags & EC_FLAGS_DEFAULT_OCT)) { ERR_raise(ERR_LIB_EC, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); diff --git a/deps/openssl/openssl/crypto/encode_decode/encoder_pkey.c b/deps/openssl/openssl/crypto/encode_decode/encoder_pkey.c index 3a24317cf4d6cf..39266a95309dcd 100644 --- a/deps/openssl/openssl/crypto/encode_decode/encoder_pkey.c +++ b/deps/openssl/openssl/crypto/encode_decode/encoder_pkey.c @@ -186,9 +186,13 @@ encoder_construct_pkey(OSSL_ENCODER_INSTANCE *encoder_inst, void *arg) const OSSL_PROVIDER *e_prov = OSSL_ENCODER_get0_provider(encoder); if (k_prov != e_prov) { + int selection = data->selection; + + if ((selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0) + selection |= OSSL_KEYMGMT_SELECT_PUBLIC_KEY; data->encoder_inst = encoder_inst; - if (!evp_keymgmt_export(pk->keymgmt, pk->keydata, data->selection, + if (!evp_keymgmt_export(pk->keymgmt, pk->keydata, selection, &encoder_import_cb, data)) return NULL; data->obj = data->constructed_obj; diff --git a/deps/openssl/openssl/crypto/err/openssl.txt b/deps/openssl/openssl/crypto/err/openssl.txt index 003e2981095676..756fafdfa24aff 100644 --- a/deps/openssl/openssl/crypto/err/openssl.txt +++ b/deps/openssl/openssl/crypto/err/openssl.txt @@ -1,4 +1,4 @@ -# Copyright 1999-2023 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 1999-2025 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the Apache License 2.0 (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -307,6 +307,8 @@ CMS_R_ERROR_READING_MESSAGEDIGEST_ATTRIBUTE:114:\ error reading messagedigest attribute CMS_R_ERROR_SETTING_KEY:115:error setting key CMS_R_ERROR_SETTING_RECIPIENTINFO:116:error setting recipientinfo +CMS_R_ERROR_UNSUPPORTED_STATIC_KEY_AGREEMENT:196:\ + error unsupported static key agreement CMS_R_ESS_SIGNING_CERTID_MISMATCH_ERROR:183:ess signing certid mismatch error CMS_R_INVALID_ENCRYPTED_KEY_LENGTH:117:invalid encrypted key length CMS_R_INVALID_KEY_ENCRYPTION_PARAMETER:176:invalid key encryption parameter @@ -1388,8 +1390,6 @@ SSL_R_MISSING_ECDSA_SIGNING_CERT:381:missing ecdsa signing cert SSL_R_MISSING_FATAL:256:missing fatal SSL_R_MISSING_PARAMETERS:290:missing parameters SSL_R_MISSING_PSK_KEX_MODES_EXTENSION:310:missing psk kex modes extension -SSL_R_MISSING_QUIC_TRANSPORT_PARAMETERS_EXTENSION:801:\ - missing quic transport parameters extension SSL_R_MISSING_RSA_CERTIFICATE:168:missing rsa certificate SSL_R_MISSING_RSA_ENCRYPTING_CERT:169:missing rsa encrypting cert SSL_R_MISSING_RSA_SIGNING_CERT:170:missing rsa signing cert @@ -1540,7 +1540,6 @@ SSL_R_VERSION_TOO_LOW:396:version too low SSL_R_WRONG_CERTIFICATE_TYPE:383:wrong certificate type SSL_R_WRONG_CIPHER_RETURNED:261:wrong cipher returned SSL_R_WRONG_CURVE:378:wrong curve -SSL_R_WRONG_ENCRYPTION_LEVEL_RECEIVED:800:wrong encryption level received SSL_R_WRONG_SIGNATURE_LENGTH:264:wrong signature length SSL_R_WRONG_SIGNATURE_SIZE:265:wrong signature size SSL_R_WRONG_SIGNATURE_TYPE:370:wrong signature type diff --git a/deps/openssl/openssl/crypto/evp/ctrl_params_translate.c b/deps/openssl/openssl/crypto/evp/ctrl_params_translate.c index de6c215e205a22..44d0895bcf1447 100644 --- a/deps/openssl/openssl/crypto/evp/ctrl_params_translate.c +++ b/deps/openssl/openssl/crypto/evp/ctrl_params_translate.c @@ -1210,6 +1210,8 @@ static int fix_ecdh_cofactor(enum state state, /* The initial value for |ctx->action_type| must not be zero. */ if (!ossl_assert(ctx->action_type != NONE)) return 0; + } else if (state == POST_PARAMS_TO_CTRL && ctx->action_type == NONE) { + ctx->action_type = GET; } if ((ret = default_check(state, translation, ctx)) <= 0) @@ -1235,6 +1237,8 @@ static int fix_ecdh_cofactor(enum state state, } } else if (state == PRE_PARAMS_TO_CTRL && ctx->action_type == GET) { ctx->p1 = -2; + } else if (state == POST_PARAMS_TO_CTRL && ctx->action_type == GET) { + ctx->p1 = ret; } return ret; @@ -2800,8 +2804,14 @@ static int evp_pkey_ctx_setget_params_to_ctrl(EVP_PKEY_CTX *pctx, /* * In POST, we pass the return value as p1, allowing the fixup_args * function to put it to good use, or maybe affect it. + * + * NOTE: even though EVP_PKEY_CTX_ctrl return value is documented + * as return positive on Success and 0 or negative on falure. There + * maybe parameters (e.g. ecdh_cofactor), which actually return 0 + * as success value. That is why we do POST_PARAMS_TO_CTRL for 0 + * value as well */ - if (ret > 0) { + if (ret >= 0) { ctx.p1 = ret; fixup(POST_PARAMS_TO_CTRL, translation, &ctx); ret = ctx.p1; diff --git a/deps/openssl/openssl/crypto/evp/m_sigver.c b/deps/openssl/openssl/crypto/evp/m_sigver.c index 76a6814b424bec..efd2c05c85cf09 100644 --- a/deps/openssl/openssl/crypto/evp/m_sigver.c +++ b/deps/openssl/openssl/crypto/evp/m_sigver.c @@ -662,8 +662,12 @@ int EVP_DigestVerify(EVP_MD_CTX *ctx, const unsigned char *sigret, { EVP_PKEY_CTX *pctx = ctx->pctx; - if (pctx != NULL - && pctx->operation == EVP_PKEY_OP_VERIFYCTX + if (pctx == NULL) { + ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR); + return -1; + } + + if (pctx->operation == EVP_PKEY_OP_VERIFYCTX && pctx->op.sig.algctx != NULL && pctx->op.sig.signature != NULL) { if (pctx->op.sig.signature->digest_verify != NULL) @@ -672,8 +676,8 @@ int EVP_DigestVerify(EVP_MD_CTX *ctx, const unsigned char *sigret, tbs, tbslen); } else { /* legacy */ - if (ctx->pctx->pmeth != NULL && ctx->pctx->pmeth->digestverify != NULL) - return ctx->pctx->pmeth->digestverify(ctx, sigret, siglen, tbs, tbslen); + if (pctx->pmeth != NULL && pctx->pmeth->digestverify != NULL) + return pctx->pmeth->digestverify(ctx, sigret, siglen, tbs, tbslen); } if (EVP_DigestVerifyUpdate(ctx, tbs, tbslen) <= 0) diff --git a/deps/openssl/openssl/crypto/http/http_client.c b/deps/openssl/openssl/crypto/http/http_client.c index 4b96a6b9e9e240..c86db4405b8f19 100644 --- a/deps/openssl/openssl/crypto/http/http_client.c +++ b/deps/openssl/openssl/crypto/http/http_client.c @@ -851,6 +851,20 @@ int OSSL_HTTP_REQ_CTX_nbio_d2i(OSSL_HTTP_REQ_CTX *rctx, #ifndef OPENSSL_NO_SOCK +static const char *explict_or_default_port(const char *hostserv, const char *port, int use_ssl) +{ + if (port == NULL) { + char *service = NULL; + + if (!BIO_parse_hostserv(hostserv, NULL, &service, BIO_PARSE_PRIO_HOST)) + return NULL; + if (service == NULL) /* implicit port */ + port = use_ssl ? OSSL_HTTPS_PORT : OSSL_HTTP_PORT; + OPENSSL_free(service); + } /* otherwise take the explicitly given port */ + return port; +} + /* set up a new connection BIO, to HTTP server or to HTTP(S) proxy if given */ static BIO *http_new_bio(const char *server /* optionally includes ":port" */, const char *server_port /* explicit server port */, @@ -870,8 +884,7 @@ static BIO *http_new_bio(const char *server /* optionally includes ":port" */, port = proxy_port; } - if (port == NULL && strchr(host, ':') == NULL) - port = use_ssl ? OSSL_HTTPS_PORT : OSSL_HTTP_PORT; + port = explict_or_default_port(host, port, use_ssl); cbio = BIO_new_connect(host /* optionally includes ":port" */); if (cbio == NULL) @@ -958,8 +971,6 @@ OSSL_HTTP_REQ_CTX *OSSL_HTTP_open(const char *server, const char *port, } if (port != NULL && *port == '\0') port = NULL; - if (port == NULL && strchr(server, ':') == NULL) - port = use_ssl ? OSSL_HTTPS_PORT : OSSL_HTTP_PORT; proxy = OSSL_HTTP_adapt_proxy(proxy, no_proxy, server, use_ssl); if (proxy != NULL && !OSSL_HTTP_parse_url(proxy, NULL /* use_ssl */, NULL /* user */, diff --git a/deps/openssl/openssl/crypto/http/http_lib.c b/deps/openssl/openssl/crypto/http/http_lib.c index 30c1cd04fc0052..9c41f57541d74b 100644 --- a/deps/openssl/openssl/crypto/http/http_lib.c +++ b/deps/openssl/openssl/crypto/http/http_lib.c @@ -1,5 +1,5 @@ /* - * Copyright 2001-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2001-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -9,11 +9,18 @@ #include /* for sscanf() */ #include +#ifndef OPENSSL_NO_SOCK +# include "../bio/bio_local.h" /* for NI_MAXHOST */ +#endif #include #include #include /* for BIO_snprintf() */ #include #include "internal/cryptlib.h" /* for ossl_assert() */ +#ifndef NI_MAXHOST +# define NI_MAXHOST 255 +#endif +#include "crypto/ctype.h" /* for ossl_isspace() */ static void init_pstring(char **pstr) { @@ -251,10 +258,17 @@ static int use_proxy(const char *no_proxy, const char *server) { size_t sl; const char *found = NULL; + char host[NI_MAXHOST]; if (!ossl_assert(server != NULL)) return 0; sl = strlen(server); + if (sl >= 2 && sl < sizeof(host) + 2 && server[0] == '[' && server[sl - 1] == ']') { + /* strip leading '[' and trailing ']' from escaped IPv6 address */ + sl -= 2; + strncpy(host, server + 1, sl); + server = host; + } /* * using environment variable names, both lowercase and uppercase variants, @@ -268,8 +282,8 @@ static int use_proxy(const char *no_proxy, const char *server) if (no_proxy != NULL) found = strstr(no_proxy, server); while (found != NULL - && ((found != no_proxy && found[-1] != ' ' && found[-1] != ',') - || (found[sl] != '\0' && found[sl] != ' ' && found[sl] != ','))) + && ((found != no_proxy && !ossl_isspace(found[-1]) && found[-1] != ',') + || (found[sl] != '\0' && !ossl_isspace(found[sl]) && found[sl] != ','))) found = strstr(found + 1, server); return found == NULL; } @@ -285,7 +299,7 @@ const char *OSSL_HTTP_adapt_proxy(const char *proxy, const char *no_proxy, if (proxy == NULL) proxy = ossl_safe_getenv(use_ssl ? "https_proxy" : "http_proxy"); if (proxy == NULL) - proxy = ossl_safe_getenv(use_ssl ? OPENSSL_HTTP_PROXY : OPENSSL_HTTPS_PROXY); + proxy = ossl_safe_getenv(use_ssl ? OPENSSL_HTTPS_PROXY : OPENSSL_HTTP_PROXY); if (proxy == NULL || *proxy == '\0' || !use_proxy(no_proxy, server)) return NULL; diff --git a/deps/openssl/openssl/crypto/info.c b/deps/openssl/openssl/crypto/info.c index f5fa92e1580add..a0dc2e80136f87 100644 --- a/deps/openssl/openssl/crypto/info.c +++ b/deps/openssl/openssl/crypto/info.c @@ -14,7 +14,6 @@ #include "internal/cryptlib.h" #include "e_os.h" #include "buildinf.h" -#include #if defined(__arm__) || defined(__arm) || defined(__aarch64__) # include "arm_arch.h" @@ -200,10 +199,6 @@ const char *OPENSSL_info(int t) if (ossl_cpu_info_str[0] != '\0') return ossl_cpu_info_str + strlen(CPUINFO_PREFIX); break; -#ifndef OPENSSL_NO_QUIC - case OPENSSL_INFO_QUIC: - return "QUIC"; -#endif default: break; } diff --git a/deps/openssl/openssl/crypto/pem/pem_pk8.c b/deps/openssl/openssl/crypto/pem/pem_pk8.c index 1592e351edef16..6e84f0afd05d03 100644 --- a/deps/openssl/openssl/crypto/pem/pem_pk8.c +++ b/deps/openssl/openssl/crypto/pem/pem_pk8.c @@ -173,7 +173,7 @@ EVP_PKEY *d2i_PKCS8PrivateKey_bio(BIO *bp, EVP_PKEY **x, pem_password_cb *cb, X509_SIG *p8 = NULL; int klen; EVP_PKEY *ret; - char psbuf[PEM_BUFSIZE]; + char psbuf[PEM_BUFSIZE + 1]; /* reserve one byte at the end */ p8 = d2i_PKCS8_bio(bp, NULL); if (p8 == NULL) @@ -182,7 +182,7 @@ EVP_PKEY *d2i_PKCS8PrivateKey_bio(BIO *bp, EVP_PKEY **x, pem_password_cb *cb, klen = cb(psbuf, PEM_BUFSIZE, 0, u); else klen = PEM_def_callback(psbuf, PEM_BUFSIZE, 0, u); - if (klen < 0) { + if (klen < 0 || klen > PEM_BUFSIZE) { ERR_raise(ERR_LIB_PEM, PEM_R_BAD_PASSWORD_READ); X509_SIG_free(p8); return NULL; diff --git a/deps/openssl/openssl/crypto/perlasm/x86asm.pl b/deps/openssl/openssl/crypto/perlasm/x86asm.pl index 98a7159a5f131c..8dcde9eacaa3d1 100644 --- a/deps/openssl/openssl/crypto/perlasm/x86asm.pl +++ b/deps/openssl/openssl/crypto/perlasm/x86asm.pl @@ -174,9 +174,9 @@ sub ::vprotd sub ::endbranch { - &::generic("%ifdef __CET__\n"); + &::generic("#ifdef __CET__\n"); &::data_byte(0xf3,0x0f,0x1e,0xfb); - &::generic("%endif\n"); + &::generic("#endif\n"); } # label management diff --git a/deps/openssl/openssl/crypto/pkcs12/p12_crt.c b/deps/openssl/openssl/crypto/pkcs12/p12_crt.c index 1a48e5c611da5c..3c7d5ff97c52ab 100644 --- a/deps/openssl/openssl/crypto/pkcs12/p12_crt.c +++ b/deps/openssl/openssl/crypto/pkcs12/p12_crt.c @@ -1,5 +1,5 @@ /* - * Copyright 1999-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1999-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -210,8 +210,10 @@ PKCS12_SAFEBAG *PKCS12_add_key_ex(STACK_OF(PKCS12_SAFEBAG) **pbags, /* Make a PKCS#8 structure */ if ((p8 = EVP_PKEY2PKCS8(key)) == NULL) goto err; - if (key_usage && !PKCS8_add_keyusage(p8, key_usage)) + if (key_usage && !PKCS8_add_keyusage(p8, key_usage)) { + PKCS8_PRIV_KEY_INFO_free(p8); goto err; + } if (nid_key != -1) { /* This call does not take ownership of p8 */ bag = PKCS12_SAFEBAG_create_pkcs8_encrypt_ex(nid_key, pass, -1, NULL, 0, diff --git a/deps/openssl/openssl/crypto/pkcs7/pk7_doit.c b/deps/openssl/openssl/crypto/pkcs7/pk7_doit.c index d7791e5c4f4705..e9de097da186be 100644 --- a/deps/openssl/openssl/crypto/pkcs7/pk7_doit.c +++ b/deps/openssl/openssl/crypto/pkcs7/pk7_doit.c @@ -1023,6 +1023,7 @@ int PKCS7_signatureVerify(BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si, STACK_OF(X509_ATTRIBUTE) *sk; BIO *btmp; EVP_PKEY *pkey; + unsigned char *abuf = NULL; const PKCS7_CTX *ctx = ossl_pkcs7_get0_ctx(p7); OSSL_LIB_CTX *libctx = ossl_pkcs7_ctx_get0_libctx(ctx); const char *propq = ossl_pkcs7_ctx_get0_propq(ctx); @@ -1072,7 +1073,7 @@ int PKCS7_signatureVerify(BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si, sk = si->auth_attr; if ((sk != NULL) && (sk_X509_ATTRIBUTE_num(sk) != 0)) { - unsigned char md_dat[EVP_MAX_MD_SIZE], *abuf = NULL; + unsigned char md_dat[EVP_MAX_MD_SIZE]; unsigned int md_len; int alen; ASN1_OCTET_STRING *message_digest; @@ -1114,8 +1115,6 @@ int PKCS7_signatureVerify(BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si, } if (!EVP_VerifyUpdate(mdc_tmp, abuf, alen)) goto err; - - OPENSSL_free(abuf); } os = si->enc_digest; @@ -1133,6 +1132,7 @@ int PKCS7_signatureVerify(BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si, } ret = 1; err: + OPENSSL_free(abuf); EVP_MD_CTX_free(mdc_tmp); EVP_MD_free(fetched_md); return ret; diff --git a/deps/openssl/openssl/crypto/pkcs7/pk7_lib.c b/deps/openssl/openssl/crypto/pkcs7/pk7_lib.c index 5ce591f758f7ff..bdd620526969da 100644 --- a/deps/openssl/openssl/crypto/pkcs7/pk7_lib.c +++ b/deps/openssl/openssl/crypto/pkcs7/pk7_lib.c @@ -28,6 +28,11 @@ long PKCS7_ctrl(PKCS7 *p7, int cmd, long larg, char *parg) /* NOTE(emilia): does not support detached digested data. */ case PKCS7_OP_SET_DETACHED_SIGNATURE: if (nid == NID_pkcs7_signed) { + if (p7->d.sign == NULL) { + ERR_raise(ERR_LIB_PKCS7, PKCS7_R_NO_CONTENT); + ret = 0; + break; + } ret = p7->detached = (int)larg; if (ret && PKCS7_type_is_data(p7->d.sign->contents)) { ASN1_OCTET_STRING *os; diff --git a/deps/openssl/openssl/crypto/sm2/sm2_sign.c b/deps/openssl/openssl/crypto/sm2/sm2_sign.c index 71ccfcfc4c3dee..2097cd2fca8695 100644 --- a/deps/openssl/openssl/crypto/sm2/sm2_sign.c +++ b/deps/openssl/openssl/crypto/sm2/sm2_sign.c @@ -331,12 +331,10 @@ static int sm2_sig_verify(const EC_KEY *key, const ECDSA_SIG *sig, OSSL_LIB_CTX *libctx = ossl_ec_key_get_libctx(key); ctx = BN_CTX_new_ex(libctx); - pt = EC_POINT_new(group); - if (ctx == NULL || pt == NULL) { + if (ctx == NULL) { ERR_raise(ERR_LIB_SM2, ERR_R_MALLOC_FAILURE); goto done; } - BN_CTX_start(ctx); t = BN_CTX_get(ctx); x1 = BN_CTX_get(ctx); @@ -345,6 +343,12 @@ static int sm2_sig_verify(const EC_KEY *key, const ECDSA_SIG *sig, goto done; } + pt = EC_POINT_new(group); + if (pt == NULL) { + ERR_raise(ERR_LIB_SM2, ERR_R_MALLOC_FAILURE); + goto done; + } + /* * B1: verify whether r' in [1,n-1], verification failed if not * B2: verify whether s' in [1,n-1], verification failed if not diff --git a/deps/openssl/openssl/crypto/srp/srp_vfy.c b/deps/openssl/openssl/crypto/srp/srp_vfy.c index 96d511ffe6368e..4b842dfd912973 100644 --- a/deps/openssl/openssl/crypto/srp/srp_vfy.c +++ b/deps/openssl/openssl/crypto/srp/srp_vfy.c @@ -216,6 +216,8 @@ int SRP_user_pwd_set1_ids(SRP_user_pwd *vinfo, const char *id, { OPENSSL_free(vinfo->id); OPENSSL_free(vinfo->info); + vinfo->id = NULL; + vinfo->info = NULL; if (id != NULL && NULL == (vinfo->id = OPENSSL_strdup(id))) return 0; return (info == NULL || NULL != (vinfo->info = OPENSSL_strdup(info))); diff --git a/deps/openssl/openssl/crypto/threads_win.c b/deps/openssl/openssl/crypto/threads_win.c index dbeda74d73a70a..43f36ee6a333ba 100644 --- a/deps/openssl/openssl/crypto/threads_win.c +++ b/deps/openssl/openssl/crypto/threads_win.c @@ -212,7 +212,8 @@ int CRYPTO_THREAD_compare_id(CRYPTO_THREAD_ID a, CRYPTO_THREAD_ID b) int CRYPTO_atomic_add(int *val, int amount, int *ret, CRYPTO_RWLOCK *lock) { - *ret = (int)InterlockedExchangeAdd((long volatile *)val, (long)amount) + amount; + *ret = (int)InterlockedExchangeAdd((LONG volatile *)val, (LONG)amount) + + amount; return 1; } diff --git a/deps/openssl/openssl/crypto/trace.c b/deps/openssl/openssl/crypto/trace.c index 3df9b5a51e9941..90a6350bebae5a 100644 --- a/deps/openssl/openssl/crypto/trace.c +++ b/deps/openssl/openssl/crypto/trace.c @@ -473,7 +473,7 @@ BIO *OSSL_trace_begin(int category) char *prefix = NULL; category = ossl_trace_get_category(category); - if (category < 0) + if (category < 0 || !OSSL_trace_enabled(category)) return NULL; channel = trace_channels[category].bio; diff --git a/deps/openssl/openssl/crypto/ui/ui_util.c b/deps/openssl/openssl/crypto/ui/ui_util.c index 59b00b225adfa2..554bf7985659ed 100644 --- a/deps/openssl/openssl/crypto/ui/ui_util.c +++ b/deps/openssl/openssl/crypto/ui/ui_util.c @@ -105,14 +105,18 @@ static int ui_read(UI *ui, UI_STRING *uis) switch (UI_get_string_type(uis)) { case UIT_PROMPT: { - char result[PEM_BUFSIZE + 1]; + int len; + char result[PEM_BUFSIZE + 1]; /* reserve one byte at the end */ const struct pem_password_cb_data *data = UI_method_get_ex_data(UI_get_method(ui), ui_method_data_index); int maxsize = UI_get_result_maxsize(uis); - int len = data->cb(result, - maxsize > PEM_BUFSIZE ? PEM_BUFSIZE : maxsize, - data->rwflag, UI_get0_user_data(ui)); + if (maxsize > PEM_BUFSIZE) + maxsize = PEM_BUFSIZE; + len = data->cb(result, maxsize, data->rwflag, + UI_get0_user_data(ui)); + if (len > maxsize) + return -1; if (len >= 0) result[len] = '\0'; if (len < 0) diff --git a/deps/openssl/openssl/crypto/x509/v3_admis.c b/deps/openssl/openssl/crypto/x509/v3_admis.c index 3bce232ed2fe83..53259c29f569d9 100644 --- a/deps/openssl/openssl/crypto/x509/v3_admis.c +++ b/deps/openssl/openssl/crypto/x509/v3_admis.c @@ -67,11 +67,10 @@ const X509V3_EXT_METHOD ossl_v3_ext_admission = { NULL /* extension-specific data */ }; - static int i2r_NAMING_AUTHORITY(const struct v3_ext_method *method, void *in, BIO *bp, int ind) { - NAMING_AUTHORITY * namingAuthority = (NAMING_AUTHORITY*) in; + NAMING_AUTHORITY *namingAuthority = (NAMING_AUTHORITY *) in; if (namingAuthority == NULL) return 0; @@ -81,14 +80,14 @@ static int i2r_NAMING_AUTHORITY(const struct v3_ext_method *method, void *in, && namingAuthority->namingAuthorityUrl == NULL) return 0; - if (BIO_printf(bp, "%*snamingAuthority: ", ind, "") <= 0) + if (BIO_printf(bp, "%*snamingAuthority:\n", ind, "") <= 0) goto err; if (namingAuthority->namingAuthorityId != NULL) { char objbuf[128]; const char *ln = OBJ_nid2ln(OBJ_obj2nid(namingAuthority->namingAuthorityId)); - if (BIO_printf(bp, "%*s admissionAuthorityId: ", ind, "") <= 0) + if (BIO_printf(bp, "%*s namingAuthorityId: ", ind, "") <= 0) goto err; OBJ_obj2txt(objbuf, sizeof(objbuf), namingAuthority->namingAuthorityId, 1); @@ -130,9 +129,10 @@ static int i2r_ADMISSION_SYNTAX(const struct v3_ext_method *method, void *in, } for (i = 0; i < sk_ADMISSIONS_num(admission->contentsOfAdmissions); i++) { - ADMISSIONS* entry = sk_ADMISSIONS_value(admission->contentsOfAdmissions, i); + ADMISSIONS *entry = sk_ADMISSIONS_value(admission->contentsOfAdmissions, i); - if (BIO_printf(bp, "%*sEntry %0d:\n", ind, "", 1 + i) <= 0) goto err; + if (BIO_printf(bp, "%*sEntry %0d:\n", ind, "", 1 + i) <= 0) + goto err; if (entry->admissionAuthority != NULL) { if (BIO_printf(bp, "%*s admissionAuthority:\n", ind, "") <= 0 @@ -143,12 +143,12 @@ static int i2r_ADMISSION_SYNTAX(const struct v3_ext_method *method, void *in, } if (entry->namingAuthority != NULL) { - if (i2r_NAMING_AUTHORITY(method, entry->namingAuthority, bp, ind) <= 0) + if (i2r_NAMING_AUTHORITY(method, entry->namingAuthority, bp, ind + 2) <= 0) goto err; } for (j = 0; j < sk_PROFESSION_INFO_num(entry->professionInfos); j++) { - PROFESSION_INFO* pinfo = sk_PROFESSION_INFO_value(entry->professionInfos, j); + PROFESSION_INFO *pinfo = sk_PROFESSION_INFO_value(entry->professionInfos, j); if (BIO_printf(bp, "%*s Profession Info Entry %0d:\n", ind, "", 1 + j) <= 0) goto err; @@ -161,7 +161,7 @@ static int i2r_ADMISSION_SYNTAX(const struct v3_ext_method *method, void *in, } if (pinfo->namingAuthority != NULL) { - if (i2r_NAMING_AUTHORITY(method, pinfo->namingAuthority, bp, ind + 2) <= 0) + if (i2r_NAMING_AUTHORITY(method, pinfo->namingAuthority, bp, ind + 4) <= 0) goto err; } @@ -170,7 +170,7 @@ static int i2r_ADMISSION_SYNTAX(const struct v3_ext_method *method, void *in, if (BIO_printf(bp, "%*s Info Entries:\n", ind, "") <= 0) goto err; for (k = 0; k < sk_ASN1_STRING_num(pinfo->professionItems); k++) { - ASN1_STRING* val = sk_ASN1_STRING_value(pinfo->professionItems, k); + ASN1_STRING *val = sk_ASN1_STRING_value(pinfo->professionItems, k); if (BIO_printf(bp, "%*s ", ind, "") <= 0 || ASN1_STRING_print(bp, val) <= 0 @@ -183,7 +183,7 @@ static int i2r_ADMISSION_SYNTAX(const struct v3_ext_method *method, void *in, if (BIO_printf(bp, "%*s Profession OIDs:\n", ind, "") <= 0) goto err; for (k = 0; k < sk_ASN1_OBJECT_num(pinfo->professionOIDs); k++) { - ASN1_OBJECT* obj = sk_ASN1_OBJECT_value(pinfo->professionOIDs, k); + ASN1_OBJECT *obj = sk_ASN1_OBJECT_value(pinfo->professionOIDs, k); const char *ln = OBJ_nid2ln(OBJ_obj2nid(obj)); char objbuf[128]; @@ -207,31 +207,29 @@ const ASN1_OBJECT *NAMING_AUTHORITY_get0_authorityId(const NAMING_AUTHORITY *n) return n->namingAuthorityId; } -void NAMING_AUTHORITY_set0_authorityId(NAMING_AUTHORITY *n, ASN1_OBJECT* id) +void NAMING_AUTHORITY_set0_authorityId(NAMING_AUTHORITY *n, ASN1_OBJECT *id) { ASN1_OBJECT_free(n->namingAuthorityId); n->namingAuthorityId = id; } -const ASN1_IA5STRING *NAMING_AUTHORITY_get0_authorityURL( - const NAMING_AUTHORITY *n) +const ASN1_IA5STRING *NAMING_AUTHORITY_get0_authorityURL(const NAMING_AUTHORITY *n) { return n->namingAuthorityUrl; } -void NAMING_AUTHORITY_set0_authorityURL(NAMING_AUTHORITY *n, ASN1_IA5STRING* u) +void NAMING_AUTHORITY_set0_authorityURL(NAMING_AUTHORITY *n, ASN1_IA5STRING *u) { ASN1_IA5STRING_free(n->namingAuthorityUrl); n->namingAuthorityUrl = u; } -const ASN1_STRING *NAMING_AUTHORITY_get0_authorityText( - const NAMING_AUTHORITY *n) +const ASN1_STRING *NAMING_AUTHORITY_get0_authorityText(const NAMING_AUTHORITY *n) { return n->namingAuthorityText; } -void NAMING_AUTHORITY_set0_authorityText(NAMING_AUTHORITY *n, ASN1_STRING* t) +void NAMING_AUTHORITY_set0_authorityText(NAMING_AUTHORITY *n, ASN1_STRING *t) { ASN1_IA5STRING_free(n->namingAuthorityText); n->namingAuthorityText = t; diff --git a/deps/openssl/openssl/crypto/x509/v3_san.c b/deps/openssl/openssl/crypto/x509/v3_san.c index 34ca16a6d72dae..d4999f1fc6c713 100644 --- a/deps/openssl/openssl/crypto/x509/v3_san.c +++ b/deps/openssl/openssl/crypto/x509/v3_san.c @@ -336,7 +336,7 @@ static GENERAL_NAMES *v2i_issuer_alt(X509V3_EXT_METHOD *method, static int copy_issuer(X509V3_CTX *ctx, GENERAL_NAMES *gens) { - GENERAL_NAMES *ialt; + GENERAL_NAMES *ialt = NULL; GENERAL_NAME *gen; X509_EXTENSION *ext; int i, num; @@ -371,6 +371,7 @@ static int copy_issuer(X509V3_CTX *ctx, GENERAL_NAMES *gens) return 1; err: + sk_GENERAL_NAME_free(ialt); return 0; } diff --git a/deps/openssl/openssl/crypto/x509/x509_cmp.c b/deps/openssl/openssl/crypto/x509/x509_cmp.c index 989fb8faa9f465..f2c3a568198d8f 100644 --- a/deps/openssl/openssl/crypto/x509/x509_cmp.c +++ b/deps/openssl/openssl/crypto/x509/x509_cmp.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -196,6 +196,8 @@ int X509_add_cert(STACK_OF(X509) *sk, X509 *cert, int flags) ERR_raise(ERR_LIB_X509, ERR_R_PASSED_NULL_PARAMETER); return 0; } + if (cert == NULL) + return 0; if ((flags & X509_ADD_FLAG_NO_DUP) != 0) { /* * not using sk_X509_set_cmp_func() and sk_X509_find() diff --git a/deps/openssl/openssl/crypto/x509/x_all.c b/deps/openssl/openssl/crypto/x509/x_all.c index e58c9ab1c117b4..158e11a8649c5f 100644 --- a/deps/openssl/openssl/crypto/x509/x_all.c +++ b/deps/openssl/openssl/crypto/x509/x_all.c @@ -92,11 +92,13 @@ int X509_sign_ctx(X509 *x, EVP_MD_CTX *ctx) static ASN1_VALUE *simple_get_asn1(const char *url, BIO *bio, BIO *rbio, int timeout, const ASN1_ITEM *it) { + size_t max_resp_len = (it == ASN1_ITEM_rptr(X509_CRL)) ? + OSSL_HTTP_DEFAULT_MAX_CRL_LEN : OSSL_HTTP_DEFAULT_MAX_RESP_LEN; BIO *mem = OSSL_HTTP_get(url, NULL /* proxy */, NULL /* no_proxy */, bio, rbio, NULL /* cb */, NULL /* arg */, 1024 /* buf_size */, NULL /* headers */, NULL /* expected_ct */, 1 /* expect_asn1 */, - OSSL_HTTP_DEFAULT_MAX_RESP_LEN, timeout); + max_resp_len, timeout); ASN1_VALUE *res = ASN1_item_d2i_bio(it, mem, NULL); BIO_free(mem); diff --git a/deps/openssl/openssl/demos/cipher/aesccm.c b/deps/openssl/openssl/demos/cipher/aesccm.c index 5a2d4281506e15..f4430e727b2f51 100644 --- a/deps/openssl/openssl/demos/cipher/aesccm.c +++ b/deps/openssl/openssl/demos/cipher/aesccm.c @@ -94,7 +94,7 @@ int aes_ccm_encrypt(void) if ((cipher = EVP_CIPHER_fetch(libctx, "AES-192-CCM", propq)) == NULL) goto err; - /* Set nonce length if default 96 bits is not appropriate */ + /* Default nonce length for AES-CCM is 7 bytes (56 bits). */ params[0] = OSSL_PARAM_construct_size_t(OSSL_CIPHER_PARAM_AEAD_IVLEN, &ccm_nonce_len); /* Set tag length */ diff --git a/deps/openssl/openssl/doc/build.info b/deps/openssl/openssl/doc/build.info index f7791462739589..0279e2390a3242 100644 --- a/deps/openssl/openssl/doc/build.info +++ b/deps/openssl/openssl/doc/build.info @@ -2271,10 +2271,6 @@ DEPEND[html/man3/SSL_CTX_set_psk_client_callback.html]=man3/SSL_CTX_set_psk_clie GENERATE[html/man3/SSL_CTX_set_psk_client_callback.html]=man3/SSL_CTX_set_psk_client_callback.pod DEPEND[man/man3/SSL_CTX_set_psk_client_callback.3]=man3/SSL_CTX_set_psk_client_callback.pod GENERATE[man/man3/SSL_CTX_set_psk_client_callback.3]=man3/SSL_CTX_set_psk_client_callback.pod -DEPEND[html/man3/SSL_CTX_set_quic_method.html]=man3/SSL_CTX_set_quic_method.pod -GENERATE[html/man3/SSL_CTX_set_quic_method.html]=man3/SSL_CTX_set_quic_method.pod -DEPEND[man/man3/SSL_CTX_set_quic_method.3]=man3/SSL_CTX_set_quic_method.pod -GENERATE[man/man3/SSL_CTX_set_quic_method.3]=man3/SSL_CTX_set_quic_method.pod DEPEND[html/man3/SSL_CTX_set_quiet_shutdown.html]=man3/SSL_CTX_set_quiet_shutdown.pod GENERATE[html/man3/SSL_CTX_set_quiet_shutdown.html]=man3/SSL_CTX_set_quiet_shutdown.pod DEPEND[man/man3/SSL_CTX_set_quiet_shutdown.3]=man3/SSL_CTX_set_quiet_shutdown.pod @@ -3355,7 +3351,6 @@ html/man3/SSL_CTX_set_msg_callback.html \ html/man3/SSL_CTX_set_num_tickets.html \ html/man3/SSL_CTX_set_options.html \ html/man3/SSL_CTX_set_psk_client_callback.html \ -html/man3/SSL_CTX_set_quic_method.html \ html/man3/SSL_CTX_set_quiet_shutdown.html \ html/man3/SSL_CTX_set_read_ahead.html \ html/man3/SSL_CTX_set_record_padding_callback.html \ @@ -3964,7 +3959,6 @@ man/man3/SSL_CTX_set_msg_callback.3 \ man/man3/SSL_CTX_set_num_tickets.3 \ man/man3/SSL_CTX_set_options.3 \ man/man3/SSL_CTX_set_psk_client_callback.3 \ -man/man3/SSL_CTX_set_quic_method.3 \ man/man3/SSL_CTX_set_quiet_shutdown.3 \ man/man3/SSL_CTX_set_read_ahead.3 \ man/man3/SSL_CTX_set_record_padding_callback.3 \ diff --git a/deps/openssl/openssl/doc/man1/openssl-ca.pod.in b/deps/openssl/openssl/doc/man1/openssl-ca.pod.in index 1d497e848e796e..1c07db3c8ef167 100644 --- a/deps/openssl/openssl/doc/man1/openssl-ca.pod.in +++ b/deps/openssl/openssl/doc/man1/openssl-ca.pod.in @@ -701,7 +701,7 @@ A sample configuration file with the relevant sections for this command: default_days = 365 # how long to certify for default_crl_days= 30 # how long before next CRL - default_md = md5 # md to use + default_md = sha256 # md to use policy = policy_any # default policy email_in_dn = no # Don't add the email into cert DN diff --git a/deps/openssl/openssl/doc/man1/openssl-cmp.pod.in b/deps/openssl/openssl/doc/man1/openssl-cmp.pod.in index 9240916fce40fe..889a59cd497ecd 100644 --- a/deps/openssl/openssl/doc/man1/openssl-cmp.pod.in +++ b/deps/openssl/openssl/doc/man1/openssl-cmp.pod.in @@ -453,8 +453,11 @@ Reason numbers defined in RFC 5280 are: =item B<-server> I<[http[s]://][userinfo@]host[:port][/path][?query][#fragment]> -The DNS hostname or IP address and optionally port +The I domain name or IP address and optionally I of the CMP server to connect to using HTTP(S). +IP address may be for v4 or v6, such as C<127.0.0.1> or C<[::1]> for localhost. +If the host string is an IPv6 address, it must be enclosed in C<[> and C<]>. + This option excludes I<-port> and I<-use_mock_srv>. It is ignored if I<-rspin> is given with enough filename arguments. @@ -468,6 +471,7 @@ If a path is included it provides the default value for the B<-path> option. The HTTP(S) proxy server to use for reaching the CMP server unless B<-no_proxy> applies, see below. +If the host string is an IPv6 address, it must be enclosed in C<[> and C<]>. The proxy port defaults to 80 or 443 if the scheme is C; apart from that the optional C or C prefix is ignored (note that TLS may be selected by B<-tls_used>), as well as any path, userinfo, and query, and fragment @@ -969,8 +973,9 @@ This excludes the B<-server> and B<-port> options. =item B<-port> I -Act as HTTP-based CMP server mock-up listening on the given port. -This excludes the B<-server> and B<-use_mock_srv> options. +Act as HTTP-based CMP server mock-up listening on the given local port. +The client may address the server via, e.g., C<127.0.0.1> or C<[::1]>. +This option excludes the B<-server> and B<-use_mock_srv> options. The B<-rspin>, B<-rspout>, B<-reqin>, and B<-reqout> options so far are not supported in this mode. diff --git a/deps/openssl/openssl/doc/man1/openssl-cms.pod.in b/deps/openssl/openssl/doc/man1/openssl-cms.pod.in index 65a61ee97f1d6a..f4d12312b7cbcb 100644 --- a/deps/openssl/openssl/doc/man1/openssl-cms.pod.in +++ b/deps/openssl/openssl/doc/man1/openssl-cms.pod.in @@ -191,6 +191,10 @@ to the output file. Verify signed data. Expects a signed data on input and outputs the signed data. Both clear text and opaque signing is supported. +By default, validation of signer certificates and their chain +is done w.r.t. the S/MIME signing (C) purpose. +For details see L. + =item B<-resign> Resign a message: take an existing message and one or more new signers. @@ -374,7 +378,8 @@ See L for details. =item B<-originator> I A certificate of the originator of the encrypted message. Necessary for -decryption when Key Agreement is in use for a shared key. +decryption when Key Agreement is in use for a shared key. Currently, not +allowed for encryption. =item B<-recip> I @@ -902,7 +907,7 @@ The B<-engine> option was deprecated in OpenSSL 3.0. =head1 COPYRIGHT -Copyright 2008-2023 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2008-2025 The OpenSSL Project Authors. All Rights Reserved. Licensed under the Apache License 2.0 (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/openssl/doc/man1/openssl-fipsinstall.pod.in b/deps/openssl/openssl/doc/man1/openssl-fipsinstall.pod.in index 97e2ae910c170b..57758597cdaeb4 100644 --- a/deps/openssl/openssl/doc/man1/openssl-fipsinstall.pod.in +++ b/deps/openssl/openssl/doc/man1/openssl-fipsinstall.pod.in @@ -239,6 +239,10 @@ L, L, L +=head1 HISTORY + +The B application was added in OpenSSL 3.0. + =head1 COPYRIGHT Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved. diff --git a/deps/openssl/openssl/doc/man1/openssl-info.pod.in b/deps/openssl/openssl/doc/man1/openssl-info.pod.in index fe7abee4867673..0e91bb28ee10d3 100644 --- a/deps/openssl/openssl/doc/man1/openssl-info.pod.in +++ b/deps/openssl/openssl/doc/man1/openssl-info.pod.in @@ -17,7 +17,6 @@ B [B<-listsep>] [B<-seeds>] [B<-cpusettings>] -[B<-quic>] =head1 DESCRIPTION @@ -74,10 +73,6 @@ Outputs the randomness seed sources. Outputs the OpenSSL CPU settings info. -=item B<-quic> - -Outputs the OpenSSL QUIC info. - =back =head1 HISTORY diff --git a/deps/openssl/openssl/doc/man1/openssl-ocsp.pod.in b/deps/openssl/openssl/doc/man1/openssl-ocsp.pod.in index fbad5079af6756..fd23a44df063fd 100644 --- a/deps/openssl/openssl/doc/man1/openssl-ocsp.pod.in +++ b/deps/openssl/openssl/doc/man1/openssl-ocsp.pod.in @@ -30,8 +30,8 @@ B B [B<-respin> I] [B<-url> I] [B<-host> I:I] -[B<-path>] -[B<-proxy> I<[http[s]://][userinfo@]host[:port][/path]>] +[B<-path> I] +[B<-proxy> I<[http[s]://][userinfo@]host[:port][/path][?query][#fragment]>] [B<-no_proxy> I] [B<-header>] [B<-timeout> I] @@ -160,24 +160,32 @@ with B<-serial>, B<-cert> and B<-host> options). =item B<-url> I -Specify the responder URL. Both HTTP and HTTPS (SSL/TLS) URLs can be specified. +Specify the responder host and optionally port and path via a URL. +Both HTTP and HTTPS (SSL/TLS) URLs can be specified. The optional userinfo and fragment components are ignored. Any given query component is handled as part of the path component. +For details, see the B<-host> and B<-path> options described next. -=item B<-host> I:I, B<-path> I +=item B<-host> I:I, B<-path> I If the B<-host> option is present then the OCSP request is sent to the host -I on port I. The B<-path> option specifies the HTTP pathname -to use or "/" by default. This is equivalent to specifying B<-url> with scheme -http:// and the given hostname, port, and pathname. +I on port I. +The I may be a domain name or an IP (v4 or v6) address, +such as C<127.0.0.1> or C<[::1]> for localhost. +If it is an IPv6 address, it must be enclosed in C<[> and C<]>. -=item B<-proxy> I<[http[s]://][userinfo@]host[:port][/path]> +The B<-path> option specifies the HTTP pathname to use or "/" by default. +This is equivalent to specifying B<-url> with scheme +http:// and the given I, I, and optional I. + +=item B<-proxy> I<[http[s]://][userinfo@]host[:port][/path][?query][#fragment]> The HTTP(S) proxy server to use for reaching the OCSP server unless B<-no_proxy> applies, see below. +If the host string is an IPv6 address, it must be enclosed in C<[> and C<]>. The proxy port defaults to 80 or 443 if the scheme is C; apart from that the optional C or C prefix is ignored, -as well as any userinfo and path components. +as well as any userinfo, path, query, and fragment components. Defaults to the environment variable C if set, else C in case no TLS is used, otherwise C if set, else C. @@ -369,8 +377,8 @@ subject name. =item B<-port> I -Port to listen for OCSP requests on. The port may also be specified -using the B option. +Port to listen for OCSP requests on. Both IPv4 and IPv6 are possible. +The port may also be specified using the B<-url> option. A C<0> argument indicates that any available port shall be chosen automatically. =item B<-ignore_err> diff --git a/deps/openssl/openssl/doc/man1/openssl-pkeyutl.pod.in b/deps/openssl/openssl/doc/man1/openssl-pkeyutl.pod.in index cf3427a35c0b35..2f6ef0021d1446 100644 --- a/deps/openssl/openssl/doc/man1/openssl-pkeyutl.pod.in +++ b/deps/openssl/openssl/doc/man1/openssl-pkeyutl.pod.in @@ -44,6 +44,8 @@ B B This command can be used to perform low-level public key operations using any supported algorithm. +By default the signing operation (see B<-sign> option) is assumed. + =head1 OPTIONS =over 4 @@ -59,20 +61,29 @@ if this option is not specified. =item B<-rawin> -This indicates that the input data is raw data, which is not hashed by any -message digest algorithm. The user can specify a digest algorithm by using -the B<-digest> option. This option can only be used with B<-sign> and -B<-verify> and must be used with the Ed25519 and Ed448 algorithms. +This indicates that the signature or verification input data is raw data, +which is not hashed by any message digest algorithm. +Except with EdDSA, +the user can specify a digest algorithm by using the B<-digest> option. +For signature algorithms like RSA, DSA and ECDSA, +the default digest algorithm is SHA-256. For SM2, it is SM3. + +This option can only be used with B<-sign> and B<-verify>. +For EdDSA (the Ed25519 and Ed448 algorithms) this option is required. =item B<-digest> I -This specifies the digest algorithm which is used to hash the input data before -signing or verifying it with the input key. This option could be omitted if the -signature algorithm does not require one (for instance, EdDSA). If this option -is omitted but the signature algorithm requires one, a default value will be -used. For signature algorithms like RSA, DSA and ECDSA, SHA-256 will be the -default digest algorithm. For SM2, it will be SM3. If this option is present, -then the B<-rawin> option must be also specified. +This option can only be used with B<-sign> and B<-verify>. +It specifies the digest algorithm that is used to hash the input data +before signing or verifying it with the input key. This option could be omitted +if the signature algorithm does not require preprocessing the input through +a pluggable hash function before signing (for instance, EdDSA). If this option +is omitted but the signature algorithm requires one and the B<-rawin> option +is given, a default value will be used (see B<-rawin> for details). +If this option is present, then the B<-rawin> option is required. + +At this time, HashEdDSA (the ph or "prehash" variant of EdDSA) is not supported, +so the B<-digest> option cannot be used with EdDSA. =item B<-out> I @@ -81,7 +92,7 @@ default. =item B<-sigfile> I -Signature file, required for B<-verify> operations only +Signature file, required and allowed for B<-verify> operations only =item B<-inkey> I|I @@ -117,21 +128,42 @@ The input is a certificate containing a public key. =item B<-rev> Reverse the order of the input buffer. This is useful for some libraries -(such as CryptoAPI) which represent the buffer in little endian format. +(such as CryptoAPI) which represent the buffer in little-endian format. +This cannot be used in conjunction with B<-rawin>. =item B<-sign> -Sign the input data (which must be a hash) and output the signed result. This -requires a private key. +Sign the input data and output the signed result. This requires a private key. +Using a message digest operation along with this is recommended, +when applicable, see the B<-rawin> and B<-digest> options for details. +Otherwise, the input data given with the B<-in> option is assumed to already +be a digest, but this may then require an additional B<-pkeyopt> CI +in some cases (e.g., RSA with the default PKCS#1 padding mode). +Even for other algorithms like ECDSA, where the additional B<-pkeyopt> option +does not affect signature output, it is recommended, as it enables +checking that the input length is consistent with the intended digest. =item B<-verify> -Verify the input data (which must be a hash) against the signature file and -indicate if the verification succeeded or failed. +Verify the input data against the signature given with the B<-sigfile> option +and indicate if the verification succeeded or failed. +The input data given with the B<-in> option is assumed to be a hash value +unless the B<-rawin> option is specified or implied. +With raw data, when a digest algorithm is applicable, though it may be inferred +from the signature or take a default value, it should also be specified. =item B<-verifyrecover> -Verify the input data (which must be a hash) and output the recovered data. +Verify the given signature and output the recovered data (signature payload). +For example, in case of RSA PKCS#1 the recovered data is the B +DER encoding of the digest algorithm OID and value as specified in +L. + +Note that here the input given with the B<-in> option is not a signature input +(as with the B<-sign> and B<-verify> options) but a signature output value, +typically produced using the B<-sign> option. + +This option is available only for use with RSA keys. =item B<-encrypt> @@ -175,8 +207,9 @@ hex dump the output data. =item B<-asn1parse> -Parse the ASN.1 output data, this is useful when combined with the -B<-verifyrecover> option when an ASN1 structure is signed. +Parse the ASN.1 output data to check its DER encoding and print any errors. +When combined with the B<-verifyrecover> option, this may be useful only in case +an ASN.1 DER-encoded structure had been signed directly (without hashing it). {- $OpenSSL::safe::opt_engine_item -} @@ -200,8 +233,8 @@ engine I for crypto operations. The operations and options supported vary according to the key algorithm and its implementation. The OpenSSL operations and options are indicated below. -Unless otherwise mentioned all algorithms support the BI option -which specifies the digest in use for sign, verify and verifyrecover operations. +Unless otherwise mentioned, all algorithms support the BI option, +which specifies the digest in use for the signing and verification operations. The value I should represent a digest name as used in the EVP_get_digestbyname() function for example B. This value is not used to hash the input data. It is used (by some algorithms) for sanity-checking the diff --git a/deps/openssl/openssl/doc/man1/openssl-req.pod.in b/deps/openssl/openssl/doc/man1/openssl-req.pod.in index a56f548de8ee08..7ba599b54a0696 100644 --- a/deps/openssl/openssl/doc/man1/openssl-req.pod.in +++ b/deps/openssl/openssl/doc/man1/openssl-req.pod.in @@ -638,7 +638,7 @@ Sample configuration file prompting for field values: attributes = req_attributes req_extensions = v3_ca - dirstring_type = nobmp + dirstring_type = nombstr [ req_distinguished_name ] countryName = Country Name (2 letter code) @@ -778,7 +778,7 @@ The <-nodes> option was deprecated in OpenSSL 3.0, too; use B<-noenc> instead. =head1 COPYRIGHT -Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2000-2025 The OpenSSL Project Authors. All Rights Reserved. Licensed under the Apache License 2.0 (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/openssl/doc/man1/openssl-s_client.pod.in b/deps/openssl/openssl/doc/man1/openssl-s_client.pod.in index bd6171aa265c69..caebe10bffb8d0 100644 --- a/deps/openssl/openssl/doc/man1/openssl-s_client.pod.in +++ b/deps/openssl/openssl/doc/man1/openssl-s_client.pod.in @@ -10,11 +10,11 @@ openssl-s_client - SSL/TLS client program B B [B<-help>] [B<-ssl_config> I
] -[B<-connect> I] +[B<-connect> I:I] [B<-host> I] [B<-port> I] -[B<-bind> I] -[B<-proxy> I] +[B<-bind> I:I] +[B<-proxy> I:I] [B<-proxy_user> I] [B<-proxy_pass> I] [B<-unix> I] @@ -157,6 +157,7 @@ This specifies the host and optional port to connect to. It is possible to select the host and port using the optional target positional argument instead. If neither this nor the target positional argument are specified then an attempt is made to connect to the local host on port 4433. +If the host string is an IPv6 address, it must be enclosed in C<[> and C<]>. =item B<-host> I @@ -166,17 +167,19 @@ Host to connect to; use B<-connect> instead. Connect to the specified port; use B<-connect> instead. -=item B<-bind> I +=item B<-bind> I:I This specifies the host address and or port to bind as the source for the connection. For Unix-domain sockets the port is ignored and the host is used as the source socket address. +If the host string is an IPv6 address, it must be enclosed in C<[> and C<]>. -=item B<-proxy> I +=item B<-proxy> I:I When used with the B<-connect> flag, the program uses the host and port specified with this flag and issues an HTTP CONNECT command to connect to the desired server. +If the host string is an IPv6 address, it must be enclosed in C<[> and C<]>. =item B<-proxy_user> I @@ -260,7 +263,9 @@ See L for details. =item B<-crl_download> -Download CRL from distribution points in the certificate. +Download CRL from distribution points in the certificate. Note that this option +is ignored if B<-crl_check> option is not provided. Note that the maximum size +of CRL is limited by L function. =item B<-key> I|I @@ -282,14 +287,20 @@ see L. The verify depth to use. This specifies the maximum length of the server certificate chain and turns on server certificate verification. -Currently the verify operation continues after errors so all the problems +Unless the B<-verify_return_error> option is given, +the verify operation continues after errors so all the problems with a certificate chain can be seen. As a side effect the connection will never fail due to a server certificate verify failure. +By default, validation of server certificates and their chain +is done w.r.t. the (D)TLS Server (C) purpose. +For details see L. + =item B<-verify_return_error> -Return verification errors instead of continuing. This will typically -abort the handshake with a fatal error. +Turns on server certificate verification, like with B<-verify>, +but returns verification errors instead of continuing. +This will typically abort the handshake with a fatal error. =item B<-verify_quiet> @@ -799,10 +810,11 @@ proceed unless the B<-verify_return_error> option is used. =item I:I -Rather than providing B<-connect>, the target hostname and optional port may +Rather than providing B<-connect>, the target host and optional port may be provided as a single positional argument after all options. If neither this nor B<-connect> are provided, falls back to attempting to connect to I on port I<4433>. +If the host string is an IPv6 address, it must be enclosed in C<[> and C<]>. =back @@ -881,6 +893,51 @@ option: any verify errors are then returned aborting the handshake. The B<-bind> option may be useful if the server or a firewall requires connections to come from some particular address and or port. +=head2 Note on Non-Interactive Use + +When B is run in a non-interactive environment (e.g., a cron job or +a script without a valid I), it may close the connection prematurely, +especially with TLS 1.3. To prevent this, you can use the B<-ign_eof> flag, +which keeps B running even after reaching EOF from I. + +For example: + + openssl s_client -connect :443 -tls1_3 + -sess_out /path/to/tls_session_params_file + -ign_eof can lead to issues if the server keeps +the connection open, expecting the client to close first. In such cases, the +client may hang indefinitely. This behavior is not uncommon, particularly with +protocols where the server waits for a graceful disconnect from the client. + +For example, when connecting to an SMTP server, the session may pause if the +server expects a QUIT command before closing: + + $ openssl s_client -brief -ign_eof -starttls smtp + -connect :25 :25 + -starttls smtp -brief -ign_eof + +Similarly, for HTTP/1.1 connections, including a `Connection: close` header +ensures the server closes the connection after responding: + + printf 'GET / HTTP/1.1\r\nHost: \r\nConnection: close\r\n\r\n' + | openssl s_client -connect :443 -brief + +These approaches help manage the connection closure gracefully and prevent +hangs caused by the server waiting for the client to initiate the disconnect. + =head1 BUGS Because this program has a lot of options and also because some of the diff --git a/deps/openssl/openssl/doc/man1/openssl-s_server.pod.in b/deps/openssl/openssl/doc/man1/openssl-s_server.pod.in index 99a252a8225453..f0825ad33d1fc3 100644 --- a/deps/openssl/openssl/doc/man1/openssl-s_server.pod.in +++ b/deps/openssl/openssl/doc/man1/openssl-s_server.pod.in @@ -74,7 +74,7 @@ B B [B<-status>] [B<-status_verbose>] [B<-status_timeout> I] -[B<-proxy> I<[http[s]://][userinfo@]host[:port][/path]>] +[B<-proxy> I<[http[s]://][userinfo@]host[:port][/path][?query][#fragment]>] [B<-no_proxy> I] [B<-status_url> I] [B<-status_file> I] @@ -202,6 +202,10 @@ must supply a certificate or an error occurs. If the cipher suite cannot request a client certificate (for example an anonymous cipher suite or PSK) this option has no effect. +By default, validation of any supplied client certificate and its chain +is done w.r.t. the (D)TLS Client (C) purpose. +For details see L. + =item B<-cert> I The certificate to use, most servers cipher suites require the use of a @@ -504,13 +508,14 @@ a verbose printout of the OCSP response. Sets the timeout for OCSP response to I seconds. -=item B<-proxy> I<[http[s]://][userinfo@]host[:port][/path]> +=item B<-proxy> I<[http[s]://][userinfo@]host[:port][/path][?query][#fragment]> The HTTP(S) proxy server to use for reaching the OCSP server unless B<-no_proxy> applies, see below. +If the host string is an IPv6 address, it must be enclosed in C<[> and C<]>. The proxy port defaults to 80 or 443 if the scheme is C; apart from that the optional C or C prefix is ignored, -as well as any userinfo and path components. +as well as any userinfo, path, query, and fragment components. Defaults to the environment variable C if set, else C in case no TLS is used, otherwise C if set, else C. diff --git a/deps/openssl/openssl/doc/man1/openssl-s_time.pod.in b/deps/openssl/openssl/doc/man1/openssl-s_time.pod.in index 2b82cf1e98377d..ca41f59362f942 100644 --- a/deps/openssl/openssl/doc/man1/openssl-s_time.pod.in +++ b/deps/openssl/openssl/doc/man1/openssl-s_time.pod.in @@ -50,6 +50,7 @@ Print out a usage message. =item B<-connect> I:I This specifies the host and optional port to connect to. +If the host string is an IPv6 address, it must be enclosed in C<[> and C<]>. =item B<-www> I diff --git a/deps/openssl/openssl/doc/man1/openssl-smime.pod.in b/deps/openssl/openssl/doc/man1/openssl-smime.pod.in index 0b5dbb5df8f7fc..ffd09704f834e5 100644 --- a/deps/openssl/openssl/doc/man1/openssl-smime.pod.in +++ b/deps/openssl/openssl/doc/man1/openssl-smime.pod.in @@ -394,9 +394,9 @@ Verify a message and extract the signer's certificate if successful: Send encrypted mail using triple DES: - openssl smime -encrypt -in in.txt -from steve@openssl.org \ + openssl smime -encrypt -in in.txt -out mail.msg -from steve@openssl.org \ -to someone@somewhere -subject "Encrypted message" \ - -des3 user.pem -out mail.msg + -des3 user.pem Sign and encrypt mail: diff --git a/deps/openssl/openssl/doc/man1/openssl-ts.pod.in b/deps/openssl/openssl/doc/man1/openssl-ts.pod.in index 5f4895b34d6c4c..cd6dfd5305f037 100644 --- a/deps/openssl/openssl/doc/man1/openssl-ts.pod.in +++ b/deps/openssl/openssl/doc/man1/openssl-ts.pod.in @@ -584,10 +584,12 @@ To verify a timestamp reply that includes the certificate chain: -CAfile cacert.pem To verify a timestamp token against the original data file: + openssl ts -verify -data design2.txt -in design2.tsr \ -CAfile cacert.pem To verify a timestamp token against a message imprint: + openssl ts -verify -digest b7e5d3f93198b38379852f2c04e78d73abdd0f4b \ -in design2.tsr -CAfile cacert.pem diff --git a/deps/openssl/openssl/doc/man1/openssl-verification-options.pod b/deps/openssl/openssl/doc/man1/openssl-verification-options.pod index bf9ed9c1a62e1c..17fcd4eb79f586 100644 --- a/deps/openssl/openssl/doc/man1/openssl-verification-options.pod +++ b/deps/openssl/openssl/doc/man1/openssl-verification-options.pod @@ -24,8 +24,9 @@ The most important of them are detailed in the following sections. In a nutshell, a valid chain of certificates needs to be built up and verified starting from the I that is to be verified and ending in a certificate that due to some policy is trusted. -Verification is done relative to the given I, which is the intended use -of the target certificate, such as SSL server, or by default for any purpose. +Certificate validation can be performed in the context of a I, which +is a high-level specification of the intended use of the target certificate, +such as C for TLS servers, or (by default) for any purpose. The details of how each OpenSSL command handles errors are documented on the specific command page. @@ -150,16 +151,17 @@ the chain components and their links are checked thoroughly. The first step is to check that each certificate is well-formed. Part of these checks are enabled only if the B<-x509_strict> option is given. -The second step is to check the extensions of every untrusted certificate -for consistency with the supplied purpose. -If the B<-purpose> option is not given then no such checks are done -except for SSL/TLS connection setup, -where by default C or C, are checked. -The target or "leaf" certificate, as well as any other untrusted certificates, -must have extensions compatible with the specified purpose. -All certificates except the target or "leaf" must also be valid CA certificates. -The precise extensions required are described in more detail in -L. +The second step is to check the X.509v3 extensions of every certificate +for consistency with the intended specific purpose, if any. +If the B<-purpose> option is not given then no such checks are done except for +CMS signature checking, where by default C is checked, and SSL/(D)TLS +connection setup, where by default C or C are checked. +The X.509v3 extensions of the target or "leaf" certificate +must be compatible with the specified purpose. +All other certificates down the chain are checked to be valid CA certificates, +and possibly also further non-standard checks are performed. +The precise extensions required are described in detail +in the L section below. The third step is to check the trust settings on the last certificate (which typically is a self-signed root CA certificate). @@ -455,13 +457,16 @@ Set policy variable inhibit-policy-mapping (see RFC5280). =item B<-purpose> I -The intended use for the certificate. -Currently defined purposes are C, C, C, +A high-level specification of the intended use of the target certificate. +Currently predefined purposes are C, C, C, C, C, C, C, C, and C. If peer certificate verification is enabled, by default the TLS implementation -as well as the commands B and B check for consistency -with TLS server or TLS client use, respectively. +and thus the commands L and L +check for consistency with +TLS server (C) or TLS client use (C), respectively. +By default, CMS signature validation, which can be done via L, +checks for consistency with S/MIME signing use (C). While IETF RFC 5280 says that B and B are only for WWW use, in practice they are used for all kinds of TLS clients @@ -491,19 +496,20 @@ the subject certificate. =item B<-verify_name> I -Use default verification policies like trust model and required certificate -policies identified by I. +Use a set of verification parameters, also known as verification method, +identified by I. The currently predefined methods are named C, +C, C with alias C, and C. +These mimic the combinations of purpose and trust settings used in SSL/(D)TLS, +and CMS/PKCS7 (including S/MIME). + +The verification parameters include the trust model, various flags that can +partly be set also via other command-line options, and the verification purpose, +which in turn implies certificate key usage and extended key usage requirements. + The trust model determines which auxiliary trust or reject OIDs are applicable to verifying the given certificate chain. They can be given using the B<-addtrust> and B<-addreject> options for L. -Supported policy names include: B, B, B, -B, B. -These mimics the combinations of purpose and trust settings used in SSL, CMS -and S/MIME. -As of OpenSSL 1.1.0, the trust model is inferred from the purpose when not -specified, so the B<-verify_name> options are functionally equivalent to the -corresponding B<-purpose> settings. =back @@ -548,9 +554,8 @@ This option has no effect and is retained for backward compatibility only. =head2 Certificate Extensions -Options like B<-purpose> lead to checking the certificate extensions, -which determine what the target certificate and intermediate CA certificates -can be used for. +Options like B<-purpose> and B<-verify_name> trigger the processing of specific +certificate extensions, which determine what certificates can be used for. =head3 Basic Constraints @@ -574,87 +579,117 @@ keyCertSign bit set if the keyUsage extension is present. =head3 Extended Key Usage -The extKeyUsage (EKU) extension places additional restrictions on the -certificate uses. If this extension is present (whether critical or not) -the key can only be used for the purposes specified. - -A complete description of each check is given below. The comments about +The extKeyUsage (EKU) extension places additional restrictions on +certificate use. If this extension is present (whether critical or not) +in an end-entity certficiate, the key is allowed only for the uses specified, +while the special EKU B allows for all uses. + +Note that according to RFC 5280 section 4.2.1.12, +the Extended Key Usage extension will appear only in end-entity certificates, +and consequently the standard certification path validation described +in its section 6 does not include EKU checks for CA certificates. +The CA/Browser Forum requires for TLS server, S/MIME, and code signing use +the presence of respective EKUs in subordinate CA certificates (while excluding +them for root CA certificates), while taking over from RFC 5280 +the certificate validity concept and certificate path validation. + +For historic reasons, OpenSSL has its own way of interpreting and checking +EKU extensions on CA certificates, which may change in the future. +It does not require the presence of EKU extensions in CA certificates, +but in case the verification purpose is +C, C, C, C, or C, +it checks that any present EKU extension (that does not contain +B) contains the respective EKU as detailed below. +Moreover, it does these checks even for trust anchor certificates. + +=head3 Checks Implied by Specific Predefined Policies + +A specific description of each check is given below. The comments about basicConstraints and keyUsage and X.509v1 certificates above apply to B CA certificates. - =over 4 -=item B +=item B<(D)TLS Client> (C) -The extended key usage extension must be absent or include the "web client -authentication" OID. The keyUsage extension must be absent or it must have the -digitalSignature bit set. The Netscape certificate type must be absent -or it must have the SSL client bit set. +Any given extended key usage extension must allow for C +("TLS WWW client authentication"). -=item B +For target certificates, +the key usage must allow for C and/or C. +The Netscape certificate type must be absent or have the SSL client bit set. -The extended key usage extension must be absent or include the "web client -authentication" OID. -The Netscape certificate type must be absent or it must have the SSL CA bit set. -This is used as a work around if the basicConstraints extension is absent. +For all other certificates the normal CA checks apply. In addition, +the Netscape certificate type must be absent or have the SSL CA bit set. +This is used as a workaround if the basicConstraints extension is absent. -=item B +=item B<(D)TLS Server> (C) -The extended key usage extension must be absent or include the "web server -authentication" and/or one of the SGC OIDs. The keyUsage extension must be -absent or it -must have the digitalSignature, the keyEncipherment set or both bits set. -The Netscape certificate type must be absent or have the SSL server bit set. +Any given extended key usage extension must allow for C +("TLS WWW server authentication") and/or include one of the SGC OIDs. -=item B +For target certificates, the key usage must +allow for C, C, and/or C. +The Netscape certificate type must be absent or have the SSL server bit set. -The extended key usage extension must be absent or include the "web server -authentication" and/or one of the SGC OIDs. The Netscape certificate type must -be absent or the SSL CA bit must be set. -This is used as a work around if the basicConstraints extension is absent. +For all other certificates the normal CA checks apply. In addition, +the Netscape certificate type must be absent or have the SSL CA bit set. +This is used as a workaround if the basicConstraints extension is absent. -=item B +=item B (C) -For Netscape SSL clients to connect to an SSL server it must have the -keyEncipherment bit set if the keyUsage extension is present. This isn't +In addition to what has been described for B, for a Netscape +SSL client to connect to an SSL server, its EE certficate must have the +B bit set if the keyUsage extension is present. This isn't always valid because some cipher suites use the key for digital signing. Otherwise it is the same as a normal SSL server. -=item B +=item B -The extended key usage extension must be absent or include the "email -protection" OID. The Netscape certificate type must be absent or should have the -S/MIME bit set. If the S/MIME bit is not set in the Netscape certificate type +Any given extended key usage extension must allow for C. + +For target certificates, +the Netscape certificate type must be absent or should have the S/MIME bit set. +If the S/MIME bit is not set in the Netscape certificate type then the SSL client bit is tolerated as an alternative but a warning is shown. This is because some Verisign certificates don't set the S/MIME bit. -=item B +For all other certificates the normal CA checks apply. In addition, +the Netscape certificate type must be absent or have the S/MIME CA bit set. +This is used as a workaround if the basicConstraints extension is absent. + +=item B (C) + +In addition to the common S/MIME checks, for target certficiates +the key usage must allow for C and/or B. + +=item B (C) + +In addition to the common S/MIME checks, for target certficiates +the key usage must allow for C. -In addition to the common S/MIME client tests the digitalSignature bit or -the nonRepudiation bit must be set if the keyUsage extension is present. +=item B (C) -=item B +For target certificates, the key usage must allow for C. -In addition to the common S/MIME tests the keyEncipherment bit must be set -if the keyUsage extension is present. +For all other certifcates the normal CA checks apply. +Except in this case the basicConstraints extension must be present. -=item B +=item B (C) -The extended key usage extension must be absent or include the "email -protection" OID. The Netscape certificate type must be absent or must have the -S/MIME CA bit set. -This is used as a work around if the basicConstraints extension is absent. +For target certificates, no checks are performed at this stage, +but special checks apply; see L. -=item B +For all other certifcates the normal CA checks apply. -The keyUsage extension must be absent or it must have the CRL signing bit -set. +=item B (C) -=item B +For target certificates, if the key usage extension is present, it must include +C and/or C and must not include other bits. +The EKU extension must be present and contain C only. +Moreover, it must be marked as critical. -The normal CA tests apply. Except in this case the basicConstraints extension -must be present. +For all other certifcates the normal CA checks apply. =back @@ -671,6 +706,7 @@ only the first one (in the mentioned order of locations) is recognised. =head1 SEE ALSO L, +L, L, L, L, diff --git a/deps/openssl/openssl/doc/man1/openssl.pod b/deps/openssl/openssl/doc/man1/openssl.pod index 201428e8700479..4865e5c33e6eba 100644 --- a/deps/openssl/openssl/doc/man1/openssl.pod +++ b/deps/openssl/openssl/doc/man1/openssl.pod @@ -653,111 +653,22 @@ See L for a more detailed description. =head1 ENVIRONMENT -The OpenSSL library can be take some configuration parameters from the -environment. Some of these variables are listed below. For information -about specific commands, see L, -L, and L. - -For information about the use of environment variables in configuration, -see L. - -For information about querying or specifying CPU architecture flags, see -L, and L. +The OpenSSL libraries can take some configuration parameters from the +environment. For information about all environment variables used by the OpenSSL libraries, +such as B, B, and B, see L. -=over 4 - -=item BI[,...] - -Enable tracing output of OpenSSL library, by name. -This output will only make sense if you know OpenSSL internals well. -Also, it might not give you any output at all, depending on how -OpenSSL was built. - -The value is a comma separated list of names, with the following -available: - -=over 4 - -=item B - -Traces the OpenSSL trace API itself. - -=item B - -Traces OpenSSL library initialization and cleanup. - -=item B - -Traces the TLS/SSL protocol. - -=item B - -Traces the ciphers used by the TLS/SSL protocol. - -=item B - -Show details about provider and engine configuration. - -=item B - -The function that is used by RSA, DSA (etc) code to select registered -ENGINEs, cache defaults and functional references (etc), will generate -debugging summaries. - -=item B - -Reference counts in the ENGINE structure will be monitored with a line -of generated for each change. - -=item B - -Traces PKCS#5 v2 key generation. - -=item B - -Traces PKCS#12 key generation. - -=item B - -Traces PKCS#12 decryption. - -=item B - -Generates the complete policy tree at various points during X.509 v3 -policy evaluation. - -=item B - -Traces BIGNUM context operations. - -=item B - -Traces CMP client and server activity. - -=item B - -Traces STORE operations. - -=item B - -Traces decoder operations. - -=item B - -Traces encoder operations. - -=item B - -Traces decrementing certain ASN.1 structure references. +For information about the use of environment variables in configuration, +see L. -=back +For information about specific commands, see L, +L, and L. -=back +For information about querying or specifying CPU architecture flags, see +L, and L. -=head1 SEE ALSO L, L, diff --git a/deps/openssl/openssl/doc/man3/ASN1_TIME_set.pod b/deps/openssl/openssl/doc/man3/ASN1_TIME_set.pod index 66d9fefe1af6e5..bdef3fdbb15562 100644 --- a/deps/openssl/openssl/doc/man3/ASN1_TIME_set.pod +++ b/deps/openssl/openssl/doc/man3/ASN1_TIME_set.pod @@ -102,8 +102,8 @@ functions check the syntax of the time structure I. The ASN1_TIME_print(), ASN1_UTCTIME_print() and ASN1_GENERALIZEDTIME_print() functions print the time structure I to BIO I in human readable -format. It will be of the format MMM DD HH:MM:SS YYYY [GMT], for example -"Feb 3 00:55:52 2015 GMT", which does not include a newline. +format. It will be of the format MMM DD HH:MM:SS[.s*] YYYY GMT, for example +"Feb E<32>3 00:55:52 2015 GMT", which does not include a newline. If the time structure has invalid format it prints out "Bad time value" and returns an error. The output for generalized time may include a fractional part following the second. @@ -179,6 +179,10 @@ starting with B and B act only on that specific time format. The functions starting with B will operate on either format. +Users familiar with RFC822 should note that when specifying the flag +B the year will be formatted as documented above, +i.e., using 4 digits, not 2 as specified in RFC822. + =head1 BUGS ASN1_TIME_print(), ASN1_UTCTIME_print() and ASN1_GENERALIZEDTIME_print() do @@ -272,7 +276,7 @@ The ASN1_TIME_compare() function was added in OpenSSL 1.1.1. =head1 COPYRIGHT -Copyright 2015-2021 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2015-2025 The OpenSSL Project Authors. All Rights Reserved. Licensed under the Apache License 2.0 (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/openssl/doc/man3/ASN1_aux_cb.pod b/deps/openssl/openssl/doc/man3/ASN1_aux_cb.pod index f87b51d5efac26..9963ea1350252e 100644 --- a/deps/openssl/openssl/doc/man3/ASN1_aux_cb.pod +++ b/deps/openssl/openssl/doc/man3/ASN1_aux_cb.pod @@ -87,7 +87,7 @@ found for the purposes of reference counting. =item I A callback that will be invoked at various points during the processing of -the the B. See below for further details. +the B. See below for further details. =item I @@ -97,7 +97,7 @@ will be saved if the B flag has been set. =item I A callback that will be invoked at various points during the processing of -the the B. This is used in preference to the I callback if +the B. This is used in preference to the I callback if the B flag is set. See below for further details. =back @@ -274,7 +274,7 @@ B operation types were added in OpenSSL 3.0. =head1 COPYRIGHT -Copyright 2021-2023 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2021-2025 The OpenSSL Project Authors. All Rights Reserved. Licensed under the Apache License 2.0 (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/openssl/doc/man3/BIO_s_accept.pod b/deps/openssl/openssl/doc/man3/BIO_s_accept.pod index 25a752998caeb5..22b3d35b737488 100644 --- a/deps/openssl/openssl/doc/man3/BIO_s_accept.pod +++ b/deps/openssl/openssl/doc/man3/BIO_s_accept.pod @@ -169,16 +169,16 @@ BIO_set_bind_mode(), BIO_get_bind_mode() and BIO_do_accept() are macros. BIO_do_accept(), BIO_set_accept_name(), BIO_set_accept_port(), BIO_set_nbio_accept(), BIO_set_accept_bios(), BIO_set_accept_ip_family(), and BIO_set_bind_mode() -return 1 for success and <=0 for failure. +return 1 for success and <= 0 for failure. BIO_get_accept_name() returns the accept name or NULL on error. BIO_get_peer_name() returns the peer name or NULL on error. BIO_get_accept_port() returns the accept port as a string or NULL on error. BIO_get_peer_port() returns the peer port as a string or NULL on error. -BIO_get_accept_ip_family() returns the IP family or <=0 on error. +BIO_get_accept_ip_family() returns the IP family or <= 0 on error. -BIO_get_bind_mode() returns the set of B flags, or <=0 on failure. +BIO_get_bind_mode() returns the set of B flags, or <= 0 on failure. BIO_new_accept() returns a BIO or NULL on error. diff --git a/deps/openssl/openssl/doc/man3/BIO_s_connect.pod b/deps/openssl/openssl/doc/man3/BIO_s_connect.pod index ab813b32d03159..a3c9e6428e470d 100644 --- a/deps/openssl/openssl/doc/man3/BIO_s_connect.pod +++ b/deps/openssl/openssl/doc/man3/BIO_s_connect.pod @@ -59,7 +59,7 @@ a single call: that is it creates a new connect BIO with hostname B. BIO_set_conn_hostname() uses the string B to set the hostname. The hostname can be an IP address; if the address is an IPv6 one, it -must be enclosed with brackets C<[> and C<]>. +must be enclosed in brackets C<[> and C<]>. The hostname can also include the port in the form hostname:port; see L and BIO_set_conn_port() for details. diff --git a/deps/openssl/openssl/doc/man3/ECDSA_sign.pod b/deps/openssl/openssl/doc/man3/ECDSA_sign.pod index 7e5646665335a0..88e851885a0108 100644 --- a/deps/openssl/openssl/doc/man3/ECDSA_sign.pod +++ b/deps/openssl/openssl/doc/man3/ECDSA_sign.pod @@ -52,7 +52,7 @@ size use L with a NULL I parameter. ECDSA_sign() computes a digital signature of the I bytes hash value I using the private EC key I. The DER encoded signatures is -stored in I and its length is returned in I. Note: I must +stored in I and its length is returned in I. Note: I must point to ECDSA_size(eckey) bytes of memory. The parameter I is currently ignored. ECDSA_sign() is wrapper function for ECDSA_sign_ex() with I and I set to NULL. @@ -82,7 +82,7 @@ used in a later call to ECDSA_sign_ex() or ECDSA_do_sign_ex(). ECDSA_sign_ex() computes a digital signature of the I bytes hash value I using the private EC key I and the optional pre-computed values I and I. The DER encoded signature is stored in I and its -length is returned in I. Note: I must point to ECDSA_size(eckey) +length is returned in I. Note: I must point to ECDSA_size(eckey) bytes of memory. The parameter I is ignored. ECDSA_do_sign_ex() is similar to ECDSA_sign_ex() except the signature is diff --git a/deps/openssl/openssl/doc/man3/EVP_EncryptInit.pod b/deps/openssl/openssl/doc/man3/EVP_EncryptInit.pod index f037d135c9da06..a4635f994c2f9a 100644 --- a/deps/openssl/openssl/doc/man3/EVP_EncryptInit.pod +++ b/deps/openssl/openssl/doc/man3/EVP_EncryptInit.pod @@ -1284,6 +1284,15 @@ indicates whether the operation was successful. If it does not indicate success, the authentication operation has failed and any output data B be used as it is corrupted. +Please note that the number of authenticated bytes returned by +EVP_CipherUpdate() depends on the cipher used. Stream ciphers, such as ChaCha20 +or ciphers in GCM mode, can handle 1 byte at a time, resulting in an effective +"block" size of 1. Conversely, ciphers in OCB mode must process data one block +at a time, and the block size is returned. + +Regardless of the returned size, it is safe to pass unpadded data to an +EVP_CipherUpdate() call in a single operation. + =head2 GCM and OCB Modes The following Is are supported in GCM and OCB modes. @@ -1319,10 +1328,9 @@ For GCM, this call is only valid when decrypting data. For OCB, this call is valid when decrypting data to set the expected tag, and when encrypting to set the desired tag length. -In OCB mode, calling this when encrypting with C set to C sets the -tag length. The tag length can only be set before specifying an IV. If this is -not called prior to setting the IV during encryption, then a default tag length -is used. +In OCB mode, calling this with C set to C sets the tag length. +The tag length can only be set before specifying an IV. If this is not called +prior to setting the IV, then a default tag length is used. For OCB AES, the default tag length is 16 (i.e. 128 bits). It is also the maximum tag length for OCB. diff --git a/deps/openssl/openssl/doc/man3/EVP_PKEY_decapsulate.pod b/deps/openssl/openssl/doc/man3/EVP_PKEY_decapsulate.pod index 819291627bb8b8..cd6f5f0221a2bb 100644 --- a/deps/openssl/openssl/doc/man3/EVP_PKEY_decapsulate.pod +++ b/deps/openssl/openssl/doc/man3/EVP_PKEY_decapsulate.pod @@ -25,10 +25,13 @@ specifying the private key to use. The EVP_PKEY_decapsulate() function performs a private key decapsulation operation using I. The data to be decapsulated is specified using the I and I parameters. -If I is NULL then the maximum size of the output secret buffer +If I is NULL then the size of the output secret buffer is written to I<*unwrappedlen>. If I is not NULL and the call is successful then the decapsulated secret data is written to I -and the amount of data written to I<*unwrappedlen>. +and the amount of data written to I<*unwrappedlen>. Note that, if I +is not NULL in this call, the value it points to must be initialised to the length of +I, so that the call can validate it is of sufficient size to hold the +result of the operation. =head1 NOTES @@ -57,7 +60,7 @@ Decapsulate data using RSA: unsigned char *secret = NULL;; ctx = EVP_PKEY_CTX_new_from_pkey(libctx, rsa_priv_key, NULL); - if (ctx = NULL) + if (ctx == NULL) /* Error */ if (EVP_PKEY_decapsulate_init(ctx, NULL) <= 0) /* Error */ diff --git a/deps/openssl/openssl/doc/man3/EVP_PKEY_encapsulate.pod b/deps/openssl/openssl/doc/man3/EVP_PKEY_encapsulate.pod index 0ee7d627904d13..eb51836d795122 100644 --- a/deps/openssl/openssl/doc/man3/EVP_PKEY_encapsulate.pod +++ b/deps/openssl/openssl/doc/man3/EVP_PKEY_encapsulate.pod @@ -35,7 +35,10 @@ unless I is NULL. If I is not NULL and the call is successful then the internally generated key is written to I and its size is written to I<*genkeylen>. The encapsulated version of the generated key is written to -I and its size is written to I<*wrappedkeylen>. +I and its size is written to I<*wrappedkeylen>. Note that if +I is not NULL, then the value it points to must initially hold the size of +the I buffer so that its size can be validated by the call, ensuring +it is large enough to hold the result written to I. =head1 NOTES @@ -63,7 +66,7 @@ Encapsulate an RSASVE key (for RSA keys). unsigned char *out = NULL, *secret = NULL; ctx = EVP_PKEY_CTX_new_from_pkey(libctx, rsa_pub_key, NULL); - if (ctx = NULL) + if (ctx == NULL) /* Error */ if (EVP_PKEY_encapsulate_init(ctx, NULL) <= 0) /* Error */ diff --git a/deps/openssl/openssl/doc/man3/OSSL_CMP_CTX_new.pod b/deps/openssl/openssl/doc/man3/OSSL_CMP_CTX_new.pod index cab88ae88c9102..f2a38b0adef44f 100644 --- a/deps/openssl/openssl/doc/man3/OSSL_CMP_CTX_new.pod +++ b/deps/openssl/openssl/doc/man3/OSSL_CMP_CTX_new.pod @@ -355,8 +355,10 @@ If TLS is not used this defaults to the value of the environment variable C if set, else C. Otherwise defaults to the value of C if set, else C. An empty proxy string specifies not to use a proxy. -Else the format is C<[http[s]://]address[:port][/path]>, -where any path given is ignored. +Otherwise the format is +C<[http[s]://][userinfo@]host[:port][/path][?query][#fragment]>, +where any given userinfo, path, query, and fragment is ignored. +If the host string is an IPv6 address, it must be enclosed in C<[> and C<]>. The default port number is 80, or 443 in case C is given. OSSL_CMP_CTX_set1_no_proxy() sets the list of server hostnames not to use diff --git a/deps/openssl/openssl/doc/man3/OSSL_CMP_validate_msg.pod b/deps/openssl/openssl/doc/man3/OSSL_CMP_validate_msg.pod index 555624a4035836..c5e68065beff0f 100644 --- a/deps/openssl/openssl/doc/man3/OSSL_CMP_validate_msg.pod +++ b/deps/openssl/openssl/doc/man3/OSSL_CMP_validate_msg.pod @@ -44,7 +44,7 @@ any self-issued certificate from the I extraCerts field may be used as a trust anchor for the path verification of an 'acceptable' cert if it can be used also to validate the issued certificate returned in the IP message. This is according to TS 33.310 [Network Domain Security (NDS); Authentication Framework -(AF)] document specified by the The 3rd Generation Partnership Project (3GPP). +(AF)] document specified by The 3rd Generation Partnership Project (3GPP). Note that using this option is dangerous as the certificate obtained this way has not been authenticated (at least not at CMP level). Taking it over as a trust anchor implements trust-on-first-use (TOFU). @@ -77,7 +77,7 @@ The OpenSSL CMP support was added in OpenSSL 3.0. =head1 COPYRIGHT -Copyright 2007-2024 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2007-2025 The OpenSSL Project Authors. All Rights Reserved. Licensed under the Apache License 2.0 (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/openssl/doc/man3/OSSL_HTTP_parse_url.pod b/deps/openssl/openssl/doc/man3/OSSL_HTTP_parse_url.pod index 768f0acdb14c72..4379c122d66ac4 100644 --- a/deps/openssl/openssl/doc/man3/OSSL_HTTP_parse_url.pod +++ b/deps/openssl/openssl/doc/man3/OSSL_HTTP_parse_url.pod @@ -42,20 +42,25 @@ take any further default value from the C environment variable, or from C if I is nonzero. If I is NULL, take any default exclusion value from the C environment variable, or else from C. -Return the determined proxy hostname unless the exclusion contains I. +Return the determined proxy host unless the exclusion value, +which is a list of proxy hosts separated by C<,> and/or whitespace, +contains I. Otherwise return NULL. +When I is a string delimited by C<[> and C<]>, which are used for IPv6 +addresses, the enclosing C<[> and C<]> are stripped prior to comparison. OSSL_parse_url() parses its input string I as a URL of the form C<[scheme://][userinfo@]host[:port][/path][?query][#fragment]> and splits it up into scheme, userinfo, host, port, path, query, and fragment components. The host (or server) component may be a DNS name or an IP address -where IPv6 addresses should be enclosed in square brackets C<[> and C<]>. +where IPv6 addresses must be enclosed in square brackets C<[> and C<]>. The port component is optional and defaults to C<0>. If given, it must be in decimal form. If the I argument is not NULL the integer value of the port number is assigned to I<*pport_num> on success. The path component is also optional and defaults to C. Each non-NULL result pointer argument I, I, I, I, I, I, and I, is assigned the respective url component. +Any IPv6 address in I<*phost> is enclosed in C<[> and C<]>. On success, they are guaranteed to contain non-NULL string pointers, else NULL. It is the responsibility of the caller to free them using L. If I is NULL, any given query component is handled as part of the path. @@ -70,7 +75,7 @@ and the scheme is C, else 0. The port component is optional and defaults to C<443> if the scheme is C, else C<80>. Note that relative paths must be given with a leading C, -otherwise the first path element is interpreted as the hostname. +otherwise the first path element is interpreted as the host. Calling the deprecated function OCSP_parse_url(url, host, port, path, ssl) is equivalent to diff --git a/deps/openssl/openssl/doc/man3/OSSL_HTTP_transfer.pod b/deps/openssl/openssl/doc/man3/OSSL_HTTP_transfer.pod index 716e365ef50db0..6da1d91b9f37fa 100644 --- a/deps/openssl/openssl/doc/man3/OSSL_HTTP_transfer.pod +++ b/deps/openssl/openssl/doc/man3/OSSL_HTTP_transfer.pod @@ -77,12 +77,14 @@ If TLS is not used this defaults to the environment variable C if set, else C. If I != 0 it defaults to C if set, else C. An empty proxy string C<""> forbids using a proxy. -Else the format is +Otherwise, the format is C<[http[s]://][userinfo@]host[:port][/path][?query][#fragment]>, where any userinfo, path, query, and fragment given is ignored. +If the host string is an IPv6 address, it must be enclosed in C<[> and C<]>. The default proxy port number is 80, or 443 in case "https:" is given. The HTTP client functions connect via the given proxy unless the I -is found in the optional list I of proxy hostnames (if not NULL; +is found in the optional list I of proxy hostnames or IP addresses +separated by C<,> and/or whitespace (if not NULL; default is the environment variable C if set, else C). Proxying plain HTTP is supported directly, while using a proxy for HTTPS connections requires a suitable callback function diff --git a/deps/openssl/openssl/doc/man3/OSSL_PARAM.pod b/deps/openssl/openssl/doc/man3/OSSL_PARAM.pod index 1e5bf06cf767a7..22fd0f0d7dd7f3 100644 --- a/deps/openssl/openssl/doc/man3/OSSL_PARAM.pod +++ b/deps/openssl/openssl/doc/man3/OSSL_PARAM.pod @@ -11,7 +11,7 @@ OSSL_PARAM - a structure to pass or request object parameters typedef struct ossl_param_st OSSL_PARAM; struct ossl_param_st { const char *key; /* the name of the parameter */ - unsigned char data_type; /* declare what kind of content is in data */ + unsigned int data_type; /* declare what kind of content is in data */ void *data; /* value being passed in or out */ size_t data_size; /* data size */ size_t return_size; /* returned size */ diff --git a/deps/openssl/openssl/doc/man3/OSSL_trace_enabled.pod b/deps/openssl/openssl/doc/man3/OSSL_trace_enabled.pod index f9c9dffd8c6a8a..bad5b15153539f 100644 --- a/deps/openssl/openssl/doc/man3/OSSL_trace_enabled.pod +++ b/deps/openssl/openssl/doc/man3/OSSL_trace_enabled.pod @@ -88,9 +88,10 @@ but rather uses a set of convenience macros, see the L section below. OSSL_trace_enabled() can be used to check if tracing for the given I is enabled. -OSSL_trace_begin() is used to starts a tracing section, and get the -channel for the given I in form of a BIO. +OSSL_trace_begin() is used to start a tracing section, +and get the channel for the given I in form of a BIO. This BIO can only be used for output. +The pointer returned is NULL if the category is invalid or not enabled. OSSL_trace_end() is used to end a tracing section. @@ -187,6 +188,9 @@ expands to =head1 NOTES +It is not needed to guard trace output function calls like +I by I. + If producing the trace output requires carrying out auxiliary calculations, this auxiliary code should be placed inside a conditional block which is executed only if the trace category is enabled. diff --git a/deps/openssl/openssl/doc/man3/OpenSSL_version.pod b/deps/openssl/openssl/doc/man3/OpenSSL_version.pod index 946bb151bafeb1..e1cf16e2a109b9 100644 --- a/deps/openssl/openssl/doc/man3/OpenSSL_version.pod +++ b/deps/openssl/openssl/doc/man3/OpenSSL_version.pod @@ -211,14 +211,6 @@ automatically configured but may be set via an environment variable. The value has the same syntax as the environment variable. For x86 the string looks like C. -=item OPENSSL_INFO_QUIC - -This is only defined when compiling with a QUIC-enabled version of -OpenSSL. At run time, this will return "QUIC" if QUIC is supported. - -This can be used as a build time flag to determine if OpenSSL has -QUIC enabled. - =back For an unknown I, NULL is returned. diff --git a/deps/openssl/openssl/doc/man3/SSL_CIPHER_get_name.pod b/deps/openssl/openssl/doc/man3/SSL_CIPHER_get_name.pod index a55ad4d980f9b9..09b7280bdd581b 100644 --- a/deps/openssl/openssl/doc/man3/SSL_CIPHER_get_name.pod +++ b/deps/openssl/openssl/doc/man3/SSL_CIPHER_get_name.pod @@ -13,7 +13,6 @@ SSL_CIPHER_get_digest_nid, SSL_CIPHER_get_handshake_digest, SSL_CIPHER_get_kx_nid, SSL_CIPHER_get_auth_nid, -SSL_CIPHER_get_prf_nid, SSL_CIPHER_is_aead, SSL_CIPHER_find, SSL_CIPHER_get_id, @@ -35,7 +34,6 @@ SSL_CIPHER_get_protocol_id const EVP_MD *SSL_CIPHER_get_handshake_digest(const SSL_CIPHER *c); int SSL_CIPHER_get_kx_nid(const SSL_CIPHER *c); int SSL_CIPHER_get_auth_nid(const SSL_CIPHER *c); - int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); int SSL_CIPHER_is_aead(const SSL_CIPHER *c); const SSL_CIPHER *SSL_CIPHER_find(SSL *ssl, const unsigned char *ptr); uint32_t SSL_CIPHER_get_id(const SSL_CIPHER *c); @@ -93,15 +91,6 @@ TLS 1.3 cipher suites) B is returned. Examples (not comprehensive) NID_auth_ecdsa NID_auth_psk -SSL_CIPHER_get_prf_nid() retuns the pseudo-random function NID for B. If B is -a pre-TLS-1.2 cipher, it returns B but note these ciphers use -SHA-256 in TLS 1.2. Other return values may be treated uniformly in all -applicable versions. Examples (not comprehensive): - - NID_md5_sha1 - NID_sha256 - NID_sha384 - SSL_CIPHER_is_aead() returns 1 if the cipher B is AEAD (e.g. GCM or ChaCha20/Poly1305), and 0 if it is not AEAD. @@ -212,8 +201,6 @@ required to enable this function. The OPENSSL_cipher_name() function was added in OpenSSL 1.1.1. -The SSL_CIPHER_get_prf_nid() function was added in OpenSSL 3.0.0. - =head1 COPYRIGHT Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved. diff --git a/deps/openssl/openssl/doc/man3/SSL_CTX_new.pod b/deps/openssl/openssl/doc/man3/SSL_CTX_new.pod index f467f93659b575..627d9e7f0dc36d 100644 --- a/deps/openssl/openssl/doc/man3/SSL_CTX_new.pod +++ b/deps/openssl/openssl/doc/man3/SSL_CTX_new.pod @@ -104,10 +104,12 @@ On session establishment, by default, no peer credentials verification is done. This must be explicitly requested, typically using L. For verifying peer certificates many options can be set using various functions such as L and L. -The L function can be used, also in conjunction -with L, to set the intended purpose of the session. -The default is B on the client side + +The SSL/(D)TLS implementation uses the L +function to prepare checks for B on the client side and B on the server side. +The L function can be used, also in conjunction +with L, to override the default purpose of the session. The SSL_CTX object uses I as the connection method. Three method variants are available: a generic method (for either client or @@ -228,7 +230,7 @@ SSL_CTX_up_ref() returns 1 for success and 0 for failure. =head1 SEE ALSO -L, L, +L, L, L, SSL_CTX_set_verify(3), L, L, L, L, L, L, L diff --git a/deps/openssl/openssl/doc/man3/SSL_CTX_set_quic_method.pod b/deps/openssl/openssl/doc/man3/SSL_CTX_set_quic_method.pod deleted file mode 100644 index aab5e38889b041..00000000000000 --- a/deps/openssl/openssl/doc/man3/SSL_CTX_set_quic_method.pod +++ /dev/null @@ -1,262 +0,0 @@ -=pod - -=head1 NAME - -SSL_QUIC_METHOD, -OSSL_ENCRYPTION_LEVEL, -SSL_CTX_set_quic_method, -SSL_set_quic_method, -SSL_set_quic_transport_params, -SSL_get_peer_quic_transport_params, -SSL_quic_max_handshake_flight_len, -SSL_quic_read_level, -SSL_quic_write_level, -SSL_provide_quic_data, -SSL_process_quic_post_handshake, -SSL_is_quic, -SSL_get_peer_quic_transport_version, -SSL_get_quic_transport_version, -SSL_set_quic_transport_version, -SSL_set_quic_use_legacy_codepoint, -SSL_set_quic_early_data_enabled -- QUIC support - -=head1 SYNOPSIS - - #include - - typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - typedef enum ssl_encryption_level_t OSSL_ENCRYPTION_LEVEL; - - int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); - int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); - int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); - void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); - size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); - OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); - OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); - int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int SSL_process_quic_post_handshake(SSL *ssl); - int SSL_is_quic(SSL *ssl); - - void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - void SSL_set_quic_transport_version(SSL *ssl, int version); - int SSL_get_quic_transport_version(const SSL *ssl); - int SSL_get_peer_quic_transport_version(const SSL *ssl); - void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -=head1 DESCRIPTION - -SSL_CTX_set_quic_method() and SSL_set_quic_method() configures the QUIC methods. -This should only be configured with a minimum version of TLS 1.3. B -must remain valid for the lifetime of B or B. Calling this disables -the SSL_OP_ENABLE_MIDDLEBOX_COMPAT option, which is not required for QUIC. - -SSL_set_quic_transport_params() configures B to send B (of length -B) in the quic_transport_parameters extension in either the -ClientHello or EncryptedExtensions handshake message. This extension will -only be sent if the TLS version is at least 1.3, and for a server, only if -the client sent the extension. The buffer pointed to by B only need be -valid for the duration of the call to this function. - -SSL_get_peer_quic_transport_params() provides the caller with the value of the -quic_transport_parameters extension sent by the peer. A pointer to the buffer -containing the TransportParameters will be put in B<*out_params>, and its -length in B<*out_params_len>. This buffer will be valid for the lifetime of the -B. If no params were received from the peer, B<*out_params_len> will be 0. - -SSL_quic_max_handshake_flight_len() returns the maximum number of bytes -that may be received at the given encryption level. This function should be -used to limit buffering in the QUIC implementation. - -See L. - -SSL_quic_read_level() returns the current read encryption level. - -SSL_quic_write_level() returns the current write encryption level. - -SSL_provide_quic_data() is used to provide data from QUIC CRYPTO frames to the -state machine, at a particular encryption level B. It is an error to -call this function with an encryption level less than the current read level. -It returns one on success and zero on error. - -SSL_process_quic_post_handshake() processes any data that QUIC has provided -after the handshake has completed. This includes NewSessionTicket messages -sent by the server. - -SSL_is_quic() indicates whether a connection uses QUIC. A given B -or B can only be used with QUIC or TLS, but not both. - -SSL_set_quic_use_legacy_codepoint() specifies the legacy extension codepoint -in manner compatible with some versions of BoringSSL. - -SSL_set_quic_transport_version() specifies the quic transport version that -allows for backwards and forwards compatibility. If set to 0 (default) the -server will use the highest version the client sent. If set to 0 (default) -the client will send both extensions. - -SSL_get_quic_transport_version() returns the value set by -SSL_set_quic_transport_version(). - -SSL_get_peer_quic_transport_version() returns the version the that was -negotiated. - -SSL_set_quic_early_data_enabled() enables QUIC early data if a nonzero -value is passed. Clients must set a resumed session before calling this -function. Servers must additionally call SSL_CTX_set_max_early_data() or -SSL_set_max_early_data() with 0xffffffffu as the argument, so that any -issued session tickets indicate that server is able to accept early data. - -=head1 NOTES - -These APIs are implementations of BoringSSL's QUIC APIs. - -QUIC acts as an underlying transport for the TLS 1.3 handshake. The following -functions allow a QUIC implementation to serve as the underlying transport as -described in RFC9001. - -When configured for QUIC, SSL_do_handshake() will drive the handshake as -before, but it will not use the configured B. It will call functions from -the configured B to configure secrets and send data. If data -is needed from the peer, it will return B. When received, -the caller should call SSL_provide_quic_data() and then SSL_do_handshake() to -continue the handshake. After the handshake is complete, the caller should call -SSL_provide_quic_data() for any post-handshake data, followed by -SSL_process_quic_post_handshake() to process it. It is an error to call -SSL_read()/SSL_read_ex() and SSL_write()/SSL_write_ex() in QUIC. - -Note that secrets for an encryption level may be available to QUIC before the -level is active in TLS. Callers should use SSL_quic_read_level() to determine -the active read level for SSL_provide_quic_data(). SSL_do_handshake() will -pass the active write level to add_handshake_data() when writing data. Callers -can use SSL_quic_write_level() to query the active write level when -generating their own errors. - -See L for more details. - -To avoid amplifying DoS attacks, the QUIC implementation must limit the amount -of data being queued up. The implementation can call -SSL_quic_max_handshake_flight_len() to get the maximum buffer length at each -encryption level. - -RFC9001 defines a new TLS extension "quic_transport_parameters" -used by QUIC for each endpoint to unilaterally declare its supported -transport parameters. The contents of the extension are specified in -L (as -a sequence of tag/length/value parameters) along with the interpretation of the -various parameters and the rules for their processing. - -OpenSSL handles this extension as an opaque byte string. The caller is -responsible for serializing and parsing it. - -=head2 OSSL_ENCRYPTION_LEVEL - -B (B) represents the -encryption levels: - -=over 4 - -=item ssl_encryption_initial - -The initial encryption level that is used for client and server hellos. - -=item ssl_encryption_early_data - -The encryption level for early data. This is a write-level for the client -and a read-level for the server. - -=item ssl_encryption_handshake - -The encryption level for the remainder of the handshake. - -=item ssl_encryption_application - -The encryption level for the application data. - -=back - -=head2 SSL_QUIC_METHOD - -The B (B) describes the -QUIC methods. - - struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); - }; - typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -set_encryption_secrets() configures the read and write secrets for the given -encryption level. This function will always be called before an encryption -level other than B is used. Note, however, that -secrets for a level may be configured before TLS is ready to send or accept -data at that level. - -When reading packets at a given level, the QUIC implementation must send -ACKs at the same level, so this function provides read and write secrets -together. The exception is B, where secrets are -only available in the client to server direction. The other secret will be -NULL. The server acknowledges such data at B, -which will be configured in the same SSL_do_handshake() call. - -add_handshake_data() adds handshake data to the current flight at the given -encryption level. It returns one on success and zero on error. - -OpenSSL will pack data from a single encryption level together, but a -single handshake flight may include multiple encryption levels. Callers -should defer writing data to the network until flush_flight() to better -pack QUIC packets into transport datagrams. - -flush_flight() is called when the current flight is complete and should be -written to the transport. Note a flight may contain data at several -encryption levels. - -send_alert() sends a fatal alert at the specified encryption level. - -All QUIC methods return 1 on success and 0 on error. - -=head1 RETURN VALUES - -SSL_CTX_set_quic_method(), -SSL_set_quic_method(), -SSL_set_quic_transport_params(), and -SSL_process_quic_post_handshake() -return 1 on success, and 0 on error. - -SSL_quic_read_level() and SSL_quic_write_level() return the current -encryption level as an B -(B). - -SSL_quic_max_handshake_flight_len() returns the maximum length in bytes of a -flight for a given encryption level. - -SSL_is_quic() returns 1 if QUIC is being used, 0 if not. - -=head1 SEE ALSO - -L, L, L - -=head1 HISTORY - -These functions were added in OpenSSL 3.0.0. - -=head1 COPYRIGHT - -Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved. - -Licensed under the Apache License 2.0 (the "License"). You may not use -this file except in compliance with the License. You can obtain a copy -in the file LICENSE in the source distribution or at -L. - -=cut diff --git a/deps/openssl/openssl/doc/man3/SSL_get_shared_sigalgs.pod b/deps/openssl/openssl/doc/man3/SSL_get_shared_sigalgs.pod index c18114cdf47200..cb9ce025002fed 100644 --- a/deps/openssl/openssl/doc/man3/SSL_get_shared_sigalgs.pod +++ b/deps/openssl/openssl/doc/man3/SSL_get_shared_sigalgs.pod @@ -64,7 +64,7 @@ ordered according to configuration and peer preferences. The raw values correspond to the on the wire form as defined by RFC5246 et al. The NIDs are OpenSSL equivalents. For example if the peer sent sha256(4) and rsa(1) then B<*rhash> would be 4, B<*rsign> 1, B<*phash> NID_sha256, B<*psig> -NID_rsaEncryption and B<*psighash> NID_sha256WithRSAEncryption. +NID_rsaEncryption and B<*psignhash> NID_sha256WithRSAEncryption. If a signature algorithm is not recognised the corresponding NIDs will be set to B. This may be because the value is not supported, diff --git a/deps/openssl/openssl/doc/man3/SSL_set_bio.pod b/deps/openssl/openssl/doc/man3/SSL_set_bio.pod index c666dc466ecd2d..aaffeedf779b65 100644 --- a/deps/openssl/openssl/doc/man3/SSL_set_bio.pod +++ b/deps/openssl/openssl/doc/man3/SSL_set_bio.pod @@ -23,6 +23,9 @@ function, any existing B that was previously set will also be freed via a call to L (this includes the case where the B is set to the same value as previously). +If using a custom BIO, B must implement either +L or L. + SSL_set0_wbio() works in the same as SSL_set0_rbio() except that it connects the BIO B for the write operations of the B object. Note that if the rbio and wbio are the same then SSL_set0_rbio() and SSL_set0_wbio() each take @@ -30,6 +33,12 @@ ownership of one reference. Therefore, it may be necessary to increment the number of references available using L before calling the set0 functions. +If using a custom BIO, B must implement +L or L. It additionally must +implement L using B and L. +If flushing is unnecessary with B, L should return one and +do nothing. + SSL_set_bio() is similar to SSL_set0_rbio() and SSL_set0_wbio() except that it connects both the B and the B at the same time, and transfers the ownership of B and B to B according to diff --git a/deps/openssl/openssl/doc/man3/X509V3_set_ctx.pod b/deps/openssl/openssl/doc/man3/X509V3_set_ctx.pod index 8287802e41b2f7..7819c344f7510e 100644 --- a/deps/openssl/openssl/doc/man3/X509V3_set_ctx.pod +++ b/deps/openssl/openssl/doc/man3/X509V3_set_ctx.pod @@ -42,8 +42,7 @@ or not) to provide fallback data for the authority key identifier extension. =head1 RETURN VALUES -X509V3_set_ctx() and X509V3_set_issuer_pkey() -return 1 on success and 0 on error. +X509V3_set_issuer_pkey() returns 1 on success and 0 on error. =head1 SEE ALSO @@ -57,7 +56,7 @@ CTX_TEST was deprecated in OpenSSL 3.0; use X509V3_CTX_TEST instead. =head1 COPYRIGHT -Copyright 2015-2021 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2015-2025 The OpenSSL Project Authors. All Rights Reserved. Licensed under the Apache License 2.0 (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/openssl/doc/man3/X509_STORE_CTX_new.pod b/deps/openssl/openssl/doc/man3/X509_STORE_CTX_new.pod index c508a1d3fc1b88..9929a98e0cf5af 100644 --- a/deps/openssl/openssl/doc/man3/X509_STORE_CTX_new.pod +++ b/deps/openssl/openssl/doc/man3/X509_STORE_CTX_new.pod @@ -74,6 +74,12 @@ X509_STORE_CTX_free() completely frees up I. After this call I is no longer valid. If I is NULL nothing is done. +X509_STORE_CTX_init() sets up I for a subsequent verification operation. + +X509_STORE_CTX_init() initializes the internal state and resources of the +given I. Among others, it sets the verification parameters associcated +with the method name C, which includes the C purpose, +and takes over callback function pointers from I (unless NULL). It must be called before each call to L or L, i.e., a context is only good for one verification. If you want to verify a further certificate or chain with the same I @@ -144,12 +150,13 @@ by I to be I. Ownership of the chain is transferred to I, and so it should not be free'd by the caller. -X509_STORE_CTX_set_default() looks up and sets the default verification -method to I. This uses the function X509_VERIFY_PARAM_lookup() to -find an appropriate set of parameters from the purpose identifier I. -Currently defined purposes are C, C, C, -C, C, C, C, C, -and C. +X509_STORE_CTX_set_default() looks up and sets the default verification method. +This uses the function X509_VERIFY_PARAM_lookup() to find +the set of parameters associated with the given verification method I. +Among others, the parameters determine the trust model and verification purpose. +More detail, including the list of currently predefined methods, +is described for the B<-verify_name> command-line option +in L. X509_STORE_CTX_set_verify() provides the capability for overriding the default verify function. This function is responsible for verifying chain signatures and diff --git a/deps/openssl/openssl/doc/man3/X509_add_cert.pod b/deps/openssl/openssl/doc/man3/X509_add_cert.pod index 907164e9710ef9..f59b93ba54d4bc 100644 --- a/deps/openssl/openssl/doc/man3/X509_add_cert.pod +++ b/deps/openssl/openssl/doc/man3/X509_add_cert.pod @@ -16,6 +16,7 @@ X509 certificate list addition functions =head1 DESCRIPTION X509_add_cert() adds a certificate I to the given list I. +It is an error for the I argument to be NULL. X509_add_certs() adds a list of certificate I to the given list I. The I argument may be NULL, which implies no effect. @@ -66,7 +67,7 @@ were added in OpenSSL 3.0. =head1 COPYRIGHT -Copyright 2019-2023 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2019-2025 The OpenSSL Project Authors. All Rights Reserved. Licensed under the Apache License 2.0 (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/openssl/doc/man3/X509_load_http.pod b/deps/openssl/openssl/doc/man3/X509_load_http.pod index a147c43caa3fde..e17330b05587f7 100644 --- a/deps/openssl/openssl/doc/man3/X509_load_http.pod +++ b/deps/openssl/openssl/doc/man3/X509_load_http.pod @@ -27,6 +27,9 @@ see L: X509_load_http() and X509_CRL_load_http() loads a certificate or a CRL, respectively, in ASN.1 format using HTTP from the given B. +Maximum size of the HTTP response is 100 kB for certificates and 32 MB for CRLs +and hard coded in the functions. + If B is given and B is NULL then this BIO is used instead of an internal one for connecting, writing the request, and reading the response. If both B and B are given (which may be memory BIOs, for instance) diff --git a/deps/openssl/openssl/doc/man7/EVP_KDF-HKDF.pod b/deps/openssl/openssl/doc/man7/EVP_KDF-HKDF.pod index 5fc0a73241cca4..b563efa5f5d756 100644 --- a/deps/openssl/openssl/doc/man7/EVP_KDF-HKDF.pod +++ b/deps/openssl/openssl/doc/man7/EVP_KDF-HKDF.pod @@ -15,6 +15,8 @@ and "extracts" from it a fixed-length pseudorandom key K. The second stage "expands" the key K into several additional pseudorandom keys (the output of the KDF). +The output is considered to be keying material. + =head2 Identity "HKDF" is the name for this implementation; it diff --git a/deps/openssl/openssl/doc/man7/EVP_KDF-KB.pod b/deps/openssl/openssl/doc/man7/EVP_KDF-KB.pod index 6e25882d674c6e..78b81673a5bdab 100644 --- a/deps/openssl/openssl/doc/man7/EVP_KDF-KB.pod +++ b/deps/openssl/openssl/doc/man7/EVP_KDF-KB.pod @@ -10,6 +10,8 @@ The EVP_KDF-KB algorithm implements the Key-Based key derivation function (KBKDF). KBKDF derives a key from repeated application of a keyed MAC to an input secret (and other optional values). +The output is considered to be keying material. + =head2 Identity "KBKDF" is the name for this implementation; it can be used with the diff --git a/deps/openssl/openssl/doc/man7/EVP_KDF-PBKDF2.pod b/deps/openssl/openssl/doc/man7/EVP_KDF-PBKDF2.pod index e6cadc8b826d35..9a90f7583abe6d 100644 --- a/deps/openssl/openssl/doc/man7/EVP_KDF-PBKDF2.pod +++ b/deps/openssl/openssl/doc/man7/EVP_KDF-PBKDF2.pod @@ -13,6 +13,8 @@ The EVP_KDF-PBKDF2 algorithm implements the PBKDF2 password-based key derivation function, as described in SP800-132; it derives a key from a password using a salt and iteration count. +The output is considered to be a cryptographic key. + =head2 Identity "PBKDF2" is the name for this implementation; it diff --git a/deps/openssl/openssl/doc/man7/EVP_KDF-SS.pod b/deps/openssl/openssl/doc/man7/EVP_KDF-SS.pod index c8d19691a797b8..6640703eef1c01 100644 --- a/deps/openssl/openssl/doc/man7/EVP_KDF-SS.pod +++ b/deps/openssl/openssl/doc/man7/EVP_KDF-SS.pod @@ -11,6 +11,8 @@ SSKDF derives a key using input such as a shared secret key (that was generated during the execution of a key establishment scheme) and fixedinfo. SSKDF is also informally referred to as 'Concat KDF'. +The output is considered to be keying material. + =head2 Auxiliary function The implementation uses a selectable auxiliary function H, which can be one of: diff --git a/deps/openssl/openssl/doc/man7/EVP_KDF-SSHKDF.pod b/deps/openssl/openssl/doc/man7/EVP_KDF-SSHKDF.pod index c7a3263f455ad2..a5b153947558e2 100644 --- a/deps/openssl/openssl/doc/man7/EVP_KDF-SSHKDF.pod +++ b/deps/openssl/openssl/doc/man7/EVP_KDF-SSHKDF.pod @@ -15,6 +15,8 @@ Five inputs are required to perform key derivation: The hashing function (for example SHA256), the Initial Key, the Exchange Hash, the Session ID, and the derivation key type. +The output is considered to be keying material. + =head2 Identity "SSHKDF" is the name for this implementation; it diff --git a/deps/openssl/openssl/doc/man7/EVP_KDF-TLS13_KDF.pod b/deps/openssl/openssl/doc/man7/EVP_KDF-TLS13_KDF.pod index d588b121faf5a3..7fad55ca61f1bc 100644 --- a/deps/openssl/openssl/doc/man7/EVP_KDF-TLS13_KDF.pod +++ b/deps/openssl/openssl/doc/man7/EVP_KDF-TLS13_KDF.pod @@ -12,6 +12,8 @@ the B API. The EVP_KDF-TLS13_KDF algorithm implements the HKDF key derivation function as used by TLS 1.3. +The output is considered to be keying material. + =head2 Identity "TLS13-KDF" is the name for this implementation; it diff --git a/deps/openssl/openssl/doc/man7/EVP_KDF-TLS1_PRF.pod b/deps/openssl/openssl/doc/man7/EVP_KDF-TLS1_PRF.pod index 8a60e97315549c..90b357e70f0bb2 100644 --- a/deps/openssl/openssl/doc/man7/EVP_KDF-TLS1_PRF.pod +++ b/deps/openssl/openssl/doc/man7/EVP_KDF-TLS1_PRF.pod @@ -11,6 +11,8 @@ Support for computing the B PRF through the B API. The EVP_KDF-TLS1_PRF algorithm implements the PRF used by TLS versions up to and including TLS 1.2. +The output is considered to be keying material. + =head2 Identity "TLS1-PRF" is the name for this implementation; it diff --git a/deps/openssl/openssl/doc/man7/EVP_KDF-X942-ASN1.pod b/deps/openssl/openssl/doc/man7/EVP_KDF-X942-ASN1.pod index a5786ab83faa8a..17464738b511b4 100644 --- a/deps/openssl/openssl/doc/man7/EVP_KDF-X942-ASN1.pod +++ b/deps/openssl/openssl/doc/man7/EVP_KDF-X942-ASN1.pod @@ -13,6 +13,8 @@ contains a 32 bit counter as well as optional fields for "partyu-info", "partyv-info", "supp-pubinfo" and "supp-privinfo". This kdf is used by Cryptographic Message Syntax (CMS). +The output is considered to be keying material. + =head2 Identity "X942KDF-ASN1" or "X942KDF" is the name for this implementation; it diff --git a/deps/openssl/openssl/doc/man7/EVP_KDF-X963.pod b/deps/openssl/openssl/doc/man7/EVP_KDF-X963.pod index 3d6f4372cf3122..ca2f7c1df0efcc 100644 --- a/deps/openssl/openssl/doc/man7/EVP_KDF-X963.pod +++ b/deps/openssl/openssl/doc/man7/EVP_KDF-X963.pod @@ -10,6 +10,8 @@ The EVP_KDF-X963 algorithm implements the key derivation function (X963KDF). X963KDF is used by Cryptographic Message Syntax (CMS) for EC KeyAgreement, to derive a key using input such as a shared secret key and shared info. +The output is considered to be keying material. + =head2 Identity "X963KDF" is the name for this implementation; it diff --git a/deps/openssl/openssl/doc/man7/EVP_SIGNATURE-DSA.pod b/deps/openssl/openssl/doc/man7/EVP_SIGNATURE-DSA.pod index 5a42d6b1cd224f..326a86ee0b42cd 100644 --- a/deps/openssl/openssl/doc/man7/EVP_SIGNATURE-DSA.pod +++ b/deps/openssl/openssl/doc/man7/EVP_SIGNATURE-DSA.pod @@ -7,7 +7,9 @@ EVP_SIGNATURE-DSA =head1 DESCRIPTION -Support for computing DSA signatures. +Support for computing DSA signatures. The signature produced with +L is DER encoded ASN.1 in the form described in +RFC 3279, section 2.2.2. See L for information related to DSA keys. =head2 Signature Parameters diff --git a/deps/openssl/openssl/doc/man7/openssl-env.pod b/deps/openssl/openssl/doc/man7/openssl-env.pod index a2443d54d82291..c7dbd2277dc68b 100644 --- a/deps/openssl/openssl/doc/man7/openssl-env.pod +++ b/deps/openssl/openssl/doc/man7/openssl-env.pod @@ -51,6 +51,99 @@ See L. Specifies the directory from which cryptographic providers are loaded. Equivalently, the generic B<-provider-path> command-line option may be used. +=item B + +By default the OpenSSL trace feature is disabled statically. +To enable it, OpenSSL must be built with tracing support, +which may be configured like this: C<./config enable-trace> + +Unless OpenSSL tracing support is generally disabled, +enable trace output of specific parts of OpenSSL libraries, by name. +This output usually makes sense only if you know OpenSSL internals well. + +The value of this environment varialble is a comma-separated list of names, +with the following available: + +=over 4 + +=item B + +Traces the OpenSSL trace API itself. + +=item B + +Traces OpenSSL library initialization and cleanup. + +=item B + +Traces the TLS/SSL protocol. + +=item B + +Traces the ciphers used by the TLS/SSL protocol. + +=item B + +Show details about provider and engine configuration. + +=item B + +The function that is used by RSA, DSA (etc) code to select registered +ENGINEs, cache defaults and functional references (etc), will generate +debugging summaries. + +=item B + +Reference counts in the ENGINE structure will be monitored with a line +of generated for each change. + +=item B + +Traces PKCS#5 v2 key generation. + +=item B + +Traces PKCS#12 key generation. + +=item B + +Traces PKCS#12 decryption. + +=item B + +Generates the complete policy tree at various points during X.509 v3 +policy evaluation. + +=item B + +Traces BIGNUM context operations. + +=item B + +Traces CMP client and server activity. + +=item B + +Traces STORE operations. + +=item B + +Traces decoder operations. + +=item B + +Traces encoder operations. + +=item B + +Traces decrementing certain ASN.1 structure references. + +=item B + +Traces the HTTP client and server, such as messages being sent and received. + +=back + =item B If set, then L returns UTF-8 encoded strings, rather than diff --git a/deps/openssl/openssl/doc/man7/provider.pod b/deps/openssl/openssl/doc/man7/provider.pod index a061fc4709d0bb..08ac1d02907ff5 100644 --- a/deps/openssl/openssl/doc/man7/provider.pod +++ b/deps/openssl/openssl/doc/man7/provider.pod @@ -227,6 +227,18 @@ MODE is only present where applicable. Other aliases may exist for example where standards bodies or common practice use alternative names or names that OpenSSL has used historically. +=head3 Provider dependencies + +Providers may depend for their proper operation on the availability of +(functionality implemented in) other providers. As there is no mechanism to +express such dependencies towards the OpenSSL core, provider authors must +take care that such dependencies are either completely avoided or made visible +to users, e.g., by documentation and/or defensive programming, e.g., +outputting error messages if required external dependencies are not available, +e.g., when no provider implementing the required functionality has been +activated. In particular, provider initialization should not depend on other +providers already having been initialized. + =head1 OPENSSL PROVIDERS OpenSSL provides a number of its own providers. These are the default, base, diff --git a/deps/openssl/openssl/engines/e_afalg.c b/deps/openssl/openssl/engines/e_afalg.c index ec4e21c582c8e8..58d58ef24ec4aa 100644 --- a/deps/openssl/openssl/engines/e_afalg.c +++ b/deps/openssl/openssl/engines/e_afalg.c @@ -1,5 +1,5 @@ /* - * Copyright 2016-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -165,7 +165,7 @@ static ossl_inline int io_getevents(aio_context_t ctx, long min, long max, ts32.tv_sec = (__kernel_long_t) timeout->tv_sec; ts32.tv_nsec = (__kernel_long_t) timeout->tv_nsec; - return syscall(__NR_io_getevents, ctx, min, max, events, ts32); + return syscall(__NR_io_getevents, ctx, min, max, events, &ts32); } else { return syscall(__NR_io_getevents, ctx, min, max, events, NULL); } diff --git a/deps/openssl/openssl/engines/e_loader_attic.c b/deps/openssl/openssl/engines/e_loader_attic.c index a20e04da1a5b47..08c9c16cbbfd3f 100644 --- a/deps/openssl/openssl/engines/e_loader_attic.c +++ b/deps/openssl/openssl/engines/e_loader_attic.c @@ -988,7 +988,7 @@ static OSSL_STORE_LOADER_CTX *file_open_ex #ifdef _WIN32 /* Windows file: URIs with a drive letter start with a / */ if (p[0] == '/' && p[2] == ':' && p[3] == '/') { - char c = tolower(p[1]); + char c = tolower((unsigned char)p[1]); if (c >= 'a' && c <= 'z') { p++; diff --git a/deps/openssl/openssl/include/crypto/bn.h b/deps/openssl/openssl/include/crypto/bn.h index c5f328156d3a9c..0b8489bb75509c 100644 --- a/deps/openssl/openssl/include/crypto/bn.h +++ b/deps/openssl/openssl/include/crypto/bn.h @@ -1,5 +1,5 @@ /* - * Copyright 2014-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -73,6 +73,9 @@ int bn_set_words(BIGNUM *a, const BN_ULONG *words, int num_words); */ int bn_mul_mont_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_MONT_CTX *mont, BN_CTX *ctx); +int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, + const BIGNUM *m, BN_CTX *ctx, + BN_MONT_CTX *in_mont); int bn_to_mont_fixed_top(BIGNUM *r, const BIGNUM *a, BN_MONT_CTX *mont, BN_CTX *ctx); int bn_from_mont_fixed_top(BIGNUM *r, const BIGNUM *a, BN_MONT_CTX *mont, diff --git a/deps/openssl/openssl/include/crypto/cmserr.h b/deps/openssl/openssl/include/crypto/cmserr.h index 1de2f9c7d51de9..f53530ae235295 100644 --- a/deps/openssl/openssl/include/crypto/cmserr.h +++ b/deps/openssl/openssl/include/crypto/cmserr.h @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2020-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/openssl/include/openssl/cmserr.h b/deps/openssl/openssl/include/openssl/cmserr.h index f2d7708f10c8d6..52a186520fe453 100644 --- a/deps/openssl/openssl/include/openssl/cmserr.h +++ b/deps/openssl/openssl/include/openssl/cmserr.h @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -49,6 +49,7 @@ # define CMS_R_ERROR_READING_MESSAGEDIGEST_ATTRIBUTE 114 # define CMS_R_ERROR_SETTING_KEY 115 # define CMS_R_ERROR_SETTING_RECIPIENTINFO 116 +# define CMS_R_ERROR_UNSUPPORTED_STATIC_KEY_AGREEMENT 196 # define CMS_R_ESS_SIGNING_CERTID_MISMATCH_ERROR 183 # define CMS_R_INVALID_ENCRYPTED_KEY_LENGTH 117 # define CMS_R_INVALID_KEY_ENCRYPTION_PARAMETER 176 diff --git a/deps/openssl/openssl/include/openssl/http.h b/deps/openssl/openssl/include/openssl/http.h index f7ab214265e474..c63762b70deb5c 100644 --- a/deps/openssl/openssl/include/openssl/http.h +++ b/deps/openssl/openssl/include/openssl/http.h @@ -33,8 +33,9 @@ extern "C" { # define OPENSSL_HTTP_PROXY "HTTP_PROXY" # define OPENSSL_HTTPS_PROXY "HTTPS_PROXY" -#define OSSL_HTTP_DEFAULT_MAX_LINE_LEN (4 * 1024) -#define OSSL_HTTP_DEFAULT_MAX_RESP_LEN (100 * 1024) +# define OSSL_HTTP_DEFAULT_MAX_LINE_LEN (4 * 1024) +# define OSSL_HTTP_DEFAULT_MAX_RESP_LEN (100 * 1024) +# define OSSL_HTTP_DEFAULT_MAX_CRL_LEN (32 * 1024 * 1024) /* Low-level HTTP API */ OSSL_HTTP_REQ_CTX *OSSL_HTTP_REQ_CTX_new(BIO *wbio, BIO *rbio, int buf_size); diff --git a/deps/openssl/openssl/include/openssl/quic.h b/deps/openssl/openssl/include/openssl/quic.h deleted file mode 100644 index f95e9e8819e572..00000000000000 --- a/deps/openssl/openssl/include/openssl/quic.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright 2018-2021 The OpenSSL Project Authors. All Rights Reserved. - * - * Licensed under the Apache License 2.0 (the "License"). You may not use - * this file except in compliance with the License. You can obtain a copy - * in the file LICENSE in the source distribution or at - * https://www.openssl.org/source/license.html - */ - -#ifndef OPENSSL_QUIC_H -# define OPENSSL_QUIC_H -# pragma once -# ifndef OPENSSL_NO_QUIC - -/* moved from crypto.h.in to avoid breaking FIPS checksums */ -# define OPENSSL_INFO_QUIC 2000 - -# endif /* OPENSSL_NO_QUIC */ -#endif /* OPENSSL_QUIC_H */ diff --git a/deps/openssl/openssl/include/openssl/ssl.h.in b/deps/openssl/openssl/include/openssl/ssl.h.in index 677a20be15d941..105b4a4a3c8bda 100644 --- a/deps/openssl/openssl/include/openssl/ssl.h.in +++ b/deps/openssl/openssl/include/openssl/ssl.h.in @@ -2521,75 +2521,6 @@ void SSL_set_allow_early_data_cb(SSL *s, const char *OSSL_default_cipher_list(void); const char *OSSL_default_ciphersuites(void); -# ifndef OPENSSL_NO_QUIC -/* - * QUIC integration - The QUIC interface matches BoringSSL - * - * ssl_encryption_level_t represents a specific QUIC encryption level used to - * transmit handshake messages. BoringSSL has this as an 'enum'. - */ -#include - -/* Used by Chromium/QUIC - moved from evp.h to avoid breaking FIPS checksums */ -# define X25519_PRIVATE_KEY_LEN 32 -# define X25519_PUBLIC_VALUE_LEN 32 - -/* moved from types.h to avoid breaking FIPS checksums */ -typedef struct ssl_quic_method_st SSL_QUIC_METHOD; - -typedef enum ssl_encryption_level_t { - ssl_encryption_initial = 0, - ssl_encryption_early_data, - ssl_encryption_handshake, - ssl_encryption_application -} OSSL_ENCRYPTION_LEVEL; - -struct ssl_quic_method_st { - int (*set_encryption_secrets)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, size_t secret_len); - int (*add_handshake_data)(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); - int (*flush_flight)(SSL *ssl); - int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert); -}; - -__owur int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method); -__owur int SSL_set_quic_transport_params(SSL *ssl, - const uint8_t *params, - size_t params_len); -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len); -__owur size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl); -__owur OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl); -__owur int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len); -__owur int SSL_process_quic_post_handshake(SSL *ssl); - -__owur int SSL_is_quic(SSL *ssl); - -/* BoringSSL API */ -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy); - -/* - * Set an explicit value that you want to use - * If 0 (default) the server will use the highest extenstion the client sent - * If 0 (default) the client will send both extensions - */ -void SSL_set_quic_transport_version(SSL *ssl, int version); -__owur int SSL_get_quic_transport_version(const SSL *ssl); -/* Returns the negotiated version, or -1 on error */ -__owur int SSL_get_peer_quic_transport_version(const SSL *ssl); - -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c); - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled); - -# endif - # ifdef __cplusplus } # endif diff --git a/deps/openssl/openssl/include/openssl/sslerr.h b/deps/openssl/openssl/include/openssl/sslerr.h index b159ef8127c044..1e36405e32c0b7 100644 --- a/deps/openssl/openssl/include/openssl/sslerr.h +++ b/deps/openssl/openssl/include/openssl/sslerr.h @@ -161,7 +161,6 @@ # define SSL_R_MISSING_FATAL 256 # define SSL_R_MISSING_PARAMETERS 290 # define SSL_R_MISSING_PSK_KEX_MODES_EXTENSION 310 -# define SSL_R_MISSING_QUIC_TRANSPORT_PARAMETERS_EXTENSION 801 # define SSL_R_MISSING_RSA_CERTIFICATE 168 # define SSL_R_MISSING_RSA_ENCRYPTING_CERT 169 # define SSL_R_MISSING_RSA_SIGNING_CERT 170 @@ -336,7 +335,6 @@ # define SSL_R_WRONG_CERTIFICATE_TYPE 383 # define SSL_R_WRONG_CIPHER_RETURNED 261 # define SSL_R_WRONG_CURVE 378 -# define SSL_R_WRONG_ENCRYPTION_LEVEL_RECEIVED 800 # define SSL_R_WRONG_SIGNATURE_LENGTH 264 # define SSL_R_WRONG_SIGNATURE_SIZE 265 # define SSL_R_WRONG_SIGNATURE_TYPE 370 diff --git a/deps/openssl/openssl/include/openssl/tls1.h b/deps/openssl/openssl/include/openssl/tls1.h index d005d3c16dfff9..91558fa8d1a5d4 100644 --- a/deps/openssl/openssl/include/openssl/tls1.h +++ b/deps/openssl/openssl/include/openssl/tls1.h @@ -151,10 +151,6 @@ extern "C" { /* Temporary extension type */ # define TLSEXT_TYPE_renegotiate 0xff01 - /* ExtensionType value from RFC9001 */ -# define TLSEXT_TYPE_quic_transport_parameters_draft 0xffa5 -# define TLSEXT_TYPE_quic_transport_parameters 0x0039 - # ifndef OPENSSL_NO_NEXTPROTONEG /* This is not an IANA defined extension number */ # define TLSEXT_TYPE_next_proto_neg 13172 diff --git a/deps/openssl/openssl/providers/fips-sources.checksums b/deps/openssl/openssl/providers/fips-sources.checksums index 2075eca274d6f1..1ab5d0348c6ca2 100644 --- a/deps/openssl/openssl/providers/fips-sources.checksums +++ b/deps/openssl/openssl/providers/fips-sources.checksums @@ -4,71 +4,71 @@ c049a936d74100fcced225f575d46662792a6a0039777d2d4df0cf61eff90a68 crypto/aes/aes c1e674d08683a25bc053f6233f73a0d0b3a90aafe591ff57b702c7da1582e4a5 crypto/aes/aes_local.h a2466f18da5847c7d9fbced17524633c10ce024671a72f53f9c9c55b9b9923dd crypto/aes/aes_misc.c 6979c133f76f4623e62e6e970deae70fa025e713a72b71aead5a048d49e47f6f crypto/aes/asm/aes-586.pl -2eef5f20f1410b48bdaaafa24ded24f56f34c4ca79db1d38fa6bf1b3b19535bf crypto/aes/asm/aes-armv4.pl -38c2cf8ed3910efd89d8721e1b0763a8fde073b91f6529d251165a0496ef9555 crypto/aes/asm/aes-c64xplus.pl +92be9ff608331a432e95247a8f4fb9e46897d0cb76f2b6db809b61d44287964a crypto/aes/asm/aes-armv4.pl +953897f86e2de9fa27ef411155ab3aed133af94885f1507e76449c142da78656 crypto/aes/asm/aes-c64xplus.pl 00196f01f5218ad731e6a058d406078f7228a9756d9d73f51c0d0c2a68f885af crypto/aes/asm/aes-ia64.S -b4ef595194fe1692e1ab2b561f385da01b277cf004902e8fc99e8ac5389bbd35 crypto/aes/asm/aes-mips.pl -123c4498c94040b70708fdd911cb08c6411b020b4cf3eb761d6fa22c583c3e6f crypto/aes/asm/aes-parisc.pl -7a7f2f90791415ef4ffc1ba2a6f6b6fe994bfe0e03d3bf9dab6e428e6874695c crypto/aes/asm/aes-ppc.pl -d139e5ad69560fd0ffd8aa2e72304e463650cea4c657be7a90e0d1eb782d580a crypto/aes/asm/aes-s390x.pl -133ba35d77002abcd430414749c4e98c4a319630da898e45ff8dbc5800176df1 crypto/aes/asm/aes-sparcv9.pl -c98690249d490d23e6fee84f672f1463ffc029427110a4329244a59e4e4aaed8 crypto/aes/asm/aes-x86_64.pl -7ec99947b47e56595f0b085b8bda0b3113112f694e78b1f71b63ecd1f0fa2c67 crypto/aes/asm/aesfx-sparcv9.pl -ab94a27e533e164bcf09898a6f6019f43609d51a3b374cf75482dcf2914d464e crypto/aes/asm/aesni-mb-x86_64.pl -74939261340a0056eb9333fff1c843c8758b9f93de3d94650cd6d2899c6790d8 crypto/aes/asm/aesni-sha1-x86_64.pl -ce91f0893a2a35fdf4c024ccb0fd8329b30fdbd955f0ae011ab948101ee14951 crypto/aes/asm/aesni-sha256-x86_64.pl +88b6f8396cd9d86004743d5c3b0f72b7b8c3d5a2b00b0bbb761ba91ae5a7cdc8 crypto/aes/asm/aes-mips.pl +7ff9c96ef3d591d45d776fa4b244601ea0d9328e289aeab1e1b92436ce7d02ad crypto/aes/asm/aes-parisc.pl +f1244cdeadcb4e48f35bc5df19d4cfaf07e0086ad951b84f07ff6966501faa5b crypto/aes/asm/aes-ppc.pl +ecbfe826f4c514810c3ee20e265f4f621149694c298554b2682e5de4f029f14f crypto/aes/asm/aes-s390x.pl +ee4e8cacef972942d2a89c1a83c984df9cad87c61a54383403c5c4864c403ba1 crypto/aes/asm/aes-sparcv9.pl +2b3b9ac56bf54334d053857a24bdb08592151e8a7a60b89b8195846b7f8ee7b5 crypto/aes/asm/aes-x86_64.pl +c56c324667b67d726e040d70379efba5b270e2937f403c1b5979018b836903c7 crypto/aes/asm/aesfx-sparcv9.pl +14359dc32b7f4e5c08227fb9ac8f9232c1287399463b233fec4a2ab0c19f68d1 crypto/aes/asm/aesni-mb-x86_64.pl +2fe016e8098d1c959b6199ce98e91dfed9a3a543d6b068daf88d4c4c402701ec crypto/aes/asm/aesni-sha1-x86_64.pl +1d3acabadedb88d1327eeb76201ea9b3f4814f44898018ffae6c73e3f400b89b crypto/aes/asm/aesni-sha256-x86_64.pl 4ff74d4e629a88ef5a9e3d3f5b340fc0a4793d16d7cc7f1b70da62512a856248 crypto/aes/asm/aesni-x86.pl -30103cfe3b29d06b34feff48a927e0fa649e9109d35a3db64b09cfeb15426fa2 crypto/aes/asm/aesni-x86_64.pl -f3490c936a80e012c49e577ec6e1d4d36df324dfef6264e788e6225e20b5fd52 crypto/aes/asm/aesp8-ppc.pl -a5807ed92ec8a16d123061487c385bf1f65e50878cee95c8e8096844454129f8 crypto/aes/asm/aest4-sparcv9.pl -d34cf129a8c63e2b77a74117ed4440a4f35408dabd90e21e70eae92d208fa516 crypto/aes/asm/aesv8-armx.pl -a0b578b7d2787c91013547df07dfa73d8d7a420446dd624c66f7c55159817eb2 crypto/aes/asm/bsaes-armv7.pl -34accd08242a6bf4a751105f89b0c4de2cd7e54320753587815647abff7124de crypto/aes/asm/bsaes-x86_64.pl -d9bc047db9b2f54f27fe0d6e2ede9239b4a1f57a14bf89fa3cfba6b836599386 crypto/aes/asm/vpaes-armv8.pl -516421b1a321b842f879ad69e7b82ae3e1f3efc8288c83bb34d6577996e85787 crypto/aes/asm/vpaes-ppc.pl +c7c6694480bb5319690f94826139a93f5c460ebea6dba101b520a76cb956ec93 crypto/aes/asm/aesni-x86_64.pl +0489a10fbb1a8ca3652848d5c1e14e519501e189bad3e5827a573c26df359691 crypto/aes/asm/aesp8-ppc.pl +e397a5781893e97dd90a5a52049633be12a43f379ec5751bca2a6350c39444c8 crypto/aes/asm/aest4-sparcv9.pl +e3955352a92d56905d63e68937e4758f13190a14a10a3dcb1e5c641c49913c0c crypto/aes/asm/aesv8-armx.pl +5e8005fdb6641df465bdda20c3476f7176e6bcd63d5073044a0c02a327c7f172 crypto/aes/asm/bsaes-armv7.pl +0726a2c4c15c27a12b2f7d5e16863df4a1b1daa7b7d9b728f621b2b224d290e6 crypto/aes/asm/bsaes-x86_64.pl +1ff94d6bf6c8ae4809f64657eb89260fe3cb22137f649d3c73f72cb190258196 crypto/aes/asm/vpaes-armv8.pl +c3541865cd02d81101cdbab4877ed82772e6980d2c677b9008b38fa1b26d36d4 crypto/aes/asm/vpaes-ppc.pl 3ec24185750a995377516bc2fb2eae8b1c52094c6fff093bff591837fc12d6c3 crypto/aes/asm/vpaes-x86.pl -47bedbe6a04254eede121e71f11a657b1f1940aee1916bbfc04fa9fb8454f9b8 crypto/aes/asm/vpaes-x86_64.pl -1c9a2a0e8cee4a1283c74b2e306f46f79890f6d236394de2a80d1994fd411d1d crypto/alphacpuid.pl -7a37cadacdbecb50304228dfcb087ad7fbb6e31f6ab69c52dd161e79afb2f9ca crypto/arm64cpuid.pl +060bb6620f50af9afecdf97df051b45b9a50be9daf343dfec1cbb29693ce00a4 crypto/aes/asm/vpaes-x86_64.pl +2bc67270155e2d6c7da87d9070e005ee79cea18311004907edfd6a078003532a crypto/alphacpuid.pl +0255a480b78bdcc71f76676f496962a9828eb900f53b7be13be96ae3f67fe6db crypto/arm64cpuid.pl e0daf54f72dd8fd1bc537d93f34e2a6a887a9ed6027bb33e15a327ef5ff37a42 crypto/armcap.c -24cc7611225df0e20e414c14e80516c36d48bf99659946e85a876d8757356686 crypto/armv4cpuid.pl +a43f2c1eef16146943745f684f2add7d186924932a47abf7fb0760cba02804e6 crypto/armv4cpuid.pl 16739d54200fb81ca7835b5814f965022a2ab41589c7787e2697e3ea72d4fafa crypto/asn1_dsa.c -155eff9d747eed808398cfa2af4b276dfc1f9aac8a0f9d801b314ab3f2bf5b56 crypto/bn/asm/alpha-mont.pl -894cc71b2d783e4e1b54dbef45e9e9280165a2c43981ebdd03282f0e90914928 crypto/bn/asm/armv4-gf2m.pl -0d2e31dc9cdce02c619adfc9ac720ccf7171384e76a84cdf0e686a805dd7006e crypto/bn/asm/armv4-mont.pl -d7df31176f725c1ae7241fee8f681fdcf2ab9eb4d3cc6c80d49c2248ae40a56a crypto/bn/asm/armv8-mont.pl +819c9fd2b0cae9aab81c3cbd1815c2e22949d75f132f649b5883812d0bbaa39a crypto/bn/asm/alpha-mont.pl +0070595128b250b9ebdebe48ce53d2d27ca16ec4f7c6c8bd169ab2e4a913b2d1 crypto/bn/asm/armv4-gf2m.pl +8c1c53a725b8a4f92b8a353bfeeb393be94198df41c912e3270f9e654417b250 crypto/bn/asm/armv4-mont.pl +a0d926004bddb4613552ffa325fac57ab64b085255f2e72881d8478f55890f5a crypto/bn/asm/armv8-mont.pl cb4ad7b7461fcb8e2a0d52881158d0211b79544842d4eae36fc566869a2d62c8 crypto/bn/asm/bn-586.pl -10fb73a6cc1bc064ebdcf6d7fe3c7407ea1c28b0d65ad0123046f8b1518fa75a crypto/bn/asm/c64xplus-gf2m.pl +636da7e2a66272a81f9c99e90b36c6f132ad6236c739e8b9f2e7315f30b72edd crypto/bn/asm/c64xplus-gf2m.pl c86664fb974362ee52a454c83c2c4b23fd5b7d64b3c9e23ef1e0dfd130a46ee5 crypto/bn/asm/co-586.pl -b88190d748056e6a64988bf1a3d19efc4c292e3d338a65f4505cf769a2041077 crypto/bn/asm/ia64-mont.pl +199b9b100f194a2a128c14f2a71be5a04d50d069666d90ca5b69baee1318ccb7 crypto/bn/asm/ia64-mont.pl a511aafbf76647a0c83705d4491c898a5584d300aa449fa6166c8803372946eb crypto/bn/asm/ia64.S -fee42cabeeb87cdf0fa0a6ff3698b2fe98a8a47d10a756052df572097161a8b9 crypto/bn/asm/mips-mont.pl -b197a8e1be79b8c21f8d26b34b9a282ca42ec4bcd1f3212fde3889747082a1f7 crypto/bn/asm/mips.pl -13df09cee06a21669137294f92e5c31b4bf05a8035be6800c1cb4403d7cd8290 crypto/bn/asm/parisc-mont.pl -25c96e545b4981d45557eb14ea5c83aa2d6375ae0df806cb6e6ded2f59ddfed3 crypto/bn/asm/ppc-mont.pl -1c057083546fa1a3bb1b9819dc5110f5a3b11b7bf5a2fb275012323bd7412403 crypto/bn/asm/ppc.pl +687c5d6606fdfd0e242005972d15db74a9cbac2b8a9a54a56fcb1e99d3880ff3 crypto/bn/asm/mips-mont.pl +8aca83d2ec45a40af15e59cff1ac2dc33737a3d25f0a0b74d401fa778a5c5eb8 crypto/bn/asm/mips.pl +b27ec5181e387e812925bb26823b830f49d7a6e4971b6d11ea583f5632a1504b crypto/bn/asm/parisc-mont.pl +9973523b361db963eea4938a7a8a3adc692e1a4e1aec4fa1f1e57dc93da37921 crypto/bn/asm/ppc-mont.pl +59cd27e1e10c4984b7fb684b27f491e7634473b1bcff197a07e0ca653124aa9a crypto/bn/asm/ppc.pl e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 crypto/bn/asm/ppc64-mont-fixed.pl -fe9278a2504fb40257637a4718081775c29c4eb81f87a8528e5c85f8d0c6281a crypto/bn/asm/ppc64-mont.pl -94b2d5cf0faf2efddeb5fb7c575dabc35c1791715cc9299d59a01d9f96cb2d6f crypto/bn/asm/rsaz-avx2.pl -cd0861a565231f67252e172420f6914fe47a324b35916c29f6304491447fe84c crypto/bn/asm/rsaz-avx512.pl -c19c717d87dd1ba74f138af05c044c05f5d025e26323637f46ba54a8c871a378 crypto/bn/asm/rsaz-x86_64.pl -ae26becda9f6d30e9edde8bb89c251a0c40a9a6c879c4cdaec273d8c09af9cd6 crypto/bn/asm/s390x-gf2m.pl -2700337ef133d6688047a1a8e1c671db06016aae777679923ce2b301896762cf crypto/bn/asm/s390x-mont.pl +a25be64867ab837d93855af232e2bfa71b85b2c6f00e35e620fdc5618187fb6f crypto/bn/asm/ppc64-mont.pl +231579e532443665020d4d522d9f11713d9c5d5c814b95b434b0f65452e16de4 crypto/bn/asm/rsaz-avx2.pl +1657600d320ea549b527b2d878a7658533d60d26eeb38f42ea470fc612f9bb53 crypto/bn/asm/rsaz-avx512.pl +31e84dc905b13e38850071528d3abbfcaf8910bbc8b46f38d19c2b386a5f838e crypto/bn/asm/rsaz-x86_64.pl +30fedf48dfc5fec1c2044b6c226dd9fc42a92522cc589797a23a79d452bdd2cf crypto/bn/asm/s390x-gf2m.pl +590388d69d7ac3a0e9af4014792f4f0fdb9552719e8fb48ebc7e5dfca2a491d4 crypto/bn/asm/s390x-mont.pl aa02597f3dc09cfbc190aedb75711859ba0f3efff87067ebfba1ec78ebee40d7 crypto/bn/asm/s390x.S -87d49e83a7df467097fdfc577aa206be9ee622c40fcbbbe5133b35d9783b7816 crypto/bn/asm/sparct4-mont.pl +2f7cbc2c3d93b1bbc4953dda38b9ae0ab3a0a8331a0418d94d9b286183736c9e crypto/bn/asm/sparct4-mont.pl ca21a9ccbc54e19fb7c2e6cdf286ce7cb08b0fba960c777c6edce5c57ccc2101 crypto/bn/asm/sparcv8.S fbc93c8dbbecefe66086f58fe9719ed87b13b2cdc61454a10e841228296fecef crypto/bn/asm/sparcv8plus.S -2ec1497fa06826f7bc574239e425dd8dda0d4a2743e1fe87669ede900291fcb6 crypto/bn/asm/sparcv9-gf2m.pl -1f490fe184c7a51b2d0646a59e69aa659bfe51270ad21594951b8d7b785bac38 crypto/bn/asm/sparcv9-mont.pl -277dcb7faa1913b25fd43946c50039bcdd45cb643fd9ddeedd6c207cefa4dd50 crypto/bn/asm/sparcv9a-mont.pl +127832c1e3d298aad805236776488f5f8836b6a0fdbce3f6b42678163df3909f crypto/bn/asm/sparcv9-gf2m.pl +1622f04a8918724ac0e8804baf285fdafa0eeaaecc36c7facd459d0ff13a8cac crypto/bn/asm/sparcv9-mont.pl +b69083f78b4b4f7097de4462d16649532fb82c453a82cdd9cc1393122661d6e2 crypto/bn/asm/sparcv9a-mont.pl d404375a21d33396824a3da212d6646d4f3150dd141ee4b4a250aefae3482efb crypto/bn/asm/via-mont.pl -d632edf9b9bab7d2cd2d616512a98d15cf4b3ebba7a8e7b83650d654ceb52ecb crypto/bn/asm/vis3-mont.pl +d24f3e97239c8eed5efc721521b025b7256c15e67a54ea6b5c4cf8f7cd0f89ea crypto/bn/asm/vis3-mont.pl 89278854f44d95be916516609ce6f79dcd346bab52574b9b6336a9952aa94bee crypto/bn/asm/x86-gf2m.pl 90d4ae234c08267adce9ed38d56e0edc223f7480cb9605f5d7399d0b3914c6be crypto/bn/asm/x86-mont.pl d444ca73875e97e0ea88b20e4c02f2fcf3850e8b9311e3b67a2d04fe2796d543 crypto/bn/asm/x86_64-gcc.c -a5481ca55d94dc7ebdc93173610d38ae2569cea1fe9b5180debe0ab94e455ce1 crypto/bn/asm/x86_64-gf2m.pl -d8cc080824a72774cb3343a3d50ddf8f41a5b8321203d4c9a764762b62498b96 crypto/bn/asm/x86_64-mont.pl -03788cb685268e6a50ddfa742ea1fe937570c9b86f2ebc88ee35f3304f67c045 crypto/bn/asm/x86_64-mont5.pl +709ddee92e9222ee0ed27bfb90db556e85e2d302e4a9131afa25fdc14c4d858f crypto/bn/asm/x86_64-gf2m.pl +da7f7780d27eed164797e5334cd45b35d9c113e86afaca051463aef9a8fd787c crypto/bn/asm/x86_64-mont.pl +259fb8d7f40c0dba46920b1f169d5b37de03b0fda645463d19e3ae2b56de851d crypto/bn/asm/x86_64-mont5.pl 0ea8185a037a2951bb3d1e590bbbdeac305176d5e618f3e43a04c09733a9de34 crypto/bn/bn_add.c 759c2b9df808b3562fe8b0c7778dbadbf35f261e14fc2d5090d18c35b4181760 crypto/bn/bn_asm.c 14bd5a35c05fcf454854b92fb30b356d7ac618c1eb699dd798f6ad2936d1f5ee crypto/bn/bn_blind.c @@ -77,10 +77,10 @@ d8cc080824a72774cb3343a3d50ddf8f41a5b8321203d4c9a764762b62498b96 crypto/bn/asm/ 2893b6d03d4850d09c15959941b0759bbb50d8c20e873bed088e7cde4e15a65a crypto/bn/bn_ctx.c d94295953ab91469fe2b9da2a542b8ea11ac38551ecde8f8202b7f645c2dea16 crypto/bn/bn_dh.c 74b63a4515894592b7241fb30b91b21510beaa3d397809e3d74bc9a73e879d18 crypto/bn/bn_div.c -49e59eac540db304ab0ca7bee3ba9d45f89548fff98155561bbdb6602d0aab1d crypto/bn/bn_exp.c +46357d2d30109ae59482332adf604a5ef1bd64c7de08cc808db028c45190ba93 crypto/bn/bn_exp.c ec2b6e3af6df473a23e7f1a8522f2554cb0eb5d34e3282458c4a66d242278434 crypto/bn/bn_exp2.c baba7c8ae95af6aa36bc9f4be3a2eed33d500451e568ca4bfc6bc7cb48d4f7ea crypto/bn/bn_gcd.c -5fbb1ab8463cd5544a1d95cf7996b6387ae634984a42256b7a21482ce3ac30a2 crypto/bn/bn_gf2m.c +99325cf50bf72b5d77048c20d7fa4f80a179dc6357023745f9a58c8e914ae136 crypto/bn/bn_gf2m.c 081e8a6abc23599307dab3b1a92113a65e0bf8717cbc40c970c7469350bc4581 crypto/bn/bn_intern.c 602ed46fbfe12c899dfb7d9d99ff0dbfff96b454fce3cd02817f3e2488dd9192 crypto/bn/bn_kron.c 81a4afc27dd1e90c4bfa81c8d385214ce8a2b5884537752944a71ebebd91f4b0 crypto/bn/bn_lib.c @@ -101,14 +101,14 @@ a5c5c9f99961a5a7f22a3dcdce964c8a330f822be17f08652223a20fed747d0a crypto/bn/bn_r 24e62baa56e02f2db6454e10168b7c7fa7638db9221b9acda1803d43f38f36e0 crypto/bn/bn_word.c be27115efd36f0077a3ec26b1ff1f586b0b8969ba05d8ffa34b2ff4badf227bf crypto/bn/rsaz_exp.c c4d64da1cdc732ea918fccd6a7bb2746b03365dd26f7ba1e74e08c307ca4c58e crypto/bn/rsaz_exp.h -5b82cb8dbf3087c2e671871cb0a92e4039223a51af533a2ee996f3bfd47453a7 crypto/bn/rsaz_exp_x2.c +9bc3bf8965f98915f9019d2f516345e73c435c5bd8ad94bb4b7057809a7d1383 crypto/bn/rsaz_exp_x2.c 834db8ff36006e5cb53e09ca6c44290124bd23692f4341ea6563b66fcade4cea crypto/bsearch.c c39334b70e1394e43f378ae8d31b6e6dc125e4d9181e6536d38e649c4eaadb75 crypto/buffer/buffer.c -d2bfdfd96b182741d2d51f91478ffcc48491b0da44662bc1c32bc506b3eef1ba crypto/c64xpluscpuid.pl +5f43844b5d8665de9ab895f93599150a327d73ec2674bbf7d7c512d30163022d crypto/c64xpluscpuid.pl 0e1a41a2d81b5765bca3df448f60bf1fad91e485fe89dd65a7300ffc419e316d crypto/cmac/cmac.c 5113d8d12d884f845cad3d35d92f0a1ee20ebafd7a169273642f4e8178711de9 crypto/context.c c309d81ea991ddf5be4337afad2fd132169f7443c76f863349d3f3c82f3374e4 crypto/core_algorithm.c -f0fd9eb38bf7f196bbb4d26ce8fdf86d0a4f9db219157e66b2c0ffefb4f42005 crypto/core_fetch.c +65ba41169f8fec7cb8466c3458721e3150057fb587db087a70752e5e08201381 crypto/core_fetch.c 799c84d224639c6760c5c28e0e287500a973ca6d0c3d7c1bdcd61b0da4018b3c crypto/core_namemap.c 469e2f53b5f76cd487a60d3d4c44c8fc3a6c4d08405597ba664661ba485508d3 crypto/cpuid.c 71f0fff881eb4c5505fb17662f0ea4bbff24c6858c045a013ad8f786b07da5c4 crypto/cryptlib.c @@ -138,15 +138,15 @@ f4d52d3897219786c6046bf76abb2f174655c584caa50272bf5d281720df5022 crypto/dsa/dsa 196dc024873e413d92672c3a9b6c062ed6269250b0da6d41c0da1c03cfec9ef8 crypto/dsa/dsa_ossl.c 9f501a59c09fc3cb3caafaff25abd44397a94d1062950a4d62e855d2c8986b5a crypto/dsa/dsa_sign.c 53fa10cc87ac63e35df661882852dc46ae68e6fee83b842f1aeefe00b8900ee1 crypto/dsa/dsa_vrf.c -786779d7014bc04846832f80638743784a3850c7ee36e4a8062fe8eb7ac31c9b crypto/ec/asm/ecp_nistp521-ppc64.pl -2e3056ea14fab8b306b0281d6a6f4317a6e86dbf652a79ade726e716cd79bb1e crypto/ec/asm/ecp_nistz256-armv4.pl -a02edef19d22c5aba196080942111ab0172fc2ebe6d6c40db2beb6a1a2d885c6 crypto/ec/asm/ecp_nistz256-armv8.pl -729729f8233c95138158f4647b33a36cf175e707ce29563db0eedc811f324ec0 crypto/ec/asm/ecp_nistz256-ppc64.pl -78a5b172f7c13ae8ac622439ffb9d99b240dbb4bbda3f5c88d1533ae74a445ad crypto/ec/asm/ecp_nistz256-sparcv9.pl +d9722ad8c6b6e209865a921f3cda831d09bf54a55cacd1edd9802edb6559190a crypto/ec/asm/ecp_nistp521-ppc64.pl +78ad06b88fcc8689a3a846b82f9ee01546e5734acd1bccf2494e523b71dc74d1 crypto/ec/asm/ecp_nistz256-armv4.pl +4617351d2de4d0b2abfd358c58050cee00702d0b4c1acca09312ec870e351c7d crypto/ec/asm/ecp_nistz256-armv8.pl +3715ddd921425f3018741037f01455ed26a840ace08691a800708170a66cf4d2 crypto/ec/asm/ecp_nistz256-ppc64.pl +cfe7e75a2fddc87a7251684469a8808b9da82b2f5725eafad5806920f89932bd crypto/ec/asm/ecp_nistz256-sparcv9.pl 922725c4761cfa567af6ed9ecab04f2c7729ae2595f2fc0fa46dc67879dc87b0 crypto/ec/asm/ecp_nistz256-x86.pl -19ba01af58788e2873ebc1d5b503a76604bec0b9b6296fa794946e141fc945a4 crypto/ec/asm/ecp_nistz256-x86_64.pl -e806141073aa3792e2748f6feeee6d3017124b3bc6059a9eca0d53a2f5785346 crypto/ec/asm/x25519-ppc64.pl -a397592dc9fdb13016311db6184b4a3a4f2e198aacb03528f770f30ea4966cc4 crypto/ec/asm/x25519-x86_64.pl +ac327475c7ec828d11aa05628b4e3b81ec3b1400f30fe7bec01daf3cf71f2dc9 crypto/ec/asm/ecp_nistz256-x86_64.pl +cc727533130f5f1a29229929b3d4e8454585d647be25d6344f3c6a0240998368 crypto/ec/asm/x25519-ppc64.pl +ee897e230964511baa0d1bf95fb938312407a40a88ebe01476879c2763e5f732 crypto/ec/asm/x25519-x86_64.pl 340336e01aa04fcde9bfd56536f90c9bc0ad56a002b6cfa321a1e421f1e93ceb crypto/ec/curve25519.c 9a95ec8366154bb20aeb24f4767a8cbb9953ca0380708eb2f39caca6078cd59e crypto/ec/curve448/arch_32/f_impl32.c 063dac1e4a9573c47532123e9e03e3532a7473cc3e146521ba9ec6f486ddf3b1 crypto/ec/curve448/arch_64/arch_intrinsics.h @@ -166,16 +166,16 @@ f6447921a0031fa5beddedd298e82096fb3fdb189b712fab328b61f6beae0c23 crypto/ec/curv ae1637d89287c9d22a34bdc0d67f6e01262a2f8dcef9b61369dba8c334f5a80d crypto/ec/ec2_oct.c 6bbbf570ce31f5b579f7e03ec9f8a774663c7c1eb5e475bd31f8fee94a021ffc crypto/ec/ec2_smpl.c 2a71bd8dbe4f427c117d990581709a4ddce07fa8e530794b5a9574fef7c48a0c crypto/ec/ec_asn1.c -69b1b3acb4295f5fff961b339e8ace913176ca63fcedf4af0da4c27171f24f94 crypto/ec/ec_backend.c +e959960fe9a78ea67346048c9c02428203819d5b443d18fe7bb26cd1ca28fcdc crypto/ec/ec_backend.c 86e2becf9b3870979e2abefa1bd318e1a31820d275e2b50e03b17fc287abb20a crypto/ec/ec_check.c 265f911b9d4aada326a2d52cd8a589b556935c8b641598dcd36c6f85d29ce655 crypto/ec/ec_curve.c 8cfd0dcfb5acbf6105691a2d5e2826dba1ff3906707bc9dd6ff9bffcc306468f crypto/ec/ec_cvt.c 95ce53663ab8a1d05bd6f4999f30113e1edce771fb6d218a772fe02de7bdaf4d crypto/ec/ec_key.c 7e40fc646863e0675bbb90f075b809f61bdf0600d8095c8366858d9533ab7700 crypto/ec/ec_kmeth.c -bbd6f618c3dfe425ce0ba1c6710fe59418130e06351881162a590475e6438c44 crypto/ec/ec_lib.c +fea5cd863cd94b4e543b72942ed8c23175359cfab99ca65203af4ebecb001a15 crypto/ec/ec_lib.c a8a4690e42b4af60aad822aa8b16196df337906af53ea4db926707f7b596ff27 crypto/ec/ec_local.h fa901b996eb0e460359cd470843bdb03af7a77a2f1136c5e1d30daef70f3e4d2 crypto/ec/ec_mult.c -129c6b42417bfcf582f4a959cfd65433e6f85b158274f4fa38f9c62615ac9166 crypto/ec/ec_oct.c +205b17b41e6678f40ec2a92e7856e87904e57121e7dc3120d14a4c4eeafb15b0 crypto/ec/ec_oct.c c7fba2f2c33f67dafa23caef8c3abd12f5336274a9a07d412b83be0366969ee6 crypto/ec/ecdh_kdf.c b2cf8f052a5716137da7b0e857ed7a5df5fb513b6d14534199a05e32f2b5a866 crypto/ec/ecdh_ossl.c 2e00c2e0e6f6d58b81fc23fe500f59e98793dc828ca87d64eba10cc0fddd0dc1 crypto/ec/ecdsa_ossl.c @@ -228,19 +228,19 @@ f897493b50f4e9dd4cacb2a7accda6683c10ece602641874cdff1dac7128a751 crypto/initthr 7290d8d7ec31a98b17618f218d4f27b393501c7606c814a43db8af1975ad1d10 crypto/lhash/lhash.c 5d49ce00fc06df1b64cbc139ef45c71e0faf08a33f966bc608c82d574521a49e crypto/lhash/lhash_local.h f866aafae928db1b439ac950dc90744a2397dfe222672fe68b3798396190c8b0 crypto/mem_clr.c -78a20112586dbce2b8b6e509a0f46f6a36f2a4acf53c3f3511daf7932a71c391 crypto/modes/asm/aes-gcm-armv8_64.pl -e482f02932d77d61142548ca4f3c8d5709d88ec14ab84723d82331444c0f57da crypto/modes/asm/aesni-gcm-x86_64.pl -8fdcb4313fa3a6e541a697525856b9527a06ddf4c794f9393e843f86d67f543c crypto/modes/asm/ghash-alpha.pl -ace8c376b394439301cecaf468d2a9a8adae21eff1d43191cefbf6765023452d crypto/modes/asm/ghash-armv4.pl -c22f4945e7de3bd7bfef73447f09983e40a3e4dd0938244d902a1c44c98a8467 crypto/modes/asm/ghash-c64xplus.pl -315a76491cdba48c88df6549c9efd96b50515400810b185a568b7a871681e03d crypto/modes/asm/ghash-ia64.pl -25e9f494fcb6eb636c04af2f322736fae8aa339037e199332c96b8c9c3a50afa crypto/modes/asm/ghash-parisc.pl -f22d5fa646b4fc2db008b6b05ec07c8790d3ad5485d2b10218fd11d0e81030ba crypto/modes/asm/ghash-s390x.pl -de97107e0c19ff9dd4069f0761eccb00e0b3ced345e1f119ab3b918dd2f9c5f6 crypto/modes/asm/ghash-sparcv9.pl +e14f48d4112c0efe3826b4aa390cc24045a85298cc551ec7f3f36ac4236d7d81 crypto/modes/asm/aes-gcm-armv8_64.pl +1d686af304f94743038f916125effcb51790c025f3165d8d37b526bbeee781f0 crypto/modes/asm/aesni-gcm-x86_64.pl +c2e874a8deb418b5d8c935b2e256370566a5150e040c9fa008cdb5b463c26904 crypto/modes/asm/ghash-alpha.pl +6bc7d63569c73d7020ede481f2de05221ac92403c7cc11e7263ada7644f6aa9b crypto/modes/asm/ghash-armv4.pl +097975df63370de7ebea012d17de14fc1f361fb83acf03b432a99ae7d5bceb24 crypto/modes/asm/ghash-c64xplus.pl +fdde3bc48b37790c6e0006014da71e7a831bbb4fdbfcda2d01dbe0ceb0ba88fa crypto/modes/asm/ghash-ia64.pl +e472d73d06933667a51a0af973479993eed333c71b43af03095450acb36dbeb4 crypto/modes/asm/ghash-parisc.pl +6fb4332ac88113a20915ad4de1931ef88b0114b5379b16e1d967820e1229fbb0 crypto/modes/asm/ghash-s390x.pl +6af1a05981e1d41e4dea51e58938360e3abc4a4f58e179908242466d032b1a8a crypto/modes/asm/ghash-sparcv9.pl 26f55a57e77f774d17dfba93d757f78edfa3a03f68a71ffa37ccf3bfc468b1e2 crypto/modes/asm/ghash-x86.pl -2a0d23a644083e46745c7cb1ca79de393af9336a2e8eab7c85ffeb3b7b1a286f crypto/modes/asm/ghash-x86_64.pl -b407d9fc6ea65fe1a05edc2d139298d78391f3c165314fa6d56dd375b8e453cd crypto/modes/asm/ghashp8-ppc.pl -d8436f6dc43a18d49b1a16999ecb513ccf4483f418f75edc01ce68e777c614a9 crypto/modes/asm/ghashv8-armx.pl +72744131007d2389c09665a59a862f5f6bb61b64bd3456e9b400985cb56586b8 crypto/modes/asm/ghash-x86_64.pl +a4e9f2e496bd9362b17a1b5989aa4682647cefcff6117f0607122a9e11a9dfd9 crypto/modes/asm/ghashp8-ppc.pl +69a13f423ca74c22543900c14aef4a848e3bc75504b65d2f51c6903aebcc17a7 crypto/modes/asm/ghashv8-armx.pl 65112dfe63cd59487e7bdb1706b44acfcf48ecede12cc3ae51daa5b661f41f06 crypto/modes/cbc128.c 1611e73dc1e01b5c2201f51756a7405b7673aa0bb872e2957d1ec80c3530486f crypto/modes/ccm128.c d8c2f256532a4b94db6d03aea5cb609cccc938069f644b2fc77c5015648d148d crypto/modes/cfb128.c @@ -257,7 +257,7 @@ c698d5166d091d6bb6e9df3c211fe1cc916fd43a26ec844f28f547cd708f9c55 crypto/param_b 4fda13f6af05d80b0ab89ec4f5813c274a21a9b4565be958a02d006236cef05c crypto/params_dup.c b6cbfc8791b31587f32a3f9e4c117549793528ebddc34a361bad1ad8cf8d4c42 crypto/params_from_text.c 97cb7414dc2f165d5849ee3b46cdfff0afb067729435d9c01a747e0ca41e230c crypto/ppccap.c -826a78afb376cbf1e87f12a2a67eef2ee47059a0fd3f9cba7ce7f035e34f8052 crypto/ppccpuid.pl +3ca43596a7528dec8ff9d1a3cd0d68b62640f84b1d6a8b5e4842cfd0be1133ad crypto/ppccpuid.pl b4d34272a0bd1fbe6562022bf7ea6259b6a5a021a48222d415be47ef5ef2a905 crypto/property/defn_cache.c c3709986fd2ab18f3c6136d8dd7705a4538986aa789ceafe770c3a376db3c569 crypto/property/property.c 66da4f28d408133fb544b14aeb9ad4913e7c5c67e2826e53f0dc5bf4d8fada26 crypto/property/property_local.h @@ -288,50 +288,50 @@ f01af62704dbf9457e2669c3e7c1d4d740f0388faa49df93611b987a8aa2bf11 crypto/rsa/rsa 3aba73dacebb046faf8d09dc279149b52c629004b524ec33e6d81c8ad0bc31a8 crypto/rsa/rsa_sp800_56b_gen.c 1c1c2aeeb18bf1d69e8f134315b7e50d8f43d30eb1aa5bf42983eec9136a2fdc crypto/rsa/rsa_x931.c 0acbebed48f6242d595c21e3c1ad69da0daa960d62062e8970209deda144f337 crypto/s390xcap.c -370d98549d4d98e04b60677b319b85904259359bd9401dd5385aa728278e6626 crypto/s390xcpuid.pl +22205848cfb55116ebf999dced8331b575886a609ce29e6886e6267b2310c337 crypto/s390xcpuid.pl 5fa59240ca885cbc0c1cd026934b226d44fc9c3fdf0c2e7e3a7bd7f4963ca2e5 crypto/self_test_core.c -58a1a8aeb45421954fa0e4bc87157addb96d086ac4e6aade47da96523cecaa74 crypto/sha/asm/keccak1600-armv4.pl -d6df6cfdd4e2fee52dc16fd31c91768c45c48c22700c486406d70ecb37e8a8bb crypto/sha/asm/keccak1600-armv8.pl -81bfb4484d68a3a3e1d704855f76356090867fe10a75db7707b6f7364e8ee8da crypto/sha/asm/keccak1600-avx2.pl -b7bb35d51d439abbf3810454ccb9bfb5a51e2111eaf389fb95796ad6220a61a0 crypto/sha/asm/keccak1600-avx512.pl -37365dcc576f99006132271968bab990e2bebdab7f4168c726bd449a2fa51c6a crypto/sha/asm/keccak1600-avx512vl.pl -2767ae2f379a7a3d0c6dd1471d4d90dd896545b456cb6efd6c230df29e511d70 crypto/sha/asm/keccak1600-c64x.pl +05c533fde7fdba0c76103e97d881b7224c8427451b453e2f6413552996063e31 crypto/sha/asm/keccak1600-armv4.pl +ca3b2b654f9a8c4bc2fa2538c1f19d17acd4a6b9e0df6a4b81df04efa697e67e crypto/sha/asm/keccak1600-armv8.pl +12b7acce2fba0bc0e1ca07842ec84be6a022f141c86e077abb42c864af1d8d9c crypto/sha/asm/keccak1600-avx2.pl +faf0cccb685d5abc807e08db194f847c67b940da2fc3c235c210dc31d73a5334 crypto/sha/asm/keccak1600-avx512.pl +be1e7dd9998e3f31cfa6e1b17bc198aeec584a8b76820e38f71d51b05f8a9f2a crypto/sha/asm/keccak1600-avx512vl.pl +33bdcc6f7668460c3bdf779633e43bfad62b937042a73acb007b462fc5b0a034 crypto/sha/asm/keccak1600-c64x.pl 09fc831dd39bd90a701e9b16d9e9987cc215252a22e1e0355f5da6c495fca35a crypto/sha/asm/keccak1600-mmx.pl -485dcc50a51705b86c6dc47e6f58d092fec05dfbfcdf4f2785e4235c67cfe742 crypto/sha/asm/keccak1600-ppc64.pl -49535b60a1a981059a2a9636fdeeab22942d2a15e775b1ec9b5af8937a46aa76 crypto/sha/asm/keccak1600-s390x.pl -093751655b460d33b2fa6aa4d63a86e902f7f20b2d2a02ed948b78e5698c0dd5 crypto/sha/asm/keccak1600-x86_64.pl -e0a4a1df82716053a3f01ec0b096c735a0e3c4f6c9d9ec6b2006b37aaac64448 crypto/sha/asm/keccak1600p8-ppc.pl +ce4a58129e5ee3ac4c9dfec5ecc010440570ebf7bf869e3e9977f2121a64b27a crypto/sha/asm/keccak1600-ppc64.pl +a859fc8cb073b2d0012a93f3155a75fb6eb677441462b0de4f8cf8df1445e970 crypto/sha/asm/keccak1600-s390x.pl +618dcd4891b4064d3b8aa6dcd74bea7ef55f4962a64957b05a05448f6e3e0f17 crypto/sha/asm/keccak1600-x86_64.pl +831b8b02ab25d78ba6300ce960d96c13439bfba5844e13061e19c4e25cbacc3d crypto/sha/asm/keccak1600p8-ppc.pl 75d832db9bf0e98e7a5c522169060a6dd276c5118cfb297fc3f1111f55cd4007 crypto/sha/asm/sha1-586.pl -8d937771993f04407f5fdcca8ca8565f9f8a4d9c9a8f7bfd4e9f9121dd0450bb crypto/sha/asm/sha1-alpha.pl -ab7ecd62896324393b1fd9020515b9c0d2b9cc34d559f2efafa35affc9a1485d crypto/sha/asm/sha1-armv4-large.pl -0acc4e40f793d4d2b960af2baaecc91176ba6742ddd62dca0c33ddc838c58772 crypto/sha/asm/sha1-armv8.pl -c36f51761e7f59bdd0f61230297fb802542ac5d2d1c6d2b1096ed937131bd583 crypto/sha/asm/sha1-c64xplus.pl -4ab7c9153b085274a579b388ddff97a4ac7e11585e01811ca95b93a3ec786605 crypto/sha/asm/sha1-ia64.pl -7a392c5ef7dc19c39d67c7080e0c5214e7a80572c85c022be7e7d4378a5f740d crypto/sha/asm/sha1-mb-x86_64.pl -c0fea5a0d32001263c8bcf7fc0757aa68c6a7377f20fef8d28708e1b81de5dec crypto/sha/asm/sha1-mips.pl -f11b75a54c5f42aa3a052de8091bfba47d7cac01920b2fe0ddcb637d4c9d0eb9 crypto/sha/asm/sha1-parisc.pl -d46ef3fc166271a83144d90985034e2c514bd1020b84ec0fe5427ad593bfeb74 crypto/sha/asm/sha1-ppc.pl -a48c7d9403fe99fbd4daec60e96eb22058da766ab9e606d084a63613962851a2 crypto/sha/asm/sha1-s390x.pl -0e2951e0574c64ee055ffddf16ceefdec00823107d60362976605f139ad8ae68 crypto/sha/asm/sha1-sparcv9.pl -5da48400d4fae85e205e95a2fa368e7bf525e51e274b1dd680dfb48645426c85 crypto/sha/asm/sha1-sparcv9a.pl -04b73c902d36c28b5a7eab47cb85f743eb9c648ed5936f64f655524a1010a1b5 crypto/sha/asm/sha1-thumb.pl -f36d7ec7464c932230585a754b91f13cea4cde5a381fc9f798d959256d07910e crypto/sha/asm/sha1-x86_64.pl +c96e87d4f5311cd73bbdf499acc03418588be12426d878e157dd67e0099e0219 crypto/sha/asm/sha1-alpha.pl +4ba6d1c7f12fe76bf39babea966f0a4b7f8769e0c0510cbfc2c46a65dd62d45c crypto/sha/asm/sha1-armv4-large.pl +efc69cb0d867b7fac6b3fa8985c343d1f984d552bc8e75bbbbace0adf9ee5f15 crypto/sha/asm/sha1-armv8.pl +11d332b4e058e9fa418d6633316d2e9f9bf520a08b2d933e877bdf38b2edefcf crypto/sha/asm/sha1-c64xplus.pl +32ff0e701a7b8f25bcfe8477b20795de54f536527bd87d3ce694fd9aaae356d4 crypto/sha/asm/sha1-ia64.pl +471c27efca685b2a82ad7fefe329ca54172df9f49b9785da6d706b913b75e693 crypto/sha/asm/sha1-mb-x86_64.pl +0f5c63cf09e950d1b488935ab3b5562e3e9d5cd1a563fb88a41e3dae90a35e6d crypto/sha/asm/sha1-mips.pl +b5ffd7b6dbb04c05de7efa2945adb67ea845e7e61a3bf163a532f7b6acdf4267 crypto/sha/asm/sha1-parisc.pl +482cd23ca6ec38d6f62b90c68f9f20643579c50f2c0fbb0dab1c10a0e35efe77 crypto/sha/asm/sha1-ppc.pl +28cf69efd53d7a5a8c32e0f8db32c193f41b91faf44f5f59944334bc3f5aa337 crypto/sha/asm/sha1-s390x.pl +7fd355b412ddfa1c510e0ba3284f75b1c0d621b6db2ecb1d2a935d5cdb706628 crypto/sha/asm/sha1-sparcv9.pl +24554e68b0e7b7db7b635ff149549015f623ca0bcd9ae90439586a2076f6ae80 crypto/sha/asm/sha1-sparcv9a.pl +74d197cdd72400cabbff7e173f72c8976723081508b095dc995e8cd1abf3daa6 crypto/sha/asm/sha1-thumb.pl +a59a86293e28f5600609dc8af2b39c5285580ae8636520990b000eeeb67bb889 crypto/sha/asm/sha1-x86_64.pl c099059ef107f548ea2c2bab64a4eb8c277070ce6d74c4d32bb9808dc19c5fa3 crypto/sha/asm/sha256-586.pl -3a8cf38dd398a7ab1d9c6701fa61c428b07c4431a0041ed3a2ddf937897825c1 crypto/sha/asm/sha256-armv4.pl -c394bb5b0ff05595a9e6848b6602a0f29f73a79fc006593740f3ca645ad9d316 crypto/sha/asm/sha256-c64xplus.pl -f33af8e2e2f57b7b63b8c8b35722d7d11ca6ef1f73fb6c4ccebdd3e86912f4b1 crypto/sha/asm/sha256-mb-x86_64.pl +b9cee5c5a283f61f601d2dba68a7a76e7aba10bfafffc1a5c4987f9c0aa6f87d crypto/sha/asm/sha256-armv4.pl +93ddc97651ee3e779144a3c6b3e46a1bc4aa81e75cd7b9df068a2aef8743d25f crypto/sha/asm/sha256-c64xplus.pl +8be5c5d69733ecb16774aa8410b4bcb3623a9f060d2be103d8aa67bf6e4c5843 crypto/sha/asm/sha256-mb-x86_64.pl dd82e1311703abb019975fc7b61fb87d67e1ed916dddd065aced051e851114b9 crypto/sha/asm/sha512-586.pl -1f9ba79b1d591b7aa37b62382422cb025f5b45784d26cc5790c05cf4eb52b792 crypto/sha/asm/sha512-armv4.pl -8136196fce18b736f671a4b4945cd4aa4ab25a28c90c6fc9ab31ff771e8e0d9f crypto/sha/asm/sha512-armv8.pl -5b6796a9978b69fd78ee2ff1adc5cf35d44cad8194a38d1c2aba2023012cf252 crypto/sha/asm/sha512-c64xplus.pl -e8df660671ba61aa2e8f51358baf5d8ca913093e2ee1a40c9cb46d9c2c0851f6 crypto/sha/asm/sha512-ia64.pl -525f253ef8051bfb0e344ac2e40688ce359a42707fe360d23a03f522cc88c81a crypto/sha/asm/sha512-mips.pl -3c3e03529d8514467f8d77c01978348636bb339315feb8041fbde7640565001e crypto/sha/asm/sha512-parisc.pl -952ef1b10e8bbe3f638cc798b91ab9c5b47b66ed8fe94647b1beec9874f2e71e crypto/sha/asm/sha512-ppc.pl -193a0ea240264b29dd68a425f604a6da4b18e28838dcf909dd7e711af880f782 crypto/sha/asm/sha512-s390x.pl -dcb466a1e5938fb64ecb38b0533602192d61334da864ee8dfdcfa12d3cdfa273 crypto/sha/asm/sha512-sparcv9.pl -bb6503967a58b767a3e73441cfabc77f15c8ac747f377e276d4aa63d05f2c3c4 crypto/sha/asm/sha512-x86_64.pl -68d2f3b2dccb978ee42640f4fb4d2eae6b74d071017a3eedd9e7cb77762817dc crypto/sha/asm/sha512p8-ppc.pl +8d84164f3cfd53290c0c14bb5655510b7a9238857866328c0604d64b4e76fe21 crypto/sha/asm/sha512-armv4.pl +dadacb6d66b160913bffb4e1a6c3e5f7be6509b26e2c099701d8d3fdb92c1be0 crypto/sha/asm/sha512-armv8.pl +6f548a088feae3b6faa179653ba449df9d3f5cda1e0561e5b5f120b32274d1eb crypto/sha/asm/sha512-c64xplus.pl +9fa54fbc34fd881f4b344374b9b4f8fb15b641424be7af9a31c71af89ae5d577 crypto/sha/asm/sha512-ia64.pl +fb06844e7c3b014a58dccc8ec6020c71843cfdc5be08288bc7d204f0a840c474 crypto/sha/asm/sha512-mips.pl +11548f06d213947104a80898e000218ec0d6ff3f6913f6582de498476482ce9f crypto/sha/asm/sha512-parisc.pl +7c0c490ce6bb11a228853aecad5e164ce84e5bdabb8a6658ae7184782076c7d3 crypto/sha/asm/sha512-ppc.pl +38e0455fd6a2b93a7a5385379ca92bc6526585ca1eb4af365fac4c78f7285c72 crypto/sha/asm/sha512-s390x.pl +0611845c52091b0208dd41f22ddef9dd1e68d3d92fa4c4360738b840a6314de6 crypto/sha/asm/sha512-sparcv9.pl +f64d16c1e5c3fa4a7969de494a8372127502171a517c14be7a1e3a43a7308699 crypto/sha/asm/sha512-x86_64.pl +8725cabb8d695c576619f19283b034074a3fa0f1c0be952a9dbe9793be15b907 crypto/sha/asm/sha512p8-ppc.pl 57f6cf54b1b5d2cac7a8f622b7b6bd1878f360fff3fa0f02352061c24162ebbb crypto/sha/keccak1600.c 306cacd3f86e5cacaca74c58ef862516515e5c0cafaff48636d537fd84f1c2fb crypto/sha/sha1dgst.c 4d8cf04f5806611e7586aab47fb28165ec1afb00168e2c9876bb36cb5c29bf8b crypto/sha/sha256.c @@ -345,13 +345,13 @@ c50c584c55e56347bb43aca4b796b5344d70daece3061f586b79c871c21f5d1a crypto/sparse_ 7b4efa594d8d1f3ecbf4605cf54f72fb296a3b1d951bdc69e415aaa08f34e5c8 crypto/threads_lib.c a41ae93a755e2ec89b3cb5b4932e2b508fdda92ace2e025a2650a6da0e9e972c crypto/threads_none.c 3729e2bd36f945808b578e0d89fac0fcb3114e4fc9381614bcbd8a9869991716 crypto/threads_pthread.c -88423960f0414f6fd41fba4f4c67f9f7260c2741e4788adcd52493e895ec8027 crypto/threads_win.c -af0af59fe2cb8668a96751f343232d7faa3e7a937beb2bda09ed74fe60b9cb5f crypto/x86_64cpuid.pl +f82715745b668297d71b66d05e6bfc3c817bf80bd967c0f33ca7ffbb6e347645 crypto/threads_win.c +fd6c27cf7c6b5449b17f2b725f4203c4c10207f1973db09fd41571efe5de08fd crypto/x86_64cpuid.pl bbec287bb9bf35379885f8f8998b7fd9e8fc22efee9e1b299109af0f33a7ee16 crypto/x86cpuid.pl acbb841170d4d3eb91d969be1c0e4973b1babfd5fcd76440b0628f509f82fd76 e_os.h 249a0e58e9692920eddc1ada2ac772a0cfd749cfbf618f2f5da08280df545d8f include/crypto/aes_platform.h 8c6f308c1ca774e6127e325c3b80511dbcdc99631f032694d8db53a5c02364ee include/crypto/asn1_dsa.h -2e8c284672c4e8e395b3da56a3abf3e65bb4346313fb6f7358e925d077a2e1e2 include/crypto/bn.h +3bded0eaa7ccdebd0b4217b7fdb82676d5c0762a88aca462dbceaef851fafa99 include/crypto/bn.h 1c46818354d42bd1b1c4e5fdae9e019814936e775fd8c918ca49959c2a6416df include/crypto/bn_conf.h.in 7a43a4898fcc8446065e6c99249bcc14e475716e8c1d40d50408c0ab179520e6 include/crypto/bn_dh.h e69b2b20fb415e24b970941c84a62b752b5d0175bc68126e467f7cc970495504 include/crypto/cryptlib.h @@ -518,7 +518,7 @@ ab298c5f89f3165fa11093fad8063b7bcbff0924b43fb3107148ae66d54adcb5 providers/impl 8ed4a100e4756c31c56147b4b0fab76a4c6e5292aa2f079045f37b5502fd41b9 providers/implementations/ciphers/cipher_aes_gcm_hw_aesni.inc 4c6f3a2818754a5aa7b6db36dae53e248504f9e82cc5af2ed68c723903d4f9d5 providers/implementations/ciphers/cipher_aes_hw.c 89de794c090192459d99d95bc4a422e7782e62192cd0fdb3bdef4128cfedee68 providers/implementations/ciphers/cipher_aes_hw_aesni.inc -fac3a1878dc9c0c363d0ecdd9f74926157df54ca4f40adf8c479927395082008 providers/implementations/ciphers/cipher_aes_ocb.c +0d77239f0cc1a9e1ecdeb45b6fae12cac2637771d29842199be08699e59f87fc providers/implementations/ciphers/cipher_aes_ocb.c 88138a1aff9705e608c0557653be92eb4de65b152555a2b79ec8b2a8fae73e8f providers/implementations/ciphers/cipher_aes_ocb.h 855869ab5a8d7a61a11674cfe5d503dfa67f59e7e393730835d1d8cf0ab85c70 providers/implementations/ciphers/cipher_aes_ocb_hw.c 6a8782c728575d69c86b735c9f47acda5c0daa04e17f1e0faef2c963f23fab20 providers/implementations/ciphers/cipher_aes_wrp.c @@ -557,7 +557,7 @@ b9a61ce951c1904d8315b1bb26c0ab0aaadb47e71d4ead5df0a891608c728c4b providers/impl c95ce5498e724b9b3d58e3c2f4723e7e3e4beb07f9bea9422e43182cbadb43af providers/implementations/include/prov/macsignature.h 29d1a112b799e1f45fdf8bcee8361c2ed67428c250c1cdf408a9fbb7ebf4cce1 providers/implementations/include/prov/names.h 2187713b446d8b6d24ee986748b941ac3e24292c71e07ff9fb53a33021decdda providers/implementations/include/prov/seeding.h -d376c58489ae36fbece94bb88939845ced04a2a0bdd55d6a3562e45a56577ae1 providers/implementations/kdfs/hkdf.c +6091dd22e716fbe6c7c94524cdee6ad4432a572f2d3c4d360dcafafa3902d692 providers/implementations/kdfs/hkdf.c a62e3af09f5af84dcf36f951ba4ac90ca1694adaf3747126186020b155f94186 providers/implementations/kdfs/kbkdf.c e0644e727aacfea4da3cf2c4d2602d7ef0626ebb760b6467432ffd54d5fbb24d providers/implementations/kdfs/pbkdf2.c c0778565abff112c0c5257329a7750ec4605e62f26cc36851fa1fbee6e03c70c providers/implementations/kdfs/pbkdf2.h @@ -566,14 +566,14 @@ abe2b0f3711eaa34846e155cffc9242e4051c45de896f747afd5ac9d87f637dc providers/impl 8571556d77d10e8edc98212473a38f09632e3f19e9995dde89ee6c95f2e84ccf providers/implementations/kdfs/sskdf.c 589f6133799da80760e8bc3ab0191a341ab6d4d2706e92e6eb4a24b0250fefa6 providers/implementations/kdfs/tls1_prf.c 4d4a6d9a562d2dcfec941d3f113a544663b5ac2fbe4accd89ec70c1cc11751d0 providers/implementations/kdfs/x942kdf.c -6b6c776b12664164f3cb54c21df61e1c4477c7855d89431a16fb338cdae58d43 providers/implementations/kem/rsa_kem.c +58acb0ff36bf7e463ba714b347b714eccab9fda77c4ca6bacc3a55e6d2ce5ad9 providers/implementations/kem/rsa_kem.c 11a0d0fb88ed88e965f10b3a0ef6c880f60341df995128f57ad943053aaf15b2 providers/implementations/keymgmt/dh_kmgmt.c -a329f57cb041cd03907e9d996fbc2f378ee116c7f8d7fbf1ea08b7a5df7e0304 providers/implementations/keymgmt/dsa_kmgmt.c +9316fc619e8d8a1d841aa0936fc62c28eb2b4c60cc6c9b2d64b72f8641f28abb providers/implementations/keymgmt/dsa_kmgmt.c 9bc88451d3ae110c7a108ee73d3b3b6bda801ec3494d2dfb9c9970b85c2d34fe providers/implementations/keymgmt/ec_kmgmt.c 258ae17bb2dd87ed1511a8eb3fe99eed9b77f5c2f757215ff6b3d0e8791fc251 providers/implementations/keymgmt/ec_kmgmt_imexport.inc -011c36aad6834729043f23eacab417732541ee23916d9afa5bb9164862be00bb providers/implementations/keymgmt/ecx_kmgmt.c +d0c67b7fbddd51dcfebd96bf99794ca3bc437d50974ebcd56968fb8dd3627b0f providers/implementations/keymgmt/ecx_kmgmt.c 053a2be39a87f50b877ebdbbf799cf5faf8b2de33b04311d819d212ee1ea329b providers/implementations/keymgmt/kdf_legacy_kmgmt.c -1646b477fa231dd0f6c22444c99098f9b447cab0d39ff69b811262469d4dbe09 providers/implementations/keymgmt/mac_legacy_kmgmt.c +37e2f9f904eeabf94b1e4152b67ac236f872aa78dd7e47bf0de1b8f50ac19b6c providers/implementations/keymgmt/mac_legacy_kmgmt.c 19f22fc70a6321441e56d5bd4aab3d01d52d17069d4e4b5cefce0f411ecece75 providers/implementations/keymgmt/rsa_kmgmt.c 5eb96ea2df635cf79c5aeccae270fbe896b5e6384a5b3e4b187ce8c10fe8dfc7 providers/implementations/macs/cmac_prov.c e69aa06f8f3c6f5a26702b9f44a844b8589b99dc0ee590953a29e8b9ef10acbe providers/implementations/macs/gmac_prov.c @@ -588,7 +588,7 @@ f9457255fc57ef5739aa2584e535195e38cc947e31fd044d28d64c28c8a946ce providers/impl 04339b66c10017229ef368cb48077f58a252ebfda9ab12b9f919e4149b1036ed providers/implementations/rands/test_rng.c cafb9e6f54ad15889fcebddac6df61336bff7d78936f7de3bb5aab8aee5728d2 providers/implementations/signature/dsa_sig.c a30dc6308de0ca33406e7ce909f3bcf7580fb84d863b0976b275839f866258df providers/implementations/signature/ecdsa_sig.c -02e833a767afbe98247d6f09dfb1eb5a5cf7304a93f2c5427a9f6af9c8a3b549 providers/implementations/signature/eddsa_sig.c +09647b736980ac3c762f1e7c10cbfee78e2c6ab327ac62e5039968cea034ff3b providers/implementations/signature/eddsa_sig.c 3bb0f342b4cc1b4594ed0986adc47791c0a7b5c1ae7b1888c1fb5edb268a78d9 providers/implementations/signature/mac_legacy_sig.c 166d7e3a049b28ae2c6f94415070720d176a82e46af1613511c4b073ea705476 providers/implementations/signature/rsa_sig.c a14e901b02fe095713624db4080b3aa3ca685d43f9ebec03041f992240973346 ssl/record/tls_pad.c diff --git a/deps/openssl/openssl/providers/fips.checksum b/deps/openssl/openssl/providers/fips.checksum index cbd9c09511796a..0904f6a1029ed9 100644 --- a/deps/openssl/openssl/providers/fips.checksum +++ b/deps/openssl/openssl/providers/fips.checksum @@ -1 +1 @@ -101807560af8f62c064ad796dfa1e4c269d45aaf5303b47ad0b25fdd6cc92466 providers/fips-sources.checksums +01b31117f96429fe4c8efbf7f4f10ef32efa2b11c69851fd227e4194db116b6f providers/fips-sources.checksums diff --git a/deps/openssl/openssl/providers/implementations/ciphers/cipher_aes_ocb.c b/deps/openssl/openssl/providers/implementations/ciphers/cipher_aes_ocb.c index eab315453ef1a3..891e73f6726cac 100644 --- a/deps/openssl/openssl/providers/implementations/ciphers/cipher_aes_ocb.c +++ b/deps/openssl/openssl/providers/implementations/ciphers/cipher_aes_ocb.c @@ -369,12 +369,20 @@ static int aes_ocb_set_ctx_params(void *vctx, const OSSL_PARAM params[]) } if (p->data == NULL) { /* Tag len must be 0 to 16 */ - if (p->data_size > OCB_MAX_TAG_LEN) + if (p->data_size > OCB_MAX_TAG_LEN) { + ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_TAG_LENGTH); return 0; + } ctx->taglen = p->data_size; } else { - if (p->data_size != ctx->taglen || ctx->base.enc) + if (ctx->base.enc) { + ERR_raise(ERR_LIB_PROV, ERR_R_PASSED_INVALID_ARGUMENT); + return 0; + } + if (p->data_size != ctx->taglen) { + ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_TAG_LENGTH); return 0; + } memcpy(ctx->tag, p->data, p->data_size); } } diff --git a/deps/openssl/openssl/providers/implementations/encode_decode/encode_key2text.c b/deps/openssl/openssl/providers/implementations/encode_decode/encode_key2text.c index 3e75a9afb370c6..637fcf6a1214b3 100644 --- a/deps/openssl/openssl/providers/implementations/encode_decode/encode_key2text.c +++ b/deps/openssl/openssl/providers/implementations/encode_decode/encode_key2text.c @@ -112,7 +112,8 @@ static int print_labeled_bignum(BIO *out, const char *label, const BIGNUM *bn) use_sep = 0; /* The first byte on the next line doesnt have a : */ } if (BIO_printf(out, "%s%c%c", use_sep ? ":" : "", - tolower(p[0]), tolower(p[1])) <= 0) + tolower((unsigned char)p[0]), + tolower((unsigned char)p[1])) <= 0) goto err; ++bytes; p += 2; diff --git a/deps/openssl/openssl/providers/implementations/kdfs/hkdf.c b/deps/openssl/openssl/providers/implementations/kdfs/hkdf.c index 3db8b43891a000..69ef565d04fcca 100644 --- a/deps/openssl/openssl/providers/implementations/kdfs/hkdf.c +++ b/deps/openssl/openssl/providers/implementations/kdfs/hkdf.c @@ -669,7 +669,7 @@ static int prov_tls13_hkdf_generate_secret(OSSL_LIB_CTX *libctx, EVP_MD_CTX_free(mctx); /* Generate the pre-extract secret */ - if (!prov_tls13_hkdf_expand(md, prevsecret, mdlen, + if (!prov_tls13_hkdf_expand(md, prevsecret, prevsecretlen, prefix, prefixlen, label, labellen, hash, mdlen, preextractsec, mdlen)) return 0; diff --git a/deps/openssl/openssl/providers/implementations/kdfs/scrypt.c b/deps/openssl/openssl/providers/implementations/kdfs/scrypt.c index a7072f785f0877..6fa4192600fd26 100644 --- a/deps/openssl/openssl/providers/implementations/kdfs/scrypt.c +++ b/deps/openssl/openssl/providers/implementations/kdfs/scrypt.c @@ -1,5 +1,5 @@ /* - * Copyright 2017-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2017-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -88,7 +88,9 @@ static void kdf_scrypt_reset(void *vctx) KDF_SCRYPT *ctx = (KDF_SCRYPT *)vctx; OPENSSL_free(ctx->salt); + ctx->salt = NULL; OPENSSL_clear_free(ctx->pass, ctx->pass_len); + ctx->pass = NULL; kdf_scrypt_init(ctx); } @@ -128,7 +130,6 @@ static int set_digest(KDF_SCRYPT *ctx) EVP_MD_free(ctx->sha256); ctx->sha256 = EVP_MD_fetch(ctx->libctx, "sha256", ctx->propq); if (ctx->sha256 == NULL) { - OPENSSL_free(ctx); ERR_raise(ERR_LIB_PROV, PROV_R_UNABLE_TO_LOAD_SHA256); return 0; } diff --git a/deps/openssl/openssl/providers/implementations/kem/rsa_kem.c b/deps/openssl/openssl/providers/implementations/kem/rsa_kem.c index 882cf161258ab9..94c5bceea597be 100644 --- a/deps/openssl/openssl/providers/implementations/kem/rsa_kem.c +++ b/deps/openssl/openssl/providers/implementations/kem/rsa_kem.c @@ -264,6 +264,17 @@ static int rsasve_generate(PROV_RSA_CTX *prsactx, *secretlen = nlen; return 1; } + + /* + * If outlen is specified, then it must report the length + * of the out buffer on input so that we can confirm + * its size is sufficent for encapsulation + */ + if (outlen != NULL && *outlen < nlen) { + ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_OUTPUT_LENGTH); + return 0; + } + /* * Step (2): Generate a random byte string z of nlen bytes where * 1 < z < n - 1 @@ -285,15 +296,33 @@ static int rsasve_generate(PROV_RSA_CTX *prsactx, return ret; } -/* - * NIST.SP.800-56Br2 +/** + * rsasve_recover - Recovers a secret value from ciphertext using an RSA + * private key. Once, recovered, the secret value is considered to be a + * shared secret. Algorithm is preformed as per + * NIST SP 800-56B Rev 2 * 7.2.1.3 RSASVE Recovery Operation (RSASVE.RECOVER). + * + * This function performs RSA decryption using the private key from the + * provided RSA context (`prsactx`). It takes the input ciphertext, decrypts + * it, and writes the decrypted message to the output buffer. + * + * @prsactx: The RSA context containing the private key. + * @out: The output buffer to store the decrypted message. + * @outlen: On input, the size of the output buffer. On successful + * completion, the actual length of the decrypted message. + * @in: The input buffer containing the ciphertext to be decrypted. + * @inlen: The length of the input ciphertext in bytes. + * + * Returns 1 on success, or 0 on error. In case of error, appropriate + * error messages are raised using the ERR_raise function. */ static int rsasve_recover(PROV_RSA_CTX *prsactx, unsigned char *out, size_t *outlen, const unsigned char *in, size_t inlen) { size_t nlen; + int ret; /* Step (1): get the byte length of n */ nlen = RSA_size(prsactx->rsa); @@ -307,13 +336,30 @@ static int rsasve_recover(PROV_RSA_CTX *prsactx, return 1; } - /* Step (2): check the input ciphertext 'inlen' matches the nlen */ + /* + * Step (2): check the input ciphertext 'inlen' matches the nlen + * and that outlen is at least nlen bytes + */ if (inlen != nlen) { ERR_raise(ERR_LIB_PROV, PROV_R_BAD_LENGTH); return 0; } + + /* + * If outlen is specified, then it must report the length + * of the out buffer, so that we can confirm that it is of + * sufficient size to hold the output of decapsulation + */ + if (outlen != NULL && *outlen < nlen) { + ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_OUTPUT_LENGTH); + return 0; + } + /* Step (3): out = RSADP((n,d), in) */ - return (RSA_private_decrypt(inlen, in, out, prsactx->rsa, RSA_NO_PADDING) > 0); + ret = RSA_private_decrypt(inlen, in, out, prsactx->rsa, RSA_NO_PADDING); + if (ret > 0 && outlen != NULL) + *outlen = ret; + return ret > 0; } static int rsakem_generate(void *vprsactx, unsigned char *out, size_t *outlen, diff --git a/deps/openssl/openssl/providers/implementations/keymgmt/dsa_kmgmt.c b/deps/openssl/openssl/providers/implementations/keymgmt/dsa_kmgmt.c index 2f5742cfcc07ce..e3c3fd6916ed37 100644 --- a/deps/openssl/openssl/providers/implementations/keymgmt/dsa_kmgmt.c +++ b/deps/openssl/openssl/providers/implementations/keymgmt/dsa_kmgmt.c @@ -426,7 +426,7 @@ static void *dsa_gen_init(void *provctx, int selection, gctx->hindex = 0; } if (!dsa_gen_set_params(gctx, params)) { - OPENSSL_free(gctx); + dsa_gen_cleanup(gctx); gctx = NULL; } return gctx; diff --git a/deps/openssl/openssl/providers/implementations/keymgmt/ecx_kmgmt.c b/deps/openssl/openssl/providers/implementations/keymgmt/ecx_kmgmt.c index 987d38456fba41..94e62f755c20de 100644 --- a/deps/openssl/openssl/providers/implementations/keymgmt/ecx_kmgmt.c +++ b/deps/openssl/openssl/providers/implementations/keymgmt/ecx_kmgmt.c @@ -487,7 +487,7 @@ static void *ecx_gen_init(void *provctx, int selection, gctx->selection = selection; } if (!ecx_gen_set_params(gctx, params)) { - OPENSSL_free(gctx); + ecx_gen_cleanup(gctx); gctx = NULL; } return gctx; diff --git a/deps/openssl/openssl/providers/implementations/keymgmt/mac_legacy_kmgmt.c b/deps/openssl/openssl/providers/implementations/keymgmt/mac_legacy_kmgmt.c index 1fae4407fca609..b02a0a91c6f661 100644 --- a/deps/openssl/openssl/providers/implementations/keymgmt/mac_legacy_kmgmt.c +++ b/deps/openssl/openssl/providers/implementations/keymgmt/mac_legacy_kmgmt.c @@ -1,5 +1,5 @@ /* - * Copyright 2020-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2020-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -399,7 +399,7 @@ static void *mac_gen_init(void *provctx, int selection, struct mac_gen_ctx *gctx = mac_gen_init_common(provctx, selection); if (gctx != NULL && !mac_gen_set_params(gctx, params)) { - OPENSSL_free(gctx); + mac_gen_cleanup(gctx); gctx = NULL; } return gctx; @@ -411,7 +411,7 @@ static void *cmac_gen_init(void *provctx, int selection, struct mac_gen_ctx *gctx = mac_gen_init_common(provctx, selection); if (gctx != NULL && !cmac_gen_set_params(gctx, params)) { - OPENSSL_free(gctx); + mac_gen_cleanup(gctx); gctx = NULL; } return gctx; diff --git a/deps/openssl/openssl/providers/implementations/signature/eddsa_sig.c b/deps/openssl/openssl/providers/implementations/signature/eddsa_sig.c index c78f1fbb5fa6bf..9ec910af2527e7 100644 --- a/deps/openssl/openssl/providers/implementations/signature/eddsa_sig.c +++ b/deps/openssl/openssl/providers/implementations/signature/eddsa_sig.c @@ -1,5 +1,5 @@ /* - * Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2020-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -133,6 +133,7 @@ static int eddsa_digest_signverify_init(void *vpeddsactx, const char *mdname, /* Should never happen */ ERR_raise(ERR_LIB_PROV, ERR_R_INTERNAL_ERROR); ossl_ecx_key_free(edkey); + WPACKET_cleanup(&pkt); return 0; } if (ret && WPACKET_finish(&pkt)) { diff --git a/deps/openssl/openssl/providers/implementations/storemgmt/file_store.c b/deps/openssl/openssl/providers/implementations/storemgmt/file_store.c index bb8b2ab8625a1e..3049a9c81133cc 100644 --- a/deps/openssl/openssl/providers/implementations/storemgmt/file_store.c +++ b/deps/openssl/openssl/providers/implementations/storemgmt/file_store.c @@ -238,7 +238,7 @@ static void *file_open(void *provctx, const char *uri) #ifdef _WIN32 /* Windows file: URIs with a drive letter start with a / */ if (p[0] == '/' && p[2] == ':' && p[3] == '/') { - char c = tolower(p[1]); + char c = tolower((unsigned char)p[1]); if (c >= 'a' && c <= 'z') { p++; diff --git a/deps/openssl/openssl/ssl/build.info b/deps/openssl/openssl/ssl/build.info index d99835c9a0dad8..0851357f81eba5 100644 --- a/deps/openssl/openssl/ssl/build.info +++ b/deps/openssl/openssl/ssl/build.info @@ -37,11 +37,8 @@ IF[{- !$disabled{'deprecated-3.0'} -}] SHARED_SOURCE[../libssl]=s3_cbc.c SOURCE[../libssl]=ssl_rsa_legacy.c ENDIF -DEFINE[../libssl]=$AESDEF -IF[{- !$disabled{quic} -}] - SOURCE[../libssl]=ssl_quic.c statem/statem_quic.c -ENDIF +DEFINE[../libssl]=$AESDEF SOURCE[../providers/libcommon.a]=record/tls_pad.c SOURCE[../providers/libdefault.a ../providers/libfips.a]=s3_cbc.c diff --git a/deps/openssl/openssl/ssl/s3_msg.c b/deps/openssl/openssl/ssl/s3_msg.c index dd2fe040e041d5..c0f0dbc17dcc21 100644 --- a/deps/openssl/openssl/ssl/s3_msg.c +++ b/deps/openssl/openssl/ssl/s3_msg.c @@ -81,16 +81,6 @@ int ssl3_dispatch_alert(SSL *s) s->s3.alert_dispatch = 0; alertlen = 2; -#ifndef OPENSSL_NO_QUIC - if (SSL_IS_QUIC(s)) { - if (!s->quic_method->send_alert(s, s->quic_write_level, - s->s3.send_alert[1])) { - ERR_raise(ERR_LIB_SSL, ERR_R_INTERNAL_ERROR); - return 0; - } - i = 1; - } else -#endif i = do_ssl3_write(s, SSL3_RT_ALERT, &s->s3.send_alert[0], &alertlen, 1, 0, &written); if (i <= 0) { diff --git a/deps/openssl/openssl/ssl/ssl_ciph.c b/deps/openssl/openssl/ssl/ssl_ciph.c index 76a1a8c967e356..9e32417e75d860 100644 --- a/deps/openssl/openssl/ssl/ssl_ciph.c +++ b/deps/openssl/openssl/ssl/ssl_ciph.c @@ -2240,37 +2240,3 @@ const char *OSSL_default_ciphersuites(void) "TLS_CHACHA20_POLY1305_SHA256:" "TLS_AES_128_GCM_SHA256"; } - -#ifndef OPENSSL_NO_QUIC -int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c) -{ - switch (c->algorithm2 & (0xFF << TLS1_PRF_DGST_SHIFT)) { - default: - break; - case TLS1_PRF_SHA1_MD5: /* TLS1_PRF */ - return NID_md5_sha1; - case TLS1_PRF_SHA256: - return NID_sha256; - case TLS1_PRF_SHA384: - return NID_sha384; - case TLS1_PRF_GOST94: - return NID_id_GostR3411_94_prf; - case TLS1_PRF_GOST12_256: - return NID_id_GostR3411_2012_256; - case TLS1_PRF_GOST12_512: - return NID_id_GostR3411_2012_512; - } - /* TLSv1.3 ciphers don't specify separate PRF */ - switch (c->algorithm2 & SSL_HANDSHAKE_MAC_MASK) { - default: - break; - case SSL_HANDSHAKE_MAC_MD5_SHA1: /* SSL_HANDSHAKE_MAC_DEFAULT */ - return NID_md5_sha1; - case SSL_HANDSHAKE_MAC_SHA256: - return NID_sha256; - case SSL_HANDSHAKE_MAC_SHA384: - return NID_sha384; - } - return NID_undef; -} -#endif diff --git a/deps/openssl/openssl/ssl/ssl_err.c b/deps/openssl/openssl/ssl/ssl_err.c index fe0d9c280f7e55..75be692e0007b4 100644 --- a/deps/openssl/openssl/ssl/ssl_err.c +++ b/deps/openssl/openssl/ssl/ssl_err.c @@ -241,8 +241,6 @@ static const ERR_STRING_DATA SSL_str_reasons[] = { {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_PARAMETERS), "missing parameters"}, {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_PSK_KEX_MODES_EXTENSION), "missing psk kex modes extension"}, - {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_QUIC_TRANSPORT_PARAMETERS_EXTENSION), - "missing quic transport parameters extension"}, {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_RSA_CERTIFICATE), "missing rsa certificate"}, {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_RSA_ENCRYPTING_CERT), @@ -550,8 +548,6 @@ static const ERR_STRING_DATA SSL_str_reasons[] = { {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_WRONG_CIPHER_RETURNED), "wrong cipher returned"}, {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_WRONG_CURVE), "wrong curve"}, - {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_WRONG_ENCRYPTION_LEVEL_RECEIVED), - "wrong encryption level received"}, {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_WRONG_SIGNATURE_LENGTH), "wrong signature length"}, {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_WRONG_SIGNATURE_SIZE), diff --git a/deps/openssl/openssl/ssl/ssl_lib.c b/deps/openssl/openssl/ssl/ssl_lib.c index 2619636df88372..e628140dfae9a7 100644 --- a/deps/openssl/openssl/ssl/ssl_lib.c +++ b/deps/openssl/openssl/ssl/ssl_lib.c @@ -581,56 +581,7 @@ static void clear_ciphers(SSL *s) ssl_clear_hash_ctx(&s->write_hash); } -#ifndef OPENSSL_NO_QUIC int SSL_clear(SSL *s) -{ - if (!SSL_clear_not_quic(s)) - return 0; - return SSL_clear_quic(s); -} - -int SSL_clear_quic(SSL *s) -{ - OPENSSL_free(s->ext.peer_quic_transport_params_draft); - s->ext.peer_quic_transport_params_draft = NULL; - s->ext.peer_quic_transport_params_draft_len = 0; - OPENSSL_free(s->ext.peer_quic_transport_params); - s->ext.peer_quic_transport_params = NULL; - s->ext.peer_quic_transport_params_len = 0; - s->quic_read_level = ssl_encryption_initial; - s->quic_write_level = ssl_encryption_initial; - s->quic_latest_level_received = ssl_encryption_initial; - while (s->quic_input_data_head != NULL) { - QUIC_DATA *qd; - - qd = s->quic_input_data_head; - s->quic_input_data_head = qd->next; - OPENSSL_free(qd); - } - s->quic_input_data_tail = NULL; - BUF_MEM_free(s->quic_buf); - s->quic_buf = NULL; - s->quic_next_record_start = 0; - memset(s->client_hand_traffic_secret, 0, EVP_MAX_MD_SIZE); - memset(s->server_hand_traffic_secret, 0, EVP_MAX_MD_SIZE); - memset(s->client_early_traffic_secret, 0, EVP_MAX_MD_SIZE); - /* - * CONFIG - DON'T CLEAR - * s->ext.quic_transport_params - * s->ext.quic_transport_params_len - * s->quic_transport_version - * s->quic_method = NULL; - */ - return 1; -} -#endif - -/* Keep this conditional very local */ -#ifndef OPENSSL_NO_QUIC -int SSL_clear_not_quic(SSL *s) -#else -int SSL_clear(SSL *s) -#endif { if (s->method == NULL) { ERR_raise(ERR_LIB_SSL, SSL_R_NO_METHOD_SPECIFIED); @@ -905,10 +856,6 @@ SSL *SSL_new(SSL_CTX *ctx) s->job = NULL; -#ifndef OPENSSL_NO_QUIC - s->quic_method = ctx->quic_method; -#endif - #ifndef OPENSSL_NO_CT if (!SSL_set_ct_validation_callback(s, ctx->ct_validation_callback, ctx->ct_validation_callback_arg)) @@ -1306,20 +1253,6 @@ void SSL_free(SSL *s) OPENSSL_free(s->pha_context); EVP_MD_CTX_free(s->pha_dgst); -#ifndef OPENSSL_NO_QUIC - OPENSSL_free(s->ext.quic_transport_params); - OPENSSL_free(s->ext.peer_quic_transport_params_draft); - OPENSSL_free(s->ext.peer_quic_transport_params); - BUF_MEM_free(s->quic_buf); - while (s->quic_input_data_head != NULL) { - QUIC_DATA *qd; - - qd = s->quic_input_data_head; - s->quic_input_data_head = qd->next; - OPENSSL_free(qd); - } -#endif - sk_X509_NAME_pop_free(s->ca_names, X509_NAME_free); sk_X509_NAME_pop_free(s->client_ca_names, X509_NAME_free); @@ -1919,12 +1852,6 @@ static int ssl_io_intern(void *vargs) int ssl_read_internal(SSL *s, void *buf, size_t num, size_t *readbytes) { -#ifndef OPENSSL_NO_QUIC - if (SSL_IS_QUIC(s)) { - ERR_raise(ERR_LIB_SSL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); - return -1; - } -#endif if (s->handshake_func == NULL) { ERR_raise(ERR_LIB_SSL, SSL_R_UNINITIALIZED); return -1; @@ -2056,12 +1983,6 @@ int SSL_get_early_data_status(const SSL *s) static int ssl_peek_internal(SSL *s, void *buf, size_t num, size_t *readbytes) { -#ifndef OPENSSL_NO_QUIC - if (SSL_IS_QUIC(s)) { - ERR_raise(ERR_LIB_SSL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); - return -1; - } -#endif if (s->handshake_func == NULL) { ERR_raise(ERR_LIB_SSL, SSL_R_UNINITIALIZED); return -1; @@ -2122,12 +2043,6 @@ int SSL_peek_ex(SSL *s, void *buf, size_t num, size_t *readbytes) int ssl_write_internal(SSL *s, const void *buf, size_t num, size_t *written) { -#ifndef OPENSSL_NO_QUIC - if (SSL_IS_QUIC(s)) { - ERR_raise(ERR_LIB_SSL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); - return -1; - } -#endif if (s->handshake_func == NULL) { ERR_raise(ERR_LIB_SSL, SSL_R_UNINITIALIZED); return -1; @@ -3960,11 +3875,6 @@ int SSL_get_error(const SSL *s, int i) } if (SSL_want_read(s)) { -#ifndef OPENSSL_NO_QUIC - if (SSL_IS_QUIC(s)) { - return SSL_ERROR_WANT_READ; - } -#endif bio = SSL_get_rbio(s); if (BIO_should_read(bio)) return SSL_ERROR_WANT_READ; @@ -4064,21 +3974,6 @@ int SSL_do_handshake(SSL *s) ret = s->handshake_func(s); } } -#ifndef OPENSSL_NO_QUIC - if (SSL_IS_QUIC(s) && ret == 1) { - if (s->server) { - if (s->early_data_state == SSL_EARLY_DATA_ACCEPTING) { - s->early_data_state = SSL_EARLY_DATA_FINISHED_READING; - s->rwstate = SSL_READING; - ret = 0; - } - } else if (s->early_data_state == SSL_EARLY_DATA_CONNECTING) { - s->early_data_state = SSL_EARLY_DATA_WRITE_RETRY; - s->rwstate = SSL_READING; - ret = 0; - } - } -#endif return ret; } diff --git a/deps/openssl/openssl/ssl/ssl_local.h b/deps/openssl/openssl/ssl/ssl_local.h index 51c4a77a9ed7c5..5fb1feb801635a 100644 --- a/deps/openssl/openssl/ssl/ssl_local.h +++ b/deps/openssl/openssl/ssl/ssl_local.h @@ -337,13 +337,6 @@ /* Flag used on OpenSSL ciphersuite ids to indicate they are for SSLv3+ */ # define SSL3_CK_CIPHERSUITE_FLAG 0x03000000 -/* Check if an SSL structure is using QUIC (which uses TLSv1.3) */ -# ifndef OPENSSL_NO_QUIC -# define SSL_IS_QUIC(s) (s->quic_method != NULL) -# else -# define SSL_IS_QUIC(s) 0 -# endif - /* Check if an SSL structure is using DTLS */ # define SSL_IS_DTLS(s) (s->method->ssl3_enc->enc_flags & SSL_ENC_FLAG_DTLS) @@ -773,8 +766,6 @@ typedef enum tlsext_index_en { TLSEXT_IDX_cryptopro_bug, TLSEXT_IDX_early_data, TLSEXT_IDX_certificate_authorities, - TLSEXT_IDX_quic_transport_parameters_draft, - TLSEXT_IDX_quic_transport_parameters, TLSEXT_IDX_padding, TLSEXT_IDX_psk, /* Dummy index - must always be the last entry */ @@ -1214,25 +1205,10 @@ struct ssl_ctx_st { uint32_t disabled_mac_mask; uint32_t disabled_mkey_mask; uint32_t disabled_auth_mask; - -#ifndef OPENSSL_NO_QUIC - const SSL_QUIC_METHOD *quic_method; -#endif }; typedef struct cert_pkey_st CERT_PKEY; -#ifndef OPENSSL_NO_QUIC -struct quic_data_st { - struct quic_data_st *next; - OSSL_ENCRYPTION_LEVEL level; - size_t start; /* offset into quic_buf->data */ - size_t length; -}; -typedef struct quic_data_st QUIC_DATA; -int quic_set_encryption_secrets(SSL *ssl, OSSL_ENCRYPTION_LEVEL level); -#endif - struct ssl_st { /* * protocol version (one of SSL2_VERSION, SSL3_VERSION, TLS1_VERSION, @@ -1492,11 +1468,6 @@ struct ssl_st { unsigned char handshake_traffic_hash[EVP_MAX_MD_SIZE]; unsigned char client_app_traffic_secret[EVP_MAX_MD_SIZE]; unsigned char server_app_traffic_secret[EVP_MAX_MD_SIZE]; -# ifndef OPENSSL_NO_QUIC - unsigned char client_hand_traffic_secret[EVP_MAX_MD_SIZE]; - unsigned char server_hand_traffic_secret[EVP_MAX_MD_SIZE]; - unsigned char client_early_traffic_secret[EVP_MAX_MD_SIZE]; -# endif unsigned char exporter_master_secret[EVP_MAX_MD_SIZE]; unsigned char early_exporter_master_secret[EVP_MAX_MD_SIZE]; EVP_CIPHER_CTX *enc_read_ctx; /* cryptographic state */ @@ -1709,35 +1680,8 @@ struct ssl_st { * selected. */ int tick_identity; - -#ifndef OPENSSL_NO_QUIC - uint8_t *quic_transport_params; - size_t quic_transport_params_len; - uint8_t *peer_quic_transport_params_draft; - size_t peer_quic_transport_params_draft_len; - uint8_t *peer_quic_transport_params; - size_t peer_quic_transport_params_len; -#endif } ext; -#ifndef OPENSSL_NO_QUIC - OSSL_ENCRYPTION_LEVEL quic_read_level; - OSSL_ENCRYPTION_LEVEL quic_write_level; - OSSL_ENCRYPTION_LEVEL quic_latest_level_received; - BUF_MEM *quic_buf; /* buffer incoming handshake messages */ - /* - * defaults to 0, but can be set to: - * - TLSEXT_TYPE_quic_transport_parameters_draft - * - TLSEXT_TYPE_quic_transport_parameters - * Client: if 0, send both - * Server: if 0, use same version as client sent - */ - int quic_transport_version; - QUIC_DATA *quic_input_data_head; - QUIC_DATA *quic_input_data_tail; - size_t quic_next_record_start; - const SSL_QUIC_METHOD *quic_method; -#endif /* * Parsed form of the ClientHello, kept around across client_hello_cb * calls. @@ -2867,11 +2811,6 @@ void custom_exts_free(custom_ext_methods *exts); void ssl_comp_free_compression_methods_int(void); -#ifndef OPENSSL_NO_QUIC -__owur int SSL_clear_not_quic(SSL *s); -__owur int SSL_clear_quic(SSL *s); -#endif - /* ssl_mcnf.c */ void ssl_ctx_system_config(SSL_CTX *ctx); diff --git a/deps/openssl/openssl/ssl/ssl_quic.c b/deps/openssl/openssl/ssl/ssl_quic.c deleted file mode 100644 index 987c1e740ca714..00000000000000 --- a/deps/openssl/openssl/ssl/ssl_quic.c +++ /dev/null @@ -1,378 +0,0 @@ -/* - * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved. - * - * Licensed under the Apache License 2.0 (the "License"). You may not use - * this file except in compliance with the License. You can obtain a copy - * in the file LICENSE in the source distribution or at - * https://www.openssl.org/source/license.html - */ - -#include "ssl_local.h" -#include "internal/cryptlib.h" -#include "internal/refcount.h" - -int SSL_set_quic_transport_params(SSL *ssl, const uint8_t *params, - size_t params_len) -{ - uint8_t *tmp; - - if (params == NULL || params_len == 0) { - tmp = NULL; - params_len = 0; - } else { - tmp = OPENSSL_memdup(params, params_len); - if (tmp == NULL) - return 0; - } - - OPENSSL_free(ssl->ext.quic_transport_params); - ssl->ext.quic_transport_params = tmp; - ssl->ext.quic_transport_params_len = params_len; - return 1; -} - -void SSL_get_peer_quic_transport_params(const SSL *ssl, - const uint8_t **out_params, - size_t *out_params_len) -{ - if (ssl->ext.peer_quic_transport_params_len) { - *out_params = ssl->ext.peer_quic_transport_params; - *out_params_len = ssl->ext.peer_quic_transport_params_len; - } else { - *out_params = ssl->ext.peer_quic_transport_params_draft; - *out_params_len = ssl->ext.peer_quic_transport_params_draft_len; - } -} - -/* Returns the negotiated version, or -1 on error */ -int SSL_get_peer_quic_transport_version(const SSL *ssl) -{ - if (ssl->ext.peer_quic_transport_params_len != 0 - && ssl->ext.peer_quic_transport_params_draft_len != 0) - return -1; - if (ssl->ext.peer_quic_transport_params_len != 0) - return TLSEXT_TYPE_quic_transport_parameters; - if (ssl->ext.peer_quic_transport_params_draft_len != 0) - return TLSEXT_TYPE_quic_transport_parameters_draft; - - return -1; -} - -void SSL_set_quic_use_legacy_codepoint(SSL *ssl, int use_legacy) -{ - if (use_legacy) - ssl->quic_transport_version = TLSEXT_TYPE_quic_transport_parameters_draft; - else - ssl->quic_transport_version = TLSEXT_TYPE_quic_transport_parameters; -} - -void SSL_set_quic_transport_version(SSL *ssl, int version) -{ - ssl->quic_transport_version = version; -} - -int SSL_get_quic_transport_version(const SSL *ssl) -{ - return ssl->quic_transport_version; -} - -size_t SSL_quic_max_handshake_flight_len(const SSL *ssl, OSSL_ENCRYPTION_LEVEL level) -{ - /* - * Limits flights to 16K by default when there are no large - * (certificate-carrying) messages. - */ - static const size_t DEFAULT_FLIGHT_LIMIT = 16384; - - switch (level) { - case ssl_encryption_initial: - return DEFAULT_FLIGHT_LIMIT; - case ssl_encryption_early_data: - /* QUIC does not send EndOfEarlyData. */ - return 0; - case ssl_encryption_handshake: - if (ssl->server) { - /* - * Servers may receive Certificate message if configured to request - * client certificates. - */ - if ((ssl->verify_mode & SSL_VERIFY_PEER) - && ssl->max_cert_list > DEFAULT_FLIGHT_LIMIT) - return ssl->max_cert_list; - } else { - /* - * Clients may receive both Certificate message and a CertificateRequest - * message. - */ - if (2*ssl->max_cert_list > DEFAULT_FLIGHT_LIMIT) - return 2 * ssl->max_cert_list; - } - return DEFAULT_FLIGHT_LIMIT; - case ssl_encryption_application: - return DEFAULT_FLIGHT_LIMIT; - } - - return 0; -} - -OSSL_ENCRYPTION_LEVEL SSL_quic_read_level(const SSL *ssl) -{ - return ssl->quic_read_level; -} - -OSSL_ENCRYPTION_LEVEL SSL_quic_write_level(const SSL *ssl) -{ - return ssl->quic_write_level; -} - -int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len) -{ - size_t l, offset; - - if (!SSL_IS_QUIC(ssl)) { - ERR_raise(ERR_LIB_SSL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); - return 0; - } - - /* Level can be different than the current read, but not less */ - if (level < ssl->quic_read_level - || (ssl->quic_input_data_tail != NULL && level < ssl->quic_input_data_tail->level) - || level < ssl->quic_latest_level_received) { - ERR_raise(ERR_LIB_SSL, SSL_R_WRONG_ENCRYPTION_LEVEL_RECEIVED); - return 0; - } - - if (len == 0) - return 1; - - if (ssl->quic_buf == NULL) { - BUF_MEM *buf; - if ((buf = BUF_MEM_new()) == NULL) { - ERR_raise(ERR_LIB_SSL, ERR_R_INTERNAL_ERROR); - return 0; - } - if (!BUF_MEM_grow(buf, SSL3_RT_MAX_PLAIN_LENGTH)) { - ERR_raise(ERR_LIB_SSL, ERR_R_INTERNAL_ERROR); - BUF_MEM_free(buf); - return 0; - } - ssl->quic_buf = buf; - /* We preallocated storage, but there's still no *data*. */ - ssl->quic_buf->length = 0; - buf = NULL; - } - - /* A TLS message must not cross an encryption level boundary */ - if (ssl->quic_buf->length != ssl->quic_next_record_start - && level != ssl->quic_latest_level_received) { - ERR_raise(ERR_LIB_SSL, SSL_R_WRONG_ENCRYPTION_LEVEL_RECEIVED); - return 0; - } - ssl->quic_latest_level_received = level; - - offset = ssl->quic_buf->length; - if (!BUF_MEM_grow(ssl->quic_buf, offset + len)) { - ERR_raise(ERR_LIB_SSL, ERR_R_INTERNAL_ERROR); - return 0; - } - memcpy(ssl->quic_buf->data + offset, data, len); - - /* Split on handshake message boundaries */ - while (ssl->quic_buf->length > ssl->quic_next_record_start - + SSL3_HM_HEADER_LENGTH) { - QUIC_DATA *qd; - const uint8_t *p; - - /* TLS Handshake message header has 1-byte type and 3-byte length */ - p = (const uint8_t *)ssl->quic_buf->data - + ssl->quic_next_record_start + 1; - n2l3(p, l); - l += SSL3_HM_HEADER_LENGTH; - /* Don't allocate a QUIC_DATA if we don't have a full record */ - if (l > ssl->quic_buf->length - ssl->quic_next_record_start) - break; - - qd = OPENSSL_zalloc(sizeof(*qd)); - if (qd == NULL) { - ERR_raise(ERR_LIB_SSL, ERR_R_INTERNAL_ERROR); - return 0; - } - - qd->next = NULL; - qd->length = l; - qd->start = ssl->quic_next_record_start; - qd->level = level; - - if (ssl->quic_input_data_tail != NULL) - ssl->quic_input_data_tail->next = qd; - else - ssl->quic_input_data_head = qd; - ssl->quic_input_data_tail = qd; - ssl->quic_next_record_start += l; - } - - return 1; -} - -int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method) -{ - if (ctx->method->version != TLS_ANY_VERSION) - return 0; - ctx->quic_method = quic_method; - ctx->options &= ~SSL_OP_ENABLE_MIDDLEBOX_COMPAT; - return 1; -} - -int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method) -{ - if (ssl->method->version != TLS_ANY_VERSION) - return 0; - ssl->quic_method = quic_method; - ssl->options &= ~SSL_OP_ENABLE_MIDDLEBOX_COMPAT; - return 1; -} - -int quic_set_encryption_secrets(SSL *ssl, OSSL_ENCRYPTION_LEVEL level) -{ - uint8_t *c2s_secret = NULL; - uint8_t *s2c_secret = NULL; - size_t len; - const EVP_MD *md; - - if (!SSL_IS_QUIC(ssl)) - return 1; - - /* secrets from the POV of the client */ - switch (level) { - case ssl_encryption_early_data: - c2s_secret = ssl->client_early_traffic_secret; - break; - case ssl_encryption_handshake: - c2s_secret = ssl->client_hand_traffic_secret; - s2c_secret = ssl->server_hand_traffic_secret; - break; - case ssl_encryption_application: - c2s_secret = ssl->client_app_traffic_secret; - s2c_secret = ssl->server_app_traffic_secret; - break; - default: - return 1; - } - - if (level == ssl_encryption_early_data) { - const SSL_CIPHER *c = SSL_SESSION_get0_cipher(ssl->session); - if (ssl->early_data_state == SSL_EARLY_DATA_CONNECTING - && ssl->max_early_data > 0 - && ssl->session->ext.max_early_data == 0) { - if (!ossl_assert(ssl->psksession != NULL - && ssl->max_early_data == - ssl->psksession->ext.max_early_data)) { - SSLfatal(ssl, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR); - return 0; - } - c = SSL_SESSION_get0_cipher(ssl->psksession); - } - - if (c == NULL) { - SSLfatal(ssl, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR); - return 0; - } - - md = ssl_md(ssl->ctx, c->algorithm2); - } else { - md = ssl_handshake_md(ssl); - if (md == NULL) { - /* May not have selected cipher, yet */ - const SSL_CIPHER *c = NULL; - - /* - * It probably doesn't make sense to use an (external) PSK session, - * but in theory some kinds of external session caches could be - * implemented using it, so allow psksession to be used as well as - * the regular session. - */ - if (ssl->session != NULL) - c = SSL_SESSION_get0_cipher(ssl->session); - else if (ssl->psksession != NULL) - c = SSL_SESSION_get0_cipher(ssl->psksession); - - if (c != NULL) - md = SSL_CIPHER_get_handshake_digest(c); - } - } - - if ((len = EVP_MD_size(md)) <= 0) { - SSLfatal(ssl, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR); - return 0; - } - - if (ssl->server) { - if (!ssl->quic_method->set_encryption_secrets(ssl, level, c2s_secret, - s2c_secret, len)) { - SSLfatal(ssl, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR); - return 0; - } - } else { - if (!ssl->quic_method->set_encryption_secrets(ssl, level, s2c_secret, - c2s_secret, len)) { - SSLfatal(ssl, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR); - return 0; - } - } - - return 1; -} - -int SSL_process_quic_post_handshake(SSL *ssl) -{ - int ret; - - if (SSL_in_init(ssl) || !SSL_IS_QUIC(ssl)) { - ERR_raise(ERR_LIB_SSL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); - return 0; - } - - /* if there is no data, return success as BoringSSL */ - while (ssl->quic_input_data_head != NULL) { - /* - * This is always safe (we are sure to be at a record boundary) because - * SSL_read()/SSL_write() are never used for QUIC connections -- the - * application data is handled at the QUIC layer instead. - */ - ossl_statem_set_in_init(ssl, 1); - ret = ssl->handshake_func(ssl); - ossl_statem_set_in_init(ssl, 0); - - if (ret <= 0) - return 0; - } - return 1; -} - -int SSL_is_quic(SSL* ssl) -{ - return SSL_IS_QUIC(ssl); -} - -void SSL_set_quic_early_data_enabled(SSL *ssl, int enabled) -{ - if (!SSL_is_quic(ssl) || !SSL_in_before(ssl)) - return; - - if (!enabled) { - ssl->early_data_state = SSL_EARLY_DATA_NONE; - return; - } - - if (ssl->server) { - ssl->early_data_state = SSL_EARLY_DATA_ACCEPTING; - return; - } - - if ((ssl->session == NULL || ssl->session->ext.max_early_data == 0) - && ssl->psk_use_session_cb == NULL) - return; - - ssl->early_data_state = SSL_EARLY_DATA_CONNECTING; -} diff --git a/deps/openssl/openssl/ssl/statem/extensions.c b/deps/openssl/openssl/ssl/statem/extensions.c index ed78744119e209..f8157389b7f18b 100644 --- a/deps/openssl/openssl/ssl/statem/extensions.c +++ b/deps/openssl/openssl/ssl/statem/extensions.c @@ -59,11 +59,6 @@ static int final_early_data(SSL *s, unsigned int context, int sent); static int final_maxfragmentlen(SSL *s, unsigned int context, int sent); static int init_post_handshake_auth(SSL *s, unsigned int context); static int final_psk(SSL *s, unsigned int context, int sent); -#ifndef OPENSSL_NO_QUIC -static int init_quic_transport_params(SSL *s, unsigned int context); -static int final_quic_transport_params_draft(SSL *s, unsigned int context, int sent); -static int final_quic_transport_params(SSL *s, unsigned int context, int sent); -#endif /* Structure to define a built-in extension */ typedef struct extensions_definition_st { @@ -375,29 +370,6 @@ static const EXTENSION_DEFINITION ext_defs[] = { tls_construct_certificate_authorities, tls_construct_certificate_authorities, NULL, }, -#ifndef OPENSSL_NO_QUIC - { - TLSEXT_TYPE_quic_transport_parameters_draft, - SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_3_ENCRYPTED_EXTENSIONS - | SSL_EXT_TLS_IMPLEMENTATION_ONLY | SSL_EXT_TLS1_3_ONLY, - init_quic_transport_params, - tls_parse_ctos_quic_transport_params_draft, tls_parse_stoc_quic_transport_params_draft, - tls_construct_stoc_quic_transport_params_draft, tls_construct_ctos_quic_transport_params_draft, - final_quic_transport_params_draft, - }, - { - TLSEXT_TYPE_quic_transport_parameters, - SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_3_ENCRYPTED_EXTENSIONS - | SSL_EXT_TLS_IMPLEMENTATION_ONLY | SSL_EXT_TLS1_3_ONLY, - init_quic_transport_params, - tls_parse_ctos_quic_transport_params, tls_parse_stoc_quic_transport_params, - tls_construct_stoc_quic_transport_params, tls_construct_ctos_quic_transport_params, - final_quic_transport_params, - }, -#else - INVALID_EXTENSION, - INVALID_EXTENSION, -#endif { /* Must be immediately before pre_shared_key */ TLSEXT_TYPE_padding, @@ -1750,44 +1722,3 @@ static int final_psk(SSL *s, unsigned int context, int sent) return 1; } - -#ifndef OPENSSL_NO_QUIC -static int init_quic_transport_params(SSL *s, unsigned int context) -{ - return 1; -} - -static int final_quic_transport_params_draft(SSL *s, unsigned int context, - int sent) -{ - return 1; -} - -static int final_quic_transport_params(SSL *s, unsigned int context, int sent) -{ - /* called after final_quic_transport_params_draft */ - if (SSL_IS_QUIC(s)) { - if (s->ext.peer_quic_transport_params_len == 0 - && s->ext.peer_quic_transport_params_draft_len == 0) { - SSLfatal(s, SSL_AD_MISSING_EXTENSION, - SSL_R_MISSING_QUIC_TRANSPORT_PARAMETERS_EXTENSION); - return 0; - } - /* if we got both, discard the one we can't use */ - if (s->ext.peer_quic_transport_params_len != 0 - && s->ext.peer_quic_transport_params_draft_len != 0) { - if (s->quic_transport_version == TLSEXT_TYPE_quic_transport_parameters_draft) { - OPENSSL_free(s->ext.peer_quic_transport_params); - s->ext.peer_quic_transport_params = NULL; - s->ext.peer_quic_transport_params_len = 0; - } else { - OPENSSL_free(s->ext.peer_quic_transport_params_draft); - s->ext.peer_quic_transport_params_draft = NULL; - s->ext.peer_quic_transport_params_draft_len = 0; - } - } - } - - return 1; -} -#endif diff --git a/deps/openssl/openssl/ssl/statem/extensions_clnt.c b/deps/openssl/openssl/ssl/statem/extensions_clnt.c index 3b0781fc71c70e..ced88f77ba3c30 100644 --- a/deps/openssl/openssl/ssl/statem/extensions_clnt.c +++ b/deps/openssl/openssl/ssl/statem/extensions_clnt.c @@ -1196,47 +1196,7 @@ EXT_RETURN tls_construct_ctos_post_handshake_auth(SSL *s, WPACKET *pkt, #endif } -#ifndef OPENSSL_NO_QUIC -EXT_RETURN tls_construct_ctos_quic_transport_params_draft(SSL *s, WPACKET *pkt, - unsigned int context, X509 *x, - size_t chainidx) -{ - if (s->quic_transport_version == TLSEXT_TYPE_quic_transport_parameters - || s->ext.quic_transport_params == NULL - || s->ext.quic_transport_params_len == 0) { - return EXT_RETURN_NOT_SENT; - } - - if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_quic_transport_parameters_draft) - || !WPACKET_sub_memcpy_u16(pkt, s->ext.quic_transport_params, - s->ext.quic_transport_params_len)) { - SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR); - return EXT_RETURN_FAIL; - } - - return EXT_RETURN_SENT; -} -EXT_RETURN tls_construct_ctos_quic_transport_params(SSL *s, WPACKET *pkt, - unsigned int context, X509 *x, - size_t chainidx) -{ - if (s->quic_transport_version == TLSEXT_TYPE_quic_transport_parameters_draft - || s->ext.quic_transport_params == NULL - || s->ext.quic_transport_params_len == 0) { - return EXT_RETURN_NOT_SENT; - } - - if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_quic_transport_parameters) - || !WPACKET_sub_memcpy_u16(pkt, s->ext.quic_transport_params, - s->ext.quic_transport_params_len)) { - SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR); - return EXT_RETURN_FAIL; - } - - return EXT_RETURN_SENT; -} -#endif /* * Parse the server's renegotiation binding and abort if it's not right */ @@ -1964,17 +1924,6 @@ int tls_parse_stoc_early_data(SSL *s, PACKET *pkt, unsigned int context, return 0; } -#ifndef OPENSSL_NO_QUIC - /* - * QUIC server must send 0xFFFFFFFF or it's a PROTOCOL_VIOLATION - * per RFC9001 S4.6.1 - */ - if (SSL_IS_QUIC(s) && max_early_data != 0xFFFFFFFF) { - SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER, SSL_R_INVALID_MAX_EARLY_DATA); - return 0; - } -#endif - s->session->ext.max_early_data = max_early_data; return 1; @@ -2057,37 +2006,3 @@ int tls_parse_stoc_psk(SSL *s, PACKET *pkt, unsigned int context, X509 *x, return 1; } -#ifndef OPENSSL_NO_QUIC -int tls_parse_stoc_quic_transport_params_draft(SSL *s, PACKET *pkt, - unsigned int context, X509 *x, - size_t chainidx) -{ - OPENSSL_free(s->ext.peer_quic_transport_params_draft); - s->ext.peer_quic_transport_params_draft = NULL; - s->ext.peer_quic_transport_params_draft_len = 0; - - if (!PACKET_memdup(pkt, - &s->ext.peer_quic_transport_params_draft, - &s->ext.peer_quic_transport_params_draft_len)) { - SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR); - return 0; - } - return 1; -} - -int tls_parse_stoc_quic_transport_params(SSL *s, PACKET *pkt, unsigned int context, - X509 *x, size_t chainidx) -{ - OPENSSL_free(s->ext.peer_quic_transport_params); - s->ext.peer_quic_transport_params = NULL; - s->ext.peer_quic_transport_params_len = 0; - - if (!PACKET_memdup(pkt, - &s->ext.peer_quic_transport_params, - &s->ext.peer_quic_transport_params_len)) { - SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR); - return 0; - } - return 1; -} -#endif diff --git a/deps/openssl/openssl/ssl/statem/extensions_srvr.c b/deps/openssl/openssl/ssl/statem/extensions_srvr.c index 546d11dd1f73af..72c00574be6863 100644 --- a/deps/openssl/openssl/ssl/statem/extensions_srvr.c +++ b/deps/openssl/openssl/ssl/statem/extensions_srvr.c @@ -1083,7 +1083,7 @@ int tls_parse_ctos_psk(SSL *s, PACKET *pkt, unsigned int context, X509 *x, if (sesstmp == NULL) { SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR); - return 0; + goto err; } SSL_SESSION_free(sess); sess = sesstmp; @@ -1237,40 +1237,6 @@ int tls_parse_ctos_post_handshake_auth(SSL *s, PACKET *pkt, return 1; } -#ifndef OPENSSL_NO_QUIC -int tls_parse_ctos_quic_transport_params_draft(SSL *s, PACKET *pkt, unsigned int context, - X509 *x, size_t chainidx) -{ - OPENSSL_free(s->ext.peer_quic_transport_params_draft); - s->ext.peer_quic_transport_params_draft = NULL; - s->ext.peer_quic_transport_params_draft_len = 0; - - if (!PACKET_memdup(pkt, - &s->ext.peer_quic_transport_params_draft, - &s->ext.peer_quic_transport_params_draft_len)) { - SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR); - return 0; - } - return 1; -} - -int tls_parse_ctos_quic_transport_params(SSL *s, PACKET *pkt, unsigned int context, - X509 *x, size_t chainidx) -{ - OPENSSL_free(s->ext.peer_quic_transport_params); - s->ext.peer_quic_transport_params = NULL; - s->ext.peer_quic_transport_params_len = 0; - - if (!PACKET_memdup(pkt, - &s->ext.peer_quic_transport_params, - &s->ext.peer_quic_transport_params_len)) { - SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR); - return 0; - } - return 1; -} -#endif - /* * Add the server's renegotiation binding */ @@ -1911,20 +1877,12 @@ EXT_RETURN tls_construct_stoc_early_data(SSL *s, WPACKET *pkt, size_t chainidx) { if (context == SSL_EXT_TLS1_3_NEW_SESSION_TICKET) { - uint32_t max_early_data = s->max_early_data; - - if (max_early_data == 0) + if (s->max_early_data == 0) return EXT_RETURN_NOT_SENT; -#ifndef OPENSSL_NO_QUIC - /* QUIC server must always send 0xFFFFFFFF, per RFC9001 S4.6.1 */ - if (SSL_IS_QUIC(s)) - max_early_data = 0xFFFFFFFF; -#endif - if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_early_data) || !WPACKET_start_sub_packet_u16(pkt) - || !WPACKET_put_bytes_u32(pkt, max_early_data) + || !WPACKET_put_bytes_u32(pkt, s->max_early_data) || !WPACKET_close(pkt)) { SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR); return EXT_RETURN_FAIL; @@ -1962,48 +1920,3 @@ EXT_RETURN tls_construct_stoc_psk(SSL *s, WPACKET *pkt, unsigned int context, return EXT_RETURN_SENT; } - -#ifndef OPENSSL_NO_QUIC -EXT_RETURN tls_construct_stoc_quic_transport_params_draft(SSL *s, WPACKET *pkt, - unsigned int context, - X509 *x, - size_t chainidx) -{ - if (s->quic_transport_version == TLSEXT_TYPE_quic_transport_parameters - || s->ext.peer_quic_transport_params_draft_len == 0 - || s->ext.quic_transport_params == NULL - || s->ext.quic_transport_params_len == 0) { - return EXT_RETURN_NOT_SENT; - } - - if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_quic_transport_parameters_draft) - || !WPACKET_sub_memcpy_u16(pkt, s->ext.quic_transport_params, - s->ext.quic_transport_params_len)) { - SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR); - return EXT_RETURN_FAIL; - } - - return EXT_RETURN_SENT; -} - -EXT_RETURN tls_construct_stoc_quic_transport_params(SSL *s, WPACKET *pkt, - unsigned int context, X509 *x, - size_t chainidx) -{ - if (s->quic_transport_version == TLSEXT_TYPE_quic_transport_parameters_draft - || s->ext.peer_quic_transport_params_len == 0 - || s->ext.quic_transport_params == NULL - || s->ext.quic_transport_params_len == 0) { - return EXT_RETURN_NOT_SENT; - } - - if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_quic_transport_parameters) - || !WPACKET_sub_memcpy_u16(pkt, s->ext.quic_transport_params, - s->ext.quic_transport_params_len)) { - SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR); - return EXT_RETURN_FAIL; - } - - return EXT_RETURN_SENT; -} -#endif diff --git a/deps/openssl/openssl/ssl/statem/statem.c b/deps/openssl/openssl/ssl/statem/statem.c index d80d4da2038d1b..553546d93a411f 100644 --- a/deps/openssl/openssl/ssl/statem/statem.c +++ b/deps/openssl/openssl/ssl/statem/statem.c @@ -334,13 +334,8 @@ static int state_machine(SSL *s, int server) * If we are stateless then we already called SSL_clear() - don't do * it again and clear the STATELESS flag itself. */ -#ifndef OPENSSL_NO_QUIC - if ((s->s3.flags & TLS1_FLAGS_STATELESS) == 0 && !SSL_clear_not_quic(s)) - return -1; -#else if ((s->s3.flags & TLS1_FLAGS_STATELESS) == 0 && !SSL_clear(s)) return -1; -#endif } #ifndef OPENSSL_NO_SCTP if (SSL_IS_DTLS(s) && BIO_dgram_is_sctp(SSL_get_wbio(s))) { @@ -588,11 +583,6 @@ static SUB_STATE_RETURN read_state_machine(SSL *s) * In DTLS we get the whole message in one go - header and body */ ret = dtls_get_message(s, &mt); -#ifndef OPENSSL_NO_QUIC - } else if (SSL_IS_QUIC(s)) { - /* QUIC behaves like DTLS -- all in one go. */ - ret = quic_get_message(s, &mt); -#endif } else { ret = tls_get_message_header(s, &mt); } @@ -622,8 +612,8 @@ static SUB_STATE_RETURN read_state_machine(SSL *s) return SUB_STATE_ERROR; } - /* dtls_get_message/quic_get_message already did this */ - if (!SSL_IS_DTLS(s) && !SSL_IS_QUIC(s) + /* dtls_get_message already did this */ + if (!SSL_IS_DTLS(s) && s->s3.tmp.message_size > 0 && !grow_init_buf(s, s->s3.tmp.message_size + SSL3_HM_HEADER_LENGTH)) { @@ -641,10 +631,6 @@ static SUB_STATE_RETURN read_state_machine(SSL *s) * opportunity to do any further processing. */ ret = dtls_get_message_body(s, &len); -#ifndef OPENSSL_NO_QUIC - } else if (SSL_IS_QUIC(s)) { - ret = quic_get_message_body(s, &len); -#endif } else { ret = tls_get_message_body(s, &len); } @@ -935,14 +921,6 @@ static SUB_STATE_RETURN write_state_machine(SSL *s) int statem_flush(SSL *s) { s->rwstate = SSL_WRITING; -#ifndef OPENSSL_NO_QUIC - if (SSL_IS_QUIC(s)) { - if (!s->quic_method->flush_flight(s)) { - ERR_raise(ERR_LIB_SSL, ERR_R_INTERNAL_ERROR); - return 0; - } - } else -#endif if (BIO_flush(s->wbio) <= 0) { return 0; } diff --git a/deps/openssl/openssl/ssl/statem/statem_clnt.c b/deps/openssl/openssl/ssl/statem/statem_clnt.c index 9d925091b6c618..3cd1ee2d3dfe1f 100644 --- a/deps/openssl/openssl/ssl/statem/statem_clnt.c +++ b/deps/openssl/openssl/ssl/statem/statem_clnt.c @@ -904,14 +904,6 @@ int ossl_statem_client_construct_message(SSL *s, WPACKET *pkt, break; case TLS_ST_CW_END_OF_EARLY_DATA: -#ifndef OPENSSL_NO_QUIC - /* QUIC does not send EndOfEarlyData, RFC9001 S8.3 */ - if (SSL_IS_QUIC(s)) { - *confunc = NULL; - *mt = SSL3_MT_DUMMY; - break; - } -#endif *confunc = tls_construct_end_of_early_data; *mt = SSL3_MT_END_OF_EARLY_DATA; break; diff --git a/deps/openssl/openssl/ssl/statem/statem_lib.c b/deps/openssl/openssl/ssl/statem/statem_lib.c index 121929b06f4062..6f0eaa5d6c0d21 100644 --- a/deps/openssl/openssl/ssl/statem/statem_lib.c +++ b/deps/openssl/openssl/ssl/statem/statem_lib.c @@ -45,29 +45,8 @@ int ssl3_do_write(SSL *s, int type) int ret; size_t written = 0; -#ifndef OPENSSL_NO_QUIC - if (SSL_IS_QUIC(s)) { - if (type == SSL3_RT_HANDSHAKE) { - ret = s->quic_method->add_handshake_data(s, s->quic_write_level, - (const uint8_t*)&s->init_buf->data[s->init_off], - s->init_num); - if (!ret) { - ret = -1; - /* QUIC can't sent anything out sice the above failed */ - ERR_raise(ERR_LIB_SSL, ERR_R_INTERNAL_ERROR); - } else { - written = s->init_num; - } - } else { - /* QUIC doesn't use ChangeCipherSpec */ - ret = -1; - ERR_raise(ERR_LIB_SSL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); - } - } else -#endif - ret = ssl3_write_bytes(s, type, &s->init_buf->data[s->init_off], - s->init_num, &written); - + ret = ssl3_write_bytes(s, type, &s->init_buf->data[s->init_off], + s->init_num, &written); if (ret <= 0) return -1; if (type == SSL3_RT_HANDSHAKE) @@ -666,13 +645,6 @@ int tls_construct_finished(SSL *s, WPACKET *pkt) int tls_construct_key_update(SSL *s, WPACKET *pkt) { -#ifndef OPENSSL_NO_QUIC - if (SSL_is_quic(s)) { - /* TLS KeyUpdate is not used for QUIC, so this is an error. */ - SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR); - return 0; - } -#endif if (!WPACKET_put_bytes_u8(pkt, s->key_update)) { SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR); return 0; @@ -695,13 +667,6 @@ MSG_PROCESS_RETURN tls_process_key_update(SSL *s, PACKET *pkt) return MSG_PROCESS_ERROR; } -#ifndef OPENSSL_NO_QUIC - if (SSL_is_quic(s)) { - SSLfatal(s, SSL_AD_UNEXPECTED_MESSAGE, SSL_R_UNEXPECTED_MESSAGE); - return MSG_PROCESS_ERROR; - } -#endif - if (!PACKET_get_1(pkt, &updatetype) || PACKET_remaining(pkt) != 0) { SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_R_BAD_KEY_UPDATE); diff --git a/deps/openssl/openssl/ssl/statem/statem_local.h b/deps/openssl/openssl/ssl/statem/statem_local.h index 4203c084e8749b..ad4d93b1e27989 100644 --- a/deps/openssl/openssl/ssl/statem/statem_local.h +++ b/deps/openssl/openssl/ssl/statem/statem_local.h @@ -104,10 +104,6 @@ __owur int tls_get_message_header(SSL *s, int *mt); __owur int tls_get_message_body(SSL *s, size_t *len); __owur int dtls_get_message(SSL *s, int *mt); __owur int dtls_get_message_body(SSL *s, size_t *len); -#ifndef OPENSSL_NO_QUIC -__owur int quic_get_message(SSL *s, int *mt); -__owur int quic_get_message_body(SSL *s, size_t *len); -#endif /* Message construction and processing functions */ __owur int tls_process_initial_server_flight(SSL *s); @@ -255,14 +251,6 @@ int tls_parse_ctos_psk(SSL *s, PACKET *pkt, unsigned int context, X509 *x, size_t chainidx); int tls_parse_ctos_post_handshake_auth(SSL *, PACKET *pkt, unsigned int context, X509 *x, size_t chainidx); -#ifndef OPENSSL_NO_QUIC -int tls_parse_ctos_quic_transport_params_draft(SSL *s, PACKET *pkt, - unsigned int context, X509 *x, - size_t chainidx); - -int tls_parse_ctos_quic_transport_params(SSL *s, PACKET *pkt, unsigned int context, - X509 *x, size_t chainidx); -#endif EXT_RETURN tls_construct_stoc_renegotiate(SSL *s, WPACKET *pkt, unsigned int context, X509 *x, @@ -323,16 +311,6 @@ EXT_RETURN tls_construct_stoc_cryptopro_bug(SSL *s, WPACKET *pkt, size_t chainidx); EXT_RETURN tls_construct_stoc_psk(SSL *s, WPACKET *pkt, unsigned int context, X509 *x, size_t chainidx); -#ifndef OPENSSL_NO_QUIC -EXT_RETURN tls_construct_stoc_quic_transport_params_draft(SSL *s, WPACKET *pkt, - unsigned int context, - X509 *x, - size_t chainidx); - -EXT_RETURN tls_construct_stoc_quic_transport_params(SSL *s, WPACKET *pkt, - unsigned int context, X509 *x, - size_t chainidx); -#endif /* Client Extension processing */ EXT_RETURN tls_construct_ctos_renegotiate(SSL *s, WPACKET *pkt, unsigned int context, @@ -402,15 +380,6 @@ EXT_RETURN tls_construct_ctos_psk(SSL *s, WPACKET *pkt, unsigned int context, X509 *x, size_t chainidx); EXT_RETURN tls_construct_ctos_post_handshake_auth(SSL *s, WPACKET *pkt, unsigned int context, X509 *x, size_t chainidx); -#ifndef OPENSSL_NO_QUIC -EXT_RETURN tls_construct_ctos_quic_transport_params_draft(SSL *s, WPACKET *pkt, - unsigned int context, X509 *x, - size_t chainidx); - -EXT_RETURN tls_construct_ctos_quic_transport_params(SSL *s, WPACKET *pkt, - unsigned int context, X509 *x, - size_t chainidx); -#endif int tls_parse_stoc_renegotiate(SSL *s, PACKET *pkt, unsigned int context, X509 *x, size_t chainidx); @@ -454,14 +423,6 @@ int tls_parse_stoc_cookie(SSL *s, PACKET *pkt, unsigned int context, X509 *x, size_t chainidx); int tls_parse_stoc_psk(SSL *s, PACKET *pkt, unsigned int context, X509 *x, size_t chainidx); -#ifndef OPENSSL_NO_QUIC -int tls_parse_stoc_quic_transport_params_draft(SSL *s, PACKET *pkt, - unsigned int context, X509 *x, - size_t chainidx); - -int tls_parse_stoc_quic_transport_params(SSL *s, PACKET *pkt, unsigned int context, - X509 *x, size_t chainidx); -#endif int tls_handle_alpn(SSL *s); diff --git a/deps/openssl/openssl/ssl/statem/statem_quic.c b/deps/openssl/openssl/ssl/statem/statem_quic.c deleted file mode 100644 index 7bd329c2421546..00000000000000 --- a/deps/openssl/openssl/ssl/statem/statem_quic.c +++ /dev/null @@ -1,117 +0,0 @@ -/* - * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved. - * - * Licensed under the Apache License 2.0 (the "License"). You may not use - * this file except in compliance with the License. You can obtain a copy - * in the file LICENSE in the source distribution or at - * https://www.openssl.org/source/license.html - */ - -#include "../ssl_local.h" -#include "statem_local.h" -#include "internal/cryptlib.h" - -int quic_get_message(SSL *s, int *mt) -{ - size_t l; - QUIC_DATA *qd = s->quic_input_data_head; - uint8_t *p; - - if (qd == NULL) { - s->rwstate = SSL_READING; - *mt = 0; - return 0; - } - - if (!ossl_assert(qd->length >= SSL3_HM_HEADER_LENGTH)) { - SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_R_BAD_LENGTH); - *mt = 0; - return 0; - } - - /* This is where we check for the proper level, not when data is given */ - if (qd->level != s->quic_read_level) { - SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_R_WRONG_ENCRYPTION_LEVEL_RECEIVED); - *mt = 0; - return 0; - } - - if (!BUF_MEM_grow_clean(s->init_buf, (int)qd->length)) { - SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_BUF_LIB); - *mt = 0; - return 0; - } - - /* Copy buffered data */ - memcpy(s->init_buf->data, s->quic_buf->data + qd->start, qd->length); - s->init_buf->length = qd->length; - s->quic_input_data_head = qd->next; - if (s->quic_input_data_head == NULL) - s->quic_input_data_tail = NULL; - OPENSSL_free(qd); - - s->s3.tmp.message_type = *mt = *(s->init_buf->data); - p = (uint8_t*)s->init_buf->data + 1; - n2l3(p, l); - s->init_num = s->s3.tmp.message_size = l; - s->init_msg = s->init_buf->data + SSL3_HM_HEADER_LENGTH; - - return 1; -} - -int quic_get_message_body(SSL *s, size_t *len) -{ - /* No CCS in QUIC/TLSv1.3? */ - if (s->s3.tmp.message_type == SSL3_MT_CHANGE_CIPHER_SPEC) { - SSLfatal(s, SSL_AD_UNEXPECTED_MESSAGE, SSL_R_CCS_RECEIVED_EARLY); - *len = 0; - return 0; - } - /* No KeyUpdate in QUIC */ - if (s->s3.tmp.message_type == SSL3_MT_KEY_UPDATE) { - SSLfatal(s, SSL_AD_UNEXPECTED_MESSAGE, SSL_R_UNEXPECTED_MESSAGE); - *len = 0; - return 0; - } - - /* - * If receiving Finished, record MAC of prior handshake messages for - * Finished verification. - */ - if (s->s3.tmp.message_type == SSL3_MT_FINISHED && !ssl3_take_mac(s)) { - /* SSLfatal() already called */ - *len = 0; - return 0; - } - - /* - * We defer feeding in the HRR until later. We'll do it as part of - * processing the message - * The TLsv1.3 handshake transcript stops at the ClientFinished - * message. - */ -#define SERVER_HELLO_RANDOM_OFFSET (SSL3_HM_HEADER_LENGTH + 2) - /* KeyUpdate and NewSessionTicket do not need to be added */ - if (s->s3.tmp.message_type != SSL3_MT_NEWSESSION_TICKET - && s->s3.tmp.message_type != SSL3_MT_KEY_UPDATE) { - if (s->s3.tmp.message_type != SSL3_MT_SERVER_HELLO - || s->init_num < SERVER_HELLO_RANDOM_OFFSET + SSL3_RANDOM_SIZE - || memcmp(hrrrandom, - s->init_buf->data + SERVER_HELLO_RANDOM_OFFSET, - SSL3_RANDOM_SIZE) != 0) { - if (!ssl3_finish_mac(s, (unsigned char *)s->init_buf->data, - s->init_num + SSL3_HM_HEADER_LENGTH)) { - /* SSLfatal() already called */ - *len = 0; - return 0; - } - } - } - if (s->msg_callback) - s->msg_callback(0, s->version, SSL3_RT_HANDSHAKE, s->init_buf->data, - (size_t)s->init_num + SSL3_HM_HEADER_LENGTH, s, - s->msg_callback_arg); - - *len = s->init_num; - return 1; -} diff --git a/deps/openssl/openssl/ssl/statem/statem_srvr.c b/deps/openssl/openssl/ssl/statem/statem_srvr.c index 92e4f793ab24e9..7d7c198bd63f9e 100644 --- a/deps/openssl/openssl/ssl/statem/statem_srvr.c +++ b/deps/openssl/openssl/ssl/statem/statem_srvr.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved * Copyright 2005 Nokia. All rights reserved. * @@ -74,8 +74,7 @@ static int ossl_statem_server13_read_transition(SSL *s, int mt) return 1; } break; - } else if (s->ext.early_data == SSL_EARLY_DATA_ACCEPTED - && !SSL_IS_QUIC(s)) { + } else if (s->ext.early_data == SSL_EARLY_DATA_ACCEPTED) { if (mt == SSL3_MT_END_OF_EARLY_DATA) { st->hand_state = TLS_ST_SR_END_OF_EARLY_DATA; return 1; @@ -964,16 +963,6 @@ WORK_STATE ossl_statem_server_post_work(SSL *s, WORK_STATE wst) SSL3_CC_APPLICATION | SSL3_CHANGE_CIPHER_SERVER_WRITE)) /* SSLfatal() already called */ return WORK_ERROR; - -#ifndef OPENSSL_NO_QUIC - if (SSL_IS_QUIC(s) && s->ext.early_data == SSL_EARLY_DATA_ACCEPTED) { - s->early_data_state = SSL_EARLY_DATA_FINISHED_READING; - if (!s->method->ssl3_enc->change_cipher_state( - s, SSL3_CC_HANDSHAKE | SSL3_CHANGE_CIPHER_SERVER_READ)) - /* SSLfatal() already called */ - return WORK_ERROR; - } -#endif } break; @@ -1566,15 +1555,6 @@ MSG_PROCESS_RETURN tls_process_client_hello(SSL *s, PACKET *pkt) goto err; } } -#ifndef OPENSSL_NO_QUIC - if (SSL_IS_QUIC(s)) { - /* Any other QUIC checks on ClientHello here */ - if (clienthello->session_id_len > 0) { - SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER, SSL_R_LENGTH_MISMATCH); - goto err; - } - } -#endif } if (!PACKET_copy_all(&compression, clienthello->compressions, @@ -3005,7 +2985,7 @@ static int tls_process_cke_dhe(SSL *s, PACKET *pkt) } if (!EVP_PKEY_set1_encoded_public_key(ckey, data, i)) { - SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR); + SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER, SSL_R_BAD_KEY_SHARE); goto err; } @@ -3059,7 +3039,7 @@ static int tls_process_cke_ecdhe(SSL *s, PACKET *pkt) } if (EVP_PKEY_set1_encoded_public_key(ckey, data, i) <= 0) { - SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_EC_LIB); + SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER, SSL_R_BAD_KEY_SHARE); goto err; } } diff --git a/deps/openssl/openssl/ssl/tls13_enc.c b/deps/openssl/openssl/ssl/tls13_enc.c index 33cf79199fe79d..ddcff5eb89119c 100644 --- a/deps/openssl/openssl/ssl/tls13_enc.c +++ b/deps/openssl/openssl/ssl/tls13_enc.c @@ -400,231 +400,27 @@ static int derive_secret_key_and_iv(SSL *s, int sending, const EVP_MD *md, return 1; } +int tls13_change_cipher_state(SSL *s, int which) +{ #ifdef CHARSET_EBCDIC -static const unsigned char client_early_traffic[] = {0x63, 0x20, 0x65, 0x20, /*traffic*/0x74, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x00}; -static const unsigned char client_handshake_traffic[] = {0x63, 0x20, 0x68, 0x73, 0x20, /*traffic*/0x74, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x00}; -static const unsigned char client_application_traffic[] = {0x63, 0x20, 0x61, 0x70, 0x20, /*traffic*/0x74, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x00}; -static const unsigned char server_handshake_traffic[] = {0x73, 0x20, 0x68, 0x73, 0x20, /*traffic*/0x74, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x00}; -static const unsigned char server_application_traffic[] = {0x73, 0x20, 0x61, 0x70, 0x20, /*traffic*/0x74, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x00}; -static const unsigned char exporter_master_secret[] = {0x65, 0x78, 0x70, 0x20, /* master*/ 0x6D, 0x61, 0x73, 0x74, 0x65, 0x72, 0x00}; -static const unsigned char resumption_master_secret[] = {0x72, 0x65, 0x73, 0x20, /* master*/ 0x6D, 0x61, 0x73, 0x74, 0x65, 0x72, 0x00}; -static const unsigned char early_exporter_master_secret[] = {0x65, 0x20, 0x65, 0x78, 0x70, 0x20, /* master*/ 0x6D, 0x61, 0x73, 0x74, 0x65, 0x72, 0x00}; + static const unsigned char client_early_traffic[] = {0x63, 0x20, 0x65, 0x20, /*traffic*/0x74, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x00}; + static const unsigned char client_handshake_traffic[] = {0x63, 0x20, 0x68, 0x73, 0x20, /*traffic*/0x74, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x00}; + static const unsigned char client_application_traffic[] = {0x63, 0x20, 0x61, 0x70, 0x20, /*traffic*/0x74, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x00}; + static const unsigned char server_handshake_traffic[] = {0x73, 0x20, 0x68, 0x73, 0x20, /*traffic*/0x74, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x00}; + static const unsigned char server_application_traffic[] = {0x73, 0x20, 0x61, 0x70, 0x20, /*traffic*/0x74, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x00}; + static const unsigned char exporter_master_secret[] = {0x65, 0x78, 0x70, 0x20, /* master*/ 0x6D, 0x61, 0x73, 0x74, 0x65, 0x72, 0x00}; + static const unsigned char resumption_master_secret[] = {0x72, 0x65, 0x73, 0x20, /* master*/ 0x6D, 0x61, 0x73, 0x74, 0x65, 0x72, 0x00}; + static const unsigned char early_exporter_master_secret[] = {0x65, 0x20, 0x65, 0x78, 0x70, 0x20, /* master*/ 0x6D, 0x61, 0x73, 0x74, 0x65, 0x72, 0x00}; #else -static const unsigned char client_early_traffic[] = "c e traffic"; -static const unsigned char client_handshake_traffic[] = "c hs traffic"; -static const unsigned char client_application_traffic[] = "c ap traffic"; -static const unsigned char server_handshake_traffic[] = "s hs traffic"; -static const unsigned char server_application_traffic[] = "s ap traffic"; -static const unsigned char exporter_master_secret[] = "exp master"; -static const unsigned char resumption_master_secret[] = "res master"; -static const unsigned char early_exporter_master_secret[] = "e exp master"; + static const unsigned char client_early_traffic[] = "c e traffic"; + static const unsigned char client_handshake_traffic[] = "c hs traffic"; + static const unsigned char client_application_traffic[] = "c ap traffic"; + static const unsigned char server_handshake_traffic[] = "s hs traffic"; + static const unsigned char server_application_traffic[] = "s ap traffic"; + static const unsigned char exporter_master_secret[] = "exp master"; + static const unsigned char resumption_master_secret[] = "res master"; + static const unsigned char early_exporter_master_secret[] = "e exp master"; #endif - -#ifndef OPENSSL_NO_QUIC -static int quic_change_cipher_state(SSL *s, int which) -{ - unsigned char hash[EVP_MAX_MD_SIZE]; - size_t hashlen = 0; - int hashleni; - int ret = 0; - const EVP_MD *md = NULL; - OSSL_ENCRYPTION_LEVEL level; - int is_handshake = ((which & SSL3_CC_HANDSHAKE) == SSL3_CC_HANDSHAKE); - int is_client_read = ((which & SSL3_CHANGE_CIPHER_CLIENT_READ) == SSL3_CHANGE_CIPHER_CLIENT_READ); - int is_server_write = ((which & SSL3_CHANGE_CIPHER_SERVER_WRITE) == SSL3_CHANGE_CIPHER_SERVER_WRITE); - int is_early = (which & SSL3_CC_EARLY); - - if (is_early) { - EVP_MD_CTX *mdctx = NULL; - long handlen; - void *hdata; - unsigned int hashlenui; - const SSL_CIPHER *sslcipher = SSL_SESSION_get0_cipher(s->session); - - handlen = BIO_get_mem_data(s->s3.handshake_buffer, &hdata); - if (handlen <= 0) { - SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_R_BAD_HANDSHAKE_LENGTH); - goto err; - } - - if (s->early_data_state == SSL_EARLY_DATA_CONNECTING - && s->max_early_data > 0 - && s->session->ext.max_early_data == 0) { - /* - * If we are attempting to send early data, and we've decided to - * actually do it but max_early_data in s->session is 0 then we - * must be using an external PSK. - */ - if (!ossl_assert(s->psksession != NULL - && s->max_early_data == - s->psksession->ext.max_early_data)) { - SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR); - goto err; - } - sslcipher = SSL_SESSION_get0_cipher(s->psksession); - } - if (sslcipher == NULL) { - SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_R_BAD_PSK); - goto err; - } - - /* - * We need to calculate the handshake digest using the digest from - * the session. We haven't yet selected our ciphersuite so we can't - * use ssl_handshake_md(). - */ - mdctx = EVP_MD_CTX_new(); - if (mdctx == NULL) { - SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_MALLOC_FAILURE); - goto err; - } - md = ssl_md(s->ctx, sslcipher->algorithm2); - if (md == NULL || !EVP_DigestInit_ex(mdctx, md, NULL) - || !EVP_DigestUpdate(mdctx, hdata, handlen) - || !EVP_DigestFinal_ex(mdctx, hash, &hashlenui)) { - SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR); - EVP_MD_CTX_free(mdctx); - goto err; - } - hashlen = hashlenui; - EVP_MD_CTX_free(mdctx); - } else { - md = ssl_handshake_md(s); - if (!ssl3_digest_cached_records(s, 1) - || !ssl_handshake_hash(s, hash, sizeof(hash), &hashlen)) { - /* SSLfatal() already called */; - goto err; - } - - /* Ensure cast to size_t is safe */ - hashleni = EVP_MD_size(md); - if (!ossl_assert(hashleni >= 0)) { - SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_EVP_LIB); - goto err; - } - hashlen = (size_t)hashleni; - } - - if (is_client_read || is_server_write) { - if (is_handshake) { - /* - * This looks a bit weird, since the condition is basically "the - * server is writing" but we set both the server *and* client - * handshake traffic keys here. That's because there's only a fixed - * number of change-cipher-state events in the TLS 1.3 handshake, - * and in particular there's not an event in between when the server - * writes encrypted handshake messages and when the client writes - * encrypted handshake messages, so we generate both here. - */ - level = ssl_encryption_handshake; - - if (!tls13_hkdf_expand(s, md, s->handshake_secret, - client_handshake_traffic, - sizeof(client_handshake_traffic)-1, hash, - hashlen, s->client_hand_traffic_secret, - hashlen, 1) - || !ssl_log_secret(s, CLIENT_HANDSHAKE_LABEL, - s->client_hand_traffic_secret, hashlen) - || !tls13_derive_finishedkey(s, md, - s->client_hand_traffic_secret, - s->client_finished_secret, hashlen) - || !tls13_hkdf_expand(s, md, s->handshake_secret, - server_handshake_traffic, - sizeof(server_handshake_traffic)-1, hash, - hashlen, s->server_hand_traffic_secret, - hashlen, 1) - || !ssl_log_secret(s, SERVER_HANDSHAKE_LABEL, - s->server_hand_traffic_secret, hashlen) - || !tls13_derive_finishedkey(s, md, - s->server_hand_traffic_secret, - s->server_finished_secret, - hashlen)) { - /* SSLfatal() already called */ - goto err; - } - } else { - /* - * As above, we generate both sets of application traffic keys at - * the same time. - */ - level = ssl_encryption_application; - - if (!tls13_hkdf_expand(s, md, s->master_secret, - client_application_traffic, - sizeof(client_application_traffic)-1, hash, - hashlen, s->client_app_traffic_secret, - hashlen, 1) - || !ssl_log_secret(s, CLIENT_APPLICATION_LABEL, - s->client_app_traffic_secret, hashlen) - || !tls13_hkdf_expand(s, md, s->master_secret, - server_application_traffic, - sizeof(server_application_traffic)-1, - hash, hashlen, - s->server_app_traffic_secret, hashlen, 1) - || !ssl_log_secret(s, SERVER_APPLICATION_LABEL, - s->server_app_traffic_secret, hashlen)) { - /* SSLfatal() already called */ - goto err; - } - } - if (!quic_set_encryption_secrets(s, level)) { - /* SSLfatal() already called */ - goto err; - } - if (s->server) - s->quic_write_level = level; - else - s->quic_read_level = level; - } else { - /* is_client_write || is_server_read */ - - if (is_early) { - level = ssl_encryption_early_data; - - if (!tls13_hkdf_expand(s, md, s->early_secret, client_early_traffic, - sizeof(client_early_traffic)-1, hash, - hashlen, s->client_early_traffic_secret, - hashlen, 1) - || !ssl_log_secret(s, CLIENT_EARLY_LABEL, - s->client_early_traffic_secret, hashlen) - || !quic_set_encryption_secrets(s, level)) { - /* SSLfatal() already called */ - goto err; - } - } else if (is_handshake) { - level = ssl_encryption_handshake; - } else { - level = ssl_encryption_application; - /* - * We also create the resumption master secret, but this time use the - * hash for the whole handshake including the Client Finished - */ - if (!tls13_hkdf_expand(s, md, s->master_secret, - resumption_master_secret, - sizeof(resumption_master_secret)-1, hash, - hashlen, s->resumption_master_secret, - hashlen, 1)) { - /* SSLfatal() already called */ - goto err; - } - } - - if (level != ssl_encryption_early_data) { - if (s->server) - s->quic_read_level = level; - else - s->quic_write_level = level; - } - } - - ret = 1; - err: - return ret; -} -#endif /* OPENSSL_NO_QUIC */ - -int tls13_change_cipher_state(SSL *s, int which) -{ unsigned char *iv; unsigned char key[EVP_MAX_KEY_LENGTH]; unsigned char secret[EVP_MAX_MD_SIZE]; @@ -645,11 +441,6 @@ int tls13_change_cipher_state(SSL *s, int which) BIO *bio; #endif -#ifndef OPENSSL_NO_QUIC - if (SSL_IS_QUIC(s)) - return quic_change_cipher_state(s, which); -#endif - if (which & SSL3_CC_READ) { if (s->enc_read_ctx != NULL) { EVP_CIPHER_CTX_reset(s->enc_read_ctx); @@ -941,7 +732,6 @@ int tls13_change_cipher_state(SSL *s, int which) skip_ktls: # endif #endif - ret = 1; err: if ((which & SSL3_CC_EARLY) != 0) { diff --git a/deps/openssl/openssl/test/acvp_test.c b/deps/openssl/openssl/test/acvp_test.c index fee880d441b0d5..eccf9d90a021a9 100644 --- a/deps/openssl/openssl/test/acvp_test.c +++ b/deps/openssl/openssl/test/acvp_test.c @@ -1251,7 +1251,7 @@ static int rsa_decryption_primitive_test(int id) BN_CTX *bn_ctx = NULL; const struct rsa_decrypt_prim_st *tst = &rsa_decrypt_prim_data[id]; - if (!TEST_ptr(pkey = EVP_PKEY_Q_keygen(libctx, NULL, "RSA", 2048)) + if (!TEST_ptr(pkey = EVP_PKEY_Q_keygen(libctx, NULL, "RSA", (size_t)2048)) || !TEST_true(pkey_get_bn_bytes(pkey, OSSL_PKEY_PARAM_RSA_N, &n, &n_len)) || !TEST_true(pkey_get_bn_bytes(pkey, OSSL_PKEY_PARAM_RSA_E, &e, &e_len)) || !TEST_ptr(ctx = EVP_PKEY_CTX_new_from_pkey(libctx, pkey, "")) diff --git a/deps/openssl/openssl/test/bio_pw_callback_test.c b/deps/openssl/openssl/test/bio_pw_callback_test.c new file mode 100644 index 00000000000000..e11368454a8c9f --- /dev/null +++ b/deps/openssl/openssl/test/bio_pw_callback_test.c @@ -0,0 +1,402 @@ +/* + * Copyright 2024 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +#include "testutil.h" + +#include +#include + +/* dummy data that needs to be passed to the callback */ +typedef struct CallbackData { + char magic; + int result; +} CALLBACK_DATA; + +/* constants */ +static const char weak_password[] = "weak_password"; +static const char a0a_password[] = "aaaaaaaa\0aaaaaaaa"; +static const char a0b_password[] = "aaaaaaaa\0bbbbbbbb"; +static const char cb_magic = 'p'; + +/* shared working data for all tests */ +static char *key_file = NULL; +static EVP_PKEY *original_pkey = NULL; + +/* the test performed by the callback */ +typedef enum CallbackTest { + CB_TEST_NEGATIVE = 0, + CB_TEST_ZERO_LENGTH, + CB_TEST_WEAK, + CB_TEST_16ZERO, + CB_TEST_A0A, + CB_TEST_A0B, + CB_TEST_MATCH_SIZE, + CB_TEST_EXCEED_SIZE +} CALLBACK_TEST; +static CALLBACK_TEST callback_test = CB_TEST_NEGATIVE; + +typedef enum KeyEncoding { + KE_PEM = 0, + KE_PKCS8 +} KEY_ENCODING; + +typedef enum ExpectedResult { + ER_FAILURE = 0, + ER_SUCCESS +} EXPECTED_RESULT; + +typedef enum OPTION_choice { + OPT_ERR = -1, + OPT_EOF = 0, + OPT_KEY_FILE, + OPT_TEST_ENUM +} OPTION_CHOICE; + +const OPTIONS *test_get_options(void) +{ + static const OPTIONS test_options[] = { + OPT_TEST_OPTIONS_DEFAULT_USAGE, + { "keyfile", OPT_KEY_FILE, '<', + "The PEM file with the encrypted key to load" }, + { NULL } + }; + return test_options; +} + +static int callback_copy_password(char *buf, int size) +{ + int ret = -1; + + switch (callback_test) { + case CB_TEST_NEGATIVE: + break; + case CB_TEST_ZERO_LENGTH: + ret = 0; + break; + case CB_TEST_WEAK: + ret = sizeof(weak_password) - 1; + memcpy(buf, weak_password, ret); + break; + case CB_TEST_16ZERO: + memset(buf, 0, 16); + ret = 16; + break; + case CB_TEST_A0A: + ret = sizeof(a0a_password) - 1; + memcpy(buf, a0a_password, ret); + break; + case CB_TEST_A0B: + ret = sizeof(a0b_password) - 1; + memcpy(buf, a0b_password, ret); + break; + case CB_TEST_MATCH_SIZE: + memset(buf, 'e', size); + ret = size; + break; + case CB_TEST_EXCEED_SIZE: + memset(buf, 'e', size); + ret = 1000000; + break; + } + return ret; +} + +static int read_callback(char *buf, int size, int rwflag, void *u) +{ + CALLBACK_DATA *cb_data = (CALLBACK_DATA *)u; + int ret = -1; + + /* basic verification of the received data */ + if (!TEST_ptr(cb_data)) + goto err; + if (!TEST_char_eq(cb_data->magic, cb_magic)) + goto err; + if (!TEST_ptr(buf)) + goto err; + if (!TEST_int_gt(size, 0)) + goto err; + if (!TEST_int_eq(rwflag, 0)) + goto err; + ret = callback_copy_password(buf, size); + cb_data->result = 1; +err: + return ret; +} + +static int write_callback(char *buf, int size, int rwflag, void *u) +{ + CALLBACK_DATA *cb_data = (CALLBACK_DATA *)u; + int ret = -1; + + /* basic verification of the received data */ + if (!TEST_ptr(cb_data)) + goto err; + if (!TEST_char_eq(cb_data->magic, cb_magic)) + goto err; + if (!TEST_ptr(buf)) + goto err; + if (!TEST_int_gt(size, 0)) + goto err; + if (!TEST_int_eq(rwflag, 1)) + goto err; + ret = callback_copy_password(buf, size); + cb_data->result = 1; +err: + return ret; +} + +static int re_encrypt_key(char **enc_data, int *enc_data_size, + KEY_ENCODING key_encoding) +{ + CALLBACK_DATA cb_data; + int w_ret = 0; + BUF_MEM *bptr = NULL; + BIO *bio = NULL; + int ret = 0; + + if (!TEST_ptr(enc_data)) + goto err; + if (!TEST_ptr(enc_data_size)) + goto err; + if (!TEST_ptr(bio = BIO_new(BIO_s_mem()))) + goto err; + cb_data.magic = cb_magic; + cb_data.result = 0; + switch (key_encoding) { + case KE_PEM: + w_ret = PEM_write_bio_PrivateKey(bio, original_pkey, EVP_aes_256_cbc(), + NULL, 0, write_callback, &cb_data); + break; + case KE_PKCS8: + w_ret = i2d_PKCS8PrivateKey_bio(bio, original_pkey, EVP_aes_256_cbc(), + NULL, 0, write_callback, &cb_data); + break; + } + if (!TEST_int_ne(w_ret, 0)) + goto err; + if (!TEST_char_eq(cb_data.magic, cb_magic)) + goto err; + if (!TEST_int_eq(cb_data.result, 1)) + goto err; + *enc_data_size = BIO_get_mem_data(bio, enc_data); + BIO_get_mem_ptr(bio, &bptr); + if (!BIO_set_close(bio, BIO_NOCLOSE)) + goto err; + bptr->data = NULL; + ret = 1; +err: + BUF_MEM_free(bptr); + BIO_free(bio); + return ret; +} + +static int decrypt_key(char *enc_data, int enc_data_size, + KEY_ENCODING key_encoding, + EXPECTED_RESULT expected_result) +{ + CALLBACK_DATA cb_data; + EVP_PKEY *r_ret = NULL; + BIO *bio = NULL; + EVP_PKEY *pkey = NULL; + int ret = 0; + + if (!TEST_ptr(bio = BIO_new_mem_buf(enc_data, enc_data_size))) + goto err; + cb_data.magic = cb_magic; + cb_data.result = 0; + switch (key_encoding) { + case KE_PEM: + r_ret = PEM_read_bio_PrivateKey(bio, &pkey, read_callback, &cb_data); + break; + case KE_PKCS8: + r_ret = d2i_PKCS8PrivateKey_bio(bio, &pkey, read_callback, &cb_data); + break; + } + if (expected_result == ER_SUCCESS) { + if (!TEST_ptr(r_ret)) + goto err; + } else { + if (!TEST_ptr_null(r_ret)) + goto err; + } + if (!TEST_char_eq(cb_data.magic, cb_magic)) + goto err; + if (!TEST_int_eq(cb_data.result, 1)) + goto err; + ret = 1; +err: + EVP_PKEY_free(pkey); + BIO_free(bio); + return ret; +} + +static int full_cycle_test(KEY_ENCODING key_encoding, CALLBACK_TEST write_test, + CALLBACK_TEST read_test, + EXPECTED_RESULT expected_read_result) +{ + char *enc_data = NULL; + int enc_data_size = 0; + int ret = 0; + + callback_test = write_test; + if (!re_encrypt_key(&enc_data, &enc_data_size, key_encoding)) + goto err; + callback_test = read_test; + if (!decrypt_key(enc_data, enc_data_size, key_encoding, + expected_read_result)) + goto err; + ret = 1; +err: + OPENSSL_free(enc_data); + return ret; +} + +static int test_pem_negative(void) +{ + return full_cycle_test(KE_PEM, CB_TEST_WEAK, CB_TEST_NEGATIVE, ER_FAILURE); +} + +static int test_pem_zero_length(void) +{ + return full_cycle_test(KE_PEM, CB_TEST_ZERO_LENGTH, CB_TEST_ZERO_LENGTH, + ER_SUCCESS); +} + +static int test_pem_weak(void) +{ + return full_cycle_test(KE_PEM, CB_TEST_WEAK, CB_TEST_WEAK, ER_SUCCESS); +} + +static int test_pem_16zero(void) +{ + return full_cycle_test(KE_PEM, CB_TEST_16ZERO, CB_TEST_16ZERO, ER_SUCCESS); +} + +static int test_pem_a0a(void) +{ + return full_cycle_test(KE_PEM, CB_TEST_A0A, CB_TEST_A0A, ER_SUCCESS); +} + +static int test_pem_a0a_a0b(void) +{ + return full_cycle_test(KE_PEM, CB_TEST_A0A, CB_TEST_A0B, ER_FAILURE); +} + +static int test_pem_match_size(void) +{ + return full_cycle_test(KE_PEM, CB_TEST_MATCH_SIZE, CB_TEST_MATCH_SIZE, + ER_SUCCESS); +} + +static int test_pem_exceed_size(void) +{ + return full_cycle_test(KE_PEM, CB_TEST_MATCH_SIZE, CB_TEST_EXCEED_SIZE, + ER_FAILURE); +} + +static int test_pkcs8_negative(void) +{ + return full_cycle_test(KE_PKCS8, CB_TEST_WEAK, CB_TEST_NEGATIVE, ER_FAILURE); +} + +static int test_pkcs8_zero_length(void) +{ + return full_cycle_test(KE_PKCS8, CB_TEST_ZERO_LENGTH, CB_TEST_ZERO_LENGTH, + ER_SUCCESS); +} + +static int test_pkcs8_weak(void) +{ + return full_cycle_test(KE_PKCS8, CB_TEST_WEAK, CB_TEST_WEAK, ER_SUCCESS); +} + +static int test_pkcs8_16zero(void) +{ + return full_cycle_test(KE_PKCS8, CB_TEST_16ZERO, CB_TEST_16ZERO, + ER_SUCCESS); +} + +static int test_pkcs8_a0a(void) +{ + return full_cycle_test(KE_PKCS8, CB_TEST_A0A, CB_TEST_A0A, ER_SUCCESS); +} + +static int test_pkcs8_a0a_a0b(void) +{ + return full_cycle_test(KE_PKCS8, CB_TEST_A0A, CB_TEST_A0B, ER_FAILURE); +} + +static int test_pkcs8_match_size(void) +{ + return full_cycle_test(KE_PKCS8, CB_TEST_MATCH_SIZE, CB_TEST_MATCH_SIZE, + ER_SUCCESS); +} + +static int test_pkcs8_exceed_size(void) +{ + return full_cycle_test(KE_PKCS8, CB_TEST_MATCH_SIZE, CB_TEST_EXCEED_SIZE, + ER_FAILURE); +} + +static int callback_original_pw(char *buf, int size, int rwflag, void *u) +{ + memcpy(buf, weak_password, sizeof(weak_password) - 1); + return sizeof(weak_password) - 1; +} + +int setup_tests(void) +{ + OPTION_CHOICE o; + BIO *bio = NULL; + + while ((o = opt_next()) != OPT_EOF) { + switch (o) { + case OPT_KEY_FILE: + key_file = opt_arg(); + break; + case OPT_TEST_CASES: + break; + default: + case OPT_ERR: + return 0; + } + } + + /* read the original key */ + if (!TEST_ptr(bio = BIO_new_file(key_file, "r"))) + return 0; + if (!TEST_ptr(PEM_read_bio_PrivateKey(bio, &original_pkey, + callback_original_pw, NULL))) + return 0; + BIO_free(bio); + + /* add all tests */ + ADD_TEST(test_pem_negative); + ADD_TEST(test_pem_zero_length); + ADD_TEST(test_pem_weak); + ADD_TEST(test_pem_16zero); + ADD_TEST(test_pem_a0a); + ADD_TEST(test_pem_a0a_a0b); + ADD_TEST(test_pem_match_size); + ADD_TEST(test_pem_exceed_size); + ADD_TEST(test_pkcs8_negative); + ADD_TEST(test_pkcs8_zero_length); + ADD_TEST(test_pkcs8_weak); + ADD_TEST(test_pkcs8_16zero); + ADD_TEST(test_pkcs8_a0a); + ADD_TEST(test_pkcs8_a0a_a0b); + ADD_TEST(test_pkcs8_match_size); + ADD_TEST(test_pkcs8_exceed_size); + return 1; +} + +void cleanup_tests(void) +{ + EVP_PKEY_free(original_pkey); +} diff --git a/deps/openssl/openssl/test/build.info b/deps/openssl/openssl/test/build.info index 76ff945ab8b390..6089b8c97cf87b 100644 --- a/deps/openssl/openssl/test/build.info +++ b/deps/openssl/openssl/test/build.info @@ -61,7 +61,7 @@ IF[{- !$disabled{tests} -}] keymgmt_internal_test hexstr_test provider_status_test defltfips_test \ bio_readbuffer_test user_property_test pkcs7_test upcallstest \ provfetchtest prov_config_test rand_test fips_version_test \ - nodefltctxtest + nodefltctxtest bio_pw_callback_test IF[{- !$disabled{'deprecated-3.0'} -}] PROGRAMS{noinst}=enginetest @@ -943,6 +943,10 @@ ENDIF INCLUDE[ssl_ctx_test]=../include ../apps/include DEPEND[ssl_ctx_test]=../libcrypto ../libssl libtestutil.a + SOURCE[bio_pw_callback_test]=bio_pw_callback_test.c + INCLUDE[bio_pw_callback_test]=../include ../apps/include + DEPEND[bio_pw_callback_test]=../libcrypto libtestutil.a + {- use File::Spec::Functions; use File::Basename; diff --git a/deps/openssl/openssl/test/cmactest.c b/deps/openssl/openssl/test/cmactest.c index cb2b273b0f4ffd..72f7a0d9366ba9 100644 --- a/deps/openssl/openssl/test/cmactest.c +++ b/deps/openssl/openssl/test/cmactest.c @@ -196,13 +196,15 @@ static int test_cmac_copy(void) return ret; } +#define OSSL_HEX_CHARS_PER_BYTE 2 static char *pt(unsigned char *md, unsigned int len) { unsigned int i; - static char buf[80]; + static char buf[81]; - for (i = 0; i < len; i++) - sprintf(&(buf[i * 2]), "%02x", md[i]); + for (i = 0; i < len && (i + 1) * OSSL_HEX_CHARS_PER_BYTE < sizeof(buf); i++) + BIO_snprintf(buf + i * OSSL_HEX_CHARS_PER_BYTE, + OSSL_HEX_CHARS_PER_BYTE + 1, "%02x", md[i]); return buf; } diff --git a/deps/openssl/openssl/test/conf_include_test.c b/deps/openssl/openssl/test/conf_include_test.c index 2481a2380b7643..f6835d59e79e7d 100644 --- a/deps/openssl/openssl/test/conf_include_test.c +++ b/deps/openssl/openssl/test/conf_include_test.c @@ -158,7 +158,7 @@ static int test_check_overflow(void) char max[(sizeof(long) * 8) / 3 + 3]; char *p; - p = max + sprintf(max, "0%ld", LONG_MAX) - 1; + p = max + BIO_snprintf(max, sizeof(max), "0%ld", LONG_MAX) - 1; setenv("FNORD", max, 1); if (!TEST_true(NCONF_get_number(NULL, "missing", "FNORD", &val)) || !TEST_long_eq(val, LONG_MAX)) diff --git a/deps/openssl/openssl/test/drbgtest.c b/deps/openssl/openssl/test/drbgtest.c index b5122b60bdd478..afbc5511252910 100644 --- a/deps/openssl/openssl/test/drbgtest.c +++ b/deps/openssl/openssl/test/drbgtest.c @@ -423,7 +423,7 @@ static int test_rand_reseed_on_fork(EVP_RAND_CTX *primary, presult[0].pindex = presult[1].pindex = i; - sprintf(presult[0].name, "child %d", i); + BIO_snprintf(presult[0].name, sizeof(presult[0].name), "child %d", i); strcpy(presult[1].name, presult[0].name); /* collect the random output of the children */ diff --git a/deps/openssl/openssl/test/ec_internal_test.c b/deps/openssl/openssl/test/ec_internal_test.c index 8c2cd05631696c..02cfd4e9d88581 100644 --- a/deps/openssl/openssl/test/ec_internal_test.c +++ b/deps/openssl/openssl/test/ec_internal_test.c @@ -155,6 +155,56 @@ static int field_tests_ecp_mont(void) } #ifndef OPENSSL_NO_EC2M +/* Test that decoding of invalid GF2m field parameters fails. */ +static int ec2m_field_sanity(void) +{ + int ret = 0; + BN_CTX *ctx = BN_CTX_new(); + BIGNUM *p, *a, *b; + EC_GROUP *group1 = NULL, *group2 = NULL, *group3 = NULL; + + TEST_info("Testing GF2m hardening\n"); + + BN_CTX_start(ctx); + p = BN_CTX_get(ctx); + a = BN_CTX_get(ctx); + if (!TEST_ptr(b = BN_CTX_get(ctx)) + || !TEST_true(BN_one(a)) + || !TEST_true(BN_one(b))) + goto out; + + /* Even pentanomial value should be rejected */ + if (!TEST_true(BN_set_word(p, 0xf2))) + goto out; + if (!TEST_ptr_null(group1 = EC_GROUP_new_curve_GF2m(p, a, b, ctx))) + TEST_error("Zero constant term accepted in GF2m polynomial"); + + /* Odd hexanomial should also be rejected */ + if (!TEST_true(BN_set_word(p, 0xf3))) + goto out; + if (!TEST_ptr_null(group2 = EC_GROUP_new_curve_GF2m(p, a, b, ctx))) + TEST_error("Hexanomial accepted as GF2m polynomial"); + + /* Excessive polynomial degree should also be rejected */ + if (!TEST_true(BN_set_word(p, 0x71)) + || !TEST_true(BN_set_bit(p, OPENSSL_ECC_MAX_FIELD_BITS + 1))) + goto out; + if (!TEST_ptr_null(group3 = EC_GROUP_new_curve_GF2m(p, a, b, ctx))) + TEST_error("GF2m polynomial degree > %d accepted", + OPENSSL_ECC_MAX_FIELD_BITS); + + ret = group1 == NULL && group2 == NULL && group3 == NULL; + + out: + EC_GROUP_free(group1); + EC_GROUP_free(group2); + EC_GROUP_free(group3); + BN_CTX_end(ctx); + BN_CTX_free(ctx); + + return ret; +} + /* test EC_GF2m_simple_method directly */ static int field_tests_ec2_simple(void) { @@ -443,6 +493,7 @@ int setup_tests(void) ADD_TEST(field_tests_ecp_simple); ADD_TEST(field_tests_ecp_mont); #ifndef OPENSSL_NO_EC2M + ADD_TEST(ec2m_field_sanity); ADD_TEST(field_tests_ec2_simple); #endif ADD_ALL_TESTS(field_tests_default, crv_len); diff --git a/deps/openssl/openssl/test/enginetest.c b/deps/openssl/openssl/test/enginetest.c index 8ba999b0176bc9..79ffb230548587 100644 --- a/deps/openssl/openssl/test/enginetest.c +++ b/deps/openssl/openssl/test/enginetest.c @@ -147,9 +147,9 @@ static int test_engines(void) TEST_info("About to beef up the engine-type list"); for (loop = 0; loop < NUMTOADD; loop++) { - sprintf(buf, "id%d", loop); + BIO_snprintf(buf, sizeof(buf), "id%d", loop); eid[loop] = OPENSSL_strdup(buf); - sprintf(buf, "Fake engine type %d", loop); + BIO_snprintf(buf, sizeof(buf), "Fake engine type %d", loop); ename[loop] = OPENSSL_strdup(buf); if (!TEST_ptr(block[loop] = ENGINE_new()) || !TEST_true(ENGINE_set_id(block[loop], eid[loop])) diff --git a/deps/openssl/openssl/test/evp_kdf_test.c b/deps/openssl/openssl/test/evp_kdf_test.c index 8f35900bdd8b18..0ee1aaea6f3768 100644 --- a/deps/openssl/openssl/test/evp_kdf_test.c +++ b/deps/openssl/openssl/test/evp_kdf_test.c @@ -1,5 +1,5 @@ /* - * Copyright 2018-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2018-2025 The OpenSSL Project Authors. All Rights Reserved. * Copyright (c) 2018-2020, Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use @@ -857,7 +857,7 @@ static int test_kdf_pbkdf2_invalid_digest(void) #ifndef OPENSSL_NO_SCRYPT static int test_kdf_scrypt(void) { - int ret; + int i, ret; EVP_KDF_CTX *kctx; OSSL_PARAM params[7], *p = params; unsigned char out[64]; @@ -883,15 +883,21 @@ static int test_kdf_scrypt(void) *p++ = OSSL_PARAM_construct_uint(OSSL_KDF_PARAM_SCRYPT_MAXMEM, &maxmem); *p = OSSL_PARAM_construct_end(); - ret = - TEST_ptr(kctx = get_kdfbyname(OSSL_KDF_NAME_SCRYPT)) - && TEST_true(EVP_KDF_CTX_set_params(kctx, params)) - /* failure test *//* - && TEST_int_le(EVP_KDF_derive(kctx, out, sizeof(out), NULL), 0)*/ - && TEST_true(OSSL_PARAM_set_uint(p - 1, 10 * 1024 * 1024)) - && TEST_true(EVP_KDF_CTX_set_params(kctx, p - 1)) - && TEST_int_gt(EVP_KDF_derive(kctx, out, sizeof(out), NULL), 0) - && TEST_mem_eq(out, sizeof(out), expected, sizeof(expected)); + ret = TEST_ptr(kctx = get_kdfbyname(OSSL_KDF_NAME_SCRYPT)); + for (i = 0; ret && i < 2; ++i) { + ret = ret + && TEST_true(EVP_KDF_CTX_set_params(kctx, params)); + if (i == 0) + ret = ret + && TEST_int_le(EVP_KDF_derive(kctx, out, sizeof(out), NULL), 0) + && TEST_true(OSSL_PARAM_set_uint(p - 1, 10 * 1024 * 1024)) + && TEST_true(EVP_KDF_CTX_set_params(kctx, p - 1)); + ret = ret + && TEST_int_gt(EVP_KDF_derive(kctx, out, sizeof(out), NULL), 0) + && TEST_mem_eq(out, sizeof(out), expected, sizeof(expected)); + if (i == 0) + EVP_KDF_CTX_reset(kctx); + } EVP_KDF_CTX_free(kctx); return ret; diff --git a/deps/openssl/openssl/test/evp_libctx_test.c b/deps/openssl/openssl/test/evp_libctx_test.c index 2448c35a149f60..fd114a118cb2a2 100644 --- a/deps/openssl/openssl/test/evp_libctx_test.c +++ b/deps/openssl/openssl/test/evp_libctx_test.c @@ -501,7 +501,7 @@ static int rsa_keygen(int bits, EVP_PKEY **pub, EVP_PKEY **priv) size_t len = 0; OSSL_ENCODER_CTX *ectx = NULL; - if (!TEST_ptr(*priv = EVP_PKEY_Q_keygen(libctx, NULL, "RSA", bits)) + if (!TEST_ptr(*priv = EVP_PKEY_Q_keygen(libctx, NULL, "RSA", (size_t)bits)) || !TEST_ptr(ectx = OSSL_ENCODER_CTX_new_for_pkey(*priv, EVP_PKEY_PUBLIC_KEY, @@ -536,6 +536,8 @@ static int kem_rsa_gen_recover(void) && TEST_int_eq(EVP_PKEY_encapsulate_init(sctx, NULL), 1) && TEST_int_eq(EVP_PKEY_CTX_set_kem_op(sctx, "RSASVE"), 1) && TEST_ptr(dctx = EVP_PKEY_CTX_dup(sctx)) + /* Test that providing a NULL wrappedlen fails */ + && TEST_int_eq(EVP_PKEY_encapsulate(dctx, NULL, NULL, NULL, NULL), 0) && TEST_int_eq(EVP_PKEY_encapsulate(dctx, NULL, &ctlen, NULL, &secretlen), 1) && TEST_int_eq(ctlen, secretlen) @@ -545,11 +547,26 @@ static int kem_rsa_gen_recover(void) && TEST_ptr(rctx = EVP_PKEY_CTX_new_from_pkey(libctx, priv, NULL)) && TEST_int_eq(EVP_PKEY_decapsulate_init(rctx, NULL), 1) && TEST_int_eq(EVP_PKEY_CTX_set_kem_op(rctx, "RSASVE"), 1) + /* Test that providing a NULL unwrappedlen fails */ + && TEST_int_eq(EVP_PKEY_decapsulate(rctx, NULL, NULL, ct, ctlen), 0) && TEST_int_eq(EVP_PKEY_decapsulate(rctx, NULL, &unwraplen, ct, ctlen), 1) && TEST_int_eq(EVP_PKEY_decapsulate(rctx, unwrap, &unwraplen, ct, ctlen), 1) && TEST_mem_eq(unwrap, unwraplen, secret, secretlen); + + /* Test that providing a too short unwrapped/ctlen fails */ + if (fips_provider_version_match(libctx, ">=3.4.0")) { + ctlen = 1; + if (!TEST_int_eq(EVP_PKEY_encapsulate(dctx, ct, &ctlen, secret, + &secretlen), 0)) + ret = 0; + unwraplen = 1; + if (!TEST_int_eq(EVP_PKEY_decapsulate(rctx, unwrap, &unwraplen, ct, + ctlen), 0)) + ret = 0; + } + EVP_PKEY_free(pub); EVP_PKEY_free(priv); EVP_PKEY_CTX_free(rctx); @@ -596,59 +613,60 @@ static int kem_rsa_params(void) size_t ctlen = 0, secretlen = 0; ret = TEST_true(rsa_keygen(2048, &pub, &priv)) - && TEST_ptr(pubctx = EVP_PKEY_CTX_new_from_pkey(libctx, pub, NULL)) - && TEST_ptr(privctx = EVP_PKEY_CTX_new_from_pkey(libctx, priv, NULL)) - /* Test setting kem op before the init fails */ - && TEST_int_eq(EVP_PKEY_CTX_set_kem_op(pubctx, "RSASVE"), -2) - /* Test NULL ctx passed */ - && TEST_int_eq(EVP_PKEY_encapsulate_init(NULL, NULL), 0) - && TEST_int_eq(EVP_PKEY_encapsulate(NULL, NULL, NULL, NULL, NULL), 0) - && TEST_int_eq(EVP_PKEY_decapsulate_init(NULL, NULL), 0) - && TEST_int_eq(EVP_PKEY_decapsulate(NULL, NULL, NULL, NULL, 0), 0) - /* Test Invalid operation */ - && TEST_int_eq(EVP_PKEY_encapsulate(pubctx, NULL, NULL, NULL, NULL), -1) - && TEST_int_eq(EVP_PKEY_decapsulate(privctx, NULL, NULL, NULL, 0), 0) - /* Wrong key component - no secret should be returned on failure */ - && TEST_int_eq(EVP_PKEY_decapsulate_init(pubctx, NULL), 1) - && TEST_int_eq(EVP_PKEY_CTX_set_kem_op(pubctx, "RSASVE"), 1) - && TEST_int_eq(EVP_PKEY_decapsulate(pubctx, secret, &secretlen, ct, - sizeof(ct)), 0) - && TEST_uchar_eq(secret[0], 0) - /* Test encapsulate fails if the mode is not set */ - && TEST_int_eq(EVP_PKEY_encapsulate_init(pubctx, NULL), 1) - && TEST_int_eq(EVP_PKEY_encapsulate(pubctx, ct, &ctlen, secret, &secretlen), -2) - /* Test setting a bad kem ops fail */ - && TEST_int_eq(EVP_PKEY_CTX_set_kem_op(pubctx, "RSA"), 0) - && TEST_int_eq(EVP_PKEY_CTX_set_kem_op(pubctx, NULL), 0) - && TEST_int_eq(EVP_PKEY_CTX_set_kem_op(NULL, "RSASVE"), 0) - && TEST_int_eq(EVP_PKEY_CTX_set_kem_op(NULL, NULL), 0) - /* Test secretlen is optional */ - && TEST_int_eq(EVP_PKEY_CTX_set_kem_op(pubctx, "RSASVE"), 1) - && TEST_int_eq(EVP_PKEY_encapsulate(pubctx, ct, &ctlen, secret, NULL), 1) - && TEST_int_eq(EVP_PKEY_encapsulate(pubctx, NULL, &ctlen, NULL, NULL), 1) - /* Test outlen is optional */ - && TEST_int_eq(EVP_PKEY_encapsulate(pubctx, NULL, NULL, NULL, &secretlen), 1) - && TEST_int_eq(EVP_PKEY_encapsulate(pubctx, ct, NULL, secret, &secretlen), 1) - /* test that either len must be set if out is NULL */ - && TEST_int_eq(EVP_PKEY_encapsulate(pubctx, NULL, NULL, NULL, NULL), 0) - && TEST_int_eq(EVP_PKEY_encapsulate(pubctx, NULL, &ctlen, NULL, NULL), 1) - && TEST_int_eq(EVP_PKEY_encapsulate(pubctx, NULL, NULL, NULL, &secretlen), 1) - && TEST_int_eq(EVP_PKEY_encapsulate(pubctx, NULL, &ctlen, NULL, &secretlen), 1) - /* Secret buffer should be set if there is an output buffer */ - && TEST_int_eq(EVP_PKEY_encapsulate(pubctx, ct, &ctlen, NULL, NULL), 0) - /* Test that lengths are optional if ct is not NULL */ - && TEST_int_eq(EVP_PKEY_encapsulate(pubctx, ct, NULL, secret, NULL), 1) - /* Pass if secret or secret length are not NULL */ - && TEST_int_eq(EVP_PKEY_decapsulate_init(privctx, NULL), 1) - && TEST_int_eq(EVP_PKEY_CTX_set_kem_op(privctx, "RSASVE"), 1) - && TEST_int_eq(EVP_PKEY_decapsulate(privctx, secret, NULL, ct, sizeof(ct)), 1) - && TEST_int_eq(EVP_PKEY_decapsulate(privctx, NULL, &secretlen, ct, sizeof(ct)), 1) - && TEST_int_eq(secretlen, 256) - /* Fail if passed NULL arguments */ - && TEST_int_eq(EVP_PKEY_decapsulate(privctx, NULL, NULL, ct, sizeof(ct)), 0) - && TEST_int_eq(EVP_PKEY_decapsulate(privctx, secret, &secretlen, NULL, 0), 0) - && TEST_int_eq(EVP_PKEY_decapsulate(privctx, secret, &secretlen, NULL, sizeof(ct)), 0) - && TEST_int_eq(EVP_PKEY_decapsulate(privctx, secret, &secretlen, ct, 0), 0); + && TEST_ptr(pubctx = EVP_PKEY_CTX_new_from_pkey(libctx, pub, NULL)) + && TEST_ptr(privctx = EVP_PKEY_CTX_new_from_pkey(libctx, priv, NULL)) + /* Test setting kem op before the init fails */ + && TEST_int_eq(EVP_PKEY_CTX_set_kem_op(pubctx, "RSASVE"), -2) + /* Test NULL ctx passed */ + && TEST_int_eq(EVP_PKEY_encapsulate_init(NULL, NULL), 0) + && TEST_int_eq(EVP_PKEY_encapsulate(NULL, NULL, NULL, NULL, NULL), 0) + && TEST_int_eq(EVP_PKEY_decapsulate_init(NULL, NULL), 0) + && TEST_int_eq(EVP_PKEY_decapsulate(NULL, NULL, NULL, NULL, 0), 0) + /* Test Invalid operation */ + && TEST_int_eq(EVP_PKEY_encapsulate(pubctx, NULL, NULL, NULL, NULL), -1) + && TEST_int_eq(EVP_PKEY_decapsulate(privctx, NULL, NULL, NULL, 0), 0) + /* Wrong key component - no secret should be returned on failure */ + && TEST_int_eq(EVP_PKEY_decapsulate_init(pubctx, NULL), 1) + && TEST_int_eq(EVP_PKEY_CTX_set_kem_op(pubctx, "RSASVE"), 1) + && TEST_int_eq(EVP_PKEY_decapsulate(pubctx, secret, &secretlen, ct, + sizeof(ct)), 0) + && TEST_uchar_eq(secret[0], 0) + /* Test encapsulate fails if the mode is not set */ + && TEST_int_eq(EVP_PKEY_encapsulate_init(pubctx, NULL), 1) + && TEST_int_eq(EVP_PKEY_encapsulate(pubctx, ct, &ctlen, secret, &secretlen), -2) + /* Test setting a bad kem ops fail */ + && TEST_int_eq(EVP_PKEY_CTX_set_kem_op(pubctx, "RSA"), 0) + && TEST_int_eq(EVP_PKEY_CTX_set_kem_op(pubctx, NULL), 0) + && TEST_int_eq(EVP_PKEY_CTX_set_kem_op(NULL, "RSASVE"), 0) + && TEST_int_eq(EVP_PKEY_CTX_set_kem_op(NULL, NULL), 0) + /* Test secretlen is optional */ + && TEST_int_eq(EVP_PKEY_CTX_set_kem_op(pubctx, "RSASVE"), 1) + && TEST_int_eq(EVP_PKEY_encapsulate(pubctx, NULL, &ctlen, NULL, NULL), 1) + && TEST_int_eq(EVP_PKEY_encapsulate(pubctx, ct, &ctlen, secret, NULL), 1) + && TEST_int_eq(EVP_PKEY_encapsulate(pubctx, NULL, &ctlen, NULL, NULL), 1) + /* Test outlen is optional */ + && TEST_int_eq(EVP_PKEY_encapsulate(pubctx, NULL, NULL, NULL, &secretlen), 1) + && TEST_int_eq(EVP_PKEY_encapsulate(pubctx, ct, NULL, secret, &secretlen), 1) + /* test that either len must be set if out is NULL */ + && TEST_int_eq(EVP_PKEY_encapsulate(pubctx, NULL, NULL, NULL, NULL), 0) + && TEST_int_eq(EVP_PKEY_encapsulate(pubctx, NULL, &ctlen, NULL, NULL), 1) + && TEST_int_eq(EVP_PKEY_encapsulate(pubctx, NULL, NULL, NULL, &secretlen), 1) + && TEST_int_eq(EVP_PKEY_encapsulate(pubctx, NULL, &ctlen, NULL, &secretlen), 1) + /* Secret buffer should be set if there is an output buffer */ + && TEST_int_eq(EVP_PKEY_encapsulate(pubctx, ct, &ctlen, NULL, NULL), 0) + /* Test that lengths are optional if ct is not NULL */ + && TEST_int_eq(EVP_PKEY_encapsulate(pubctx, ct, NULL, secret, NULL), 1) + /* Pass if secret or secret length are not NULL */ + && TEST_int_eq(EVP_PKEY_decapsulate_init(privctx, NULL), 1) + && TEST_int_eq(EVP_PKEY_CTX_set_kem_op(privctx, "RSASVE"), 1) + && TEST_int_eq(EVP_PKEY_decapsulate(privctx, secret, NULL, ct, sizeof(ct)), 1) + && TEST_int_eq(EVP_PKEY_decapsulate(privctx, NULL, &secretlen, ct, sizeof(ct)), 1) + && TEST_int_eq(secretlen, 256) + /* Fail if passed NULL arguments */ + && TEST_int_eq(EVP_PKEY_decapsulate(privctx, NULL, NULL, ct, sizeof(ct)), 0) + && TEST_int_eq(EVP_PKEY_decapsulate(privctx, secret, &secretlen, NULL, 0), 0) + && TEST_int_eq(EVP_PKEY_decapsulate(privctx, secret, &secretlen, NULL, sizeof(ct)), 0) + && TEST_int_eq(EVP_PKEY_decapsulate(privctx, secret, &secretlen, ct, 0), 0); EVP_PKEY_free(pub); EVP_PKEY_free(priv); diff --git a/deps/openssl/openssl/test/ext_internal_test.c b/deps/openssl/openssl/test/ext_internal_test.c index 769b25391d577d..dec6ee61efb35b 100644 --- a/deps/openssl/openssl/test/ext_internal_test.c +++ b/deps/openssl/openssl/test/ext_internal_test.c @@ -69,13 +69,6 @@ static EXT_LIST ext_list[] = { EXT_ENTRY(cryptopro_bug), EXT_ENTRY(early_data), EXT_ENTRY(certificate_authorities), -#ifndef OPENSSL_NO_QUIC - EXT_ENTRY(quic_transport_parameters_draft), - EXT_ENTRY(quic_transport_parameters), -#else - EXT_EXCEPTION(quic_transport_parameters_draft), - EXT_EXCEPTION(quic_transport_parameters), -#endif EXT_ENTRY(padding), EXT_ENTRY(psk), EXT_END(num_builtins) diff --git a/deps/openssl/openssl/test/hmactest.c b/deps/openssl/openssl/test/hmactest.c index 8f5bf32f870899..0a29c58731f60c 100644 --- a/deps/openssl/openssl/test/hmactest.c +++ b/deps/openssl/openssl/test/hmactest.c @@ -275,19 +275,21 @@ static int test_hmac_copy_uninited(void) return res; } -# ifndef OPENSSL_NO_MD5 +#ifndef OPENSSL_NO_MD5 +# define OSSL_HEX_CHARS_PER_BYTE 2 static char *pt(unsigned char *md, unsigned int len) { unsigned int i; - static char buf[80]; + static char buf[201]; if (md == NULL) return NULL; - for (i = 0; i < len; i++) - sprintf(&(buf[i * 2]), "%02x", md[i]); + for (i = 0; i < len && (i + 1) * OSSL_HEX_CHARS_PER_BYTE < sizeof(buf); i++) + BIO_snprintf(buf + i * OSSL_HEX_CHARS_PER_BYTE, + OSSL_HEX_CHARS_PER_BYTE + 1, "%02x", md[i]); return buf; } -# endif +#endif int setup_tests(void) { diff --git a/deps/openssl/openssl/test/memleaktest.c b/deps/openssl/openssl/test/memleaktest.c index 97827b8e9cd3c2..8761686773986c 100644 --- a/deps/openssl/openssl/test/memleaktest.c +++ b/deps/openssl/openssl/test/memleaktest.c @@ -1,5 +1,5 @@ /* - * Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -44,7 +44,7 @@ int main(int argc, char *argv[]) */ int exitcode = EXIT_FAILURE; #endif - char *lost; + char *volatile lost; lost = OPENSSL_malloc(3); if (!TEST_ptr(lost)) diff --git a/deps/openssl/openssl/test/nocache-and-default.cnf b/deps/openssl/openssl/test/nocache-and-default.cnf new file mode 100644 index 00000000000000..cf5ca8d1141518 --- /dev/null +++ b/deps/openssl/openssl/test/nocache-and-default.cnf @@ -0,0 +1,18 @@ +openssl_conf = openssl_init + +# Comment out the next line to ignore configuration errors +config_diagnostics = 1 + +[openssl_init] +providers = provider_sect + +[provider_sect] +test = test_sect +default = default_sect + +[test_sect] +module = ../test/p_test.so +activate = true + +[default_sect] +activate = true diff --git a/deps/openssl/openssl/test/p_test.c b/deps/openssl/openssl/test/p_test.c index 80f0784dd9d5ab..46f990113fb692 100644 --- a/deps/openssl/openssl/test/p_test.c +++ b/deps/openssl/openssl/test/p_test.c @@ -1,5 +1,5 @@ /* - * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2019-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -16,6 +16,8 @@ #include #include +#include + /* * When built as an object file to link the application with, we get the * init function name through the macro PROVIDER_INIT_FUNCTION_NAME. If @@ -46,6 +48,7 @@ static OSSL_FUNC_core_get_params_fn *c_get_params = NULL; static OSSL_FUNC_core_new_error_fn *c_new_error; static OSSL_FUNC_core_set_error_debug_fn *c_set_error_debug; static OSSL_FUNC_core_vset_error_fn *c_vset_error; +static OSSL_FUNC_BIO_vsnprintf_fn *c_BIO_vsnprintf; /* Tell the core what params we provide and what type they are */ static const OSSL_PARAM p_param_types[] = { @@ -60,6 +63,17 @@ static OSSL_FUNC_provider_get_params_fn p_get_params; static OSSL_FUNC_provider_get_reason_strings_fn p_get_reason_strings; static OSSL_FUNC_provider_teardown_fn p_teardown; +static int local_snprintf(char *buf, size_t n, const char *format, ...) +{ + va_list args; + int ret; + + va_start(args, format); + ret = (*c_BIO_vsnprintf)(buf, n, format, args); + va_end(args); + return ret; +} + static void p_set_error(int lib, int reason, const char *file, int line, const char *func, const char *fmt, ...) { @@ -114,11 +128,11 @@ static int p_get_params(void *provctx, OSSL_PARAM params[]) const char *versionp = *(void **)counter_request[0].data; const char *namep = *(void **)counter_request[1].data; - sprintf(buf, "Hello OpenSSL %.20s, greetings from %s!", - versionp, namep); + local_snprintf(buf, sizeof(buf), "Hello OpenSSL %.20s, greetings from %s!", + versionp, namep); } } else { - sprintf(buf, "Howdy stranger..."); + local_snprintf(buf, sizeof(buf), "Howdy stranger..."); } p->return_size = buf_l = strlen(buf) + 1; @@ -216,12 +230,21 @@ static const OSSL_ITEM *p_get_reason_strings(void *_) return reason_strings; } +static const OSSL_ALGORITHM *p_query(OSSL_PROVIDER *prov, + int operation_id, + int *no_cache) +{ + *no_cache = 1; + return NULL; +} + static const OSSL_DISPATCH p_test_table[] = { { OSSL_FUNC_PROVIDER_GETTABLE_PARAMS, (void (*)(void))p_gettable_params }, { OSSL_FUNC_PROVIDER_GET_PARAMS, (void (*)(void))p_get_params }, { OSSL_FUNC_PROVIDER_GET_REASON_STRINGS, (void (*)(void))p_get_reason_strings}, { OSSL_FUNC_PROVIDER_TEARDOWN, (void (*)(void))p_teardown }, + { OSSL_FUNC_PROVIDER_QUERY_OPERATION, (void (*)(void))p_query }, { 0, NULL } }; @@ -250,6 +273,9 @@ int OSSL_provider_init(const OSSL_CORE_HANDLE *handle, case OSSL_FUNC_CORE_VSET_ERROR: c_vset_error = OSSL_FUNC_core_vset_error(in); break; + case OSSL_FUNC_BIO_VSNPRINTF: + c_BIO_vsnprintf = OSSL_FUNC_BIO_vsnprintf(in); + break; default: /* Just ignore anything we don't understand */ break; diff --git a/deps/openssl/openssl/test/pkcs12_format_test.c b/deps/openssl/openssl/test/pkcs12_format_test.c index c142093f72bbbc..f7ecd7c1e635be 100644 --- a/deps/openssl/openssl/test/pkcs12_format_test.c +++ b/deps/openssl/openssl/test/pkcs12_format_test.c @@ -358,7 +358,8 @@ static int test_single_key(PKCS12_ENC *enc) char fname[80]; PKCS12_BUILDER *pb; - sprintf(fname, "1key_ciph-%s_iter-%d.p12", OBJ_nid2sn(enc->nid), enc->iter); + BIO_snprintf(fname, sizeof(fname), "1key_ciph-%s_iter-%d.p12", + OBJ_nid2sn(enc->nid), enc->iter); pb = new_pkcs12_builder(fname); @@ -457,7 +458,8 @@ static int test_single_cert_mac(PKCS12_ENC *mac) char fname[80]; PKCS12_BUILDER *pb; - sprintf(fname, "1cert_mac-%s_iter-%d.p12", OBJ_nid2sn(mac->nid), mac->iter); + BIO_snprintf(fname, sizeof(fname), "1cert_mac-%s_iter-%d.p12", + OBJ_nid2sn(mac->nid), mac->iter); pb = new_pkcs12_builder(fname); @@ -617,7 +619,8 @@ static int test_single_secret(PKCS12_ENC *enc) char fname[80]; PKCS12_BUILDER *pb; - sprintf(fname, "1secret_ciph-%s_iter-%d.p12", OBJ_nid2sn(enc->nid), enc->iter); + BIO_snprintf(fname, sizeof(fname), "1secret_ciph-%s_iter-%d.p12", + OBJ_nid2sn(enc->nid), enc->iter); pb = new_pkcs12_builder(fname); custom_nid = get_custom_oid(); diff --git a/deps/openssl/openssl/test/property_test.c b/deps/openssl/openssl/test/property_test.c index 88c5342c538eca..1f1171ad90a65b 100644 --- a/deps/openssl/openssl/test/property_test.c +++ b/deps/openssl/openssl/test/property_test.c @@ -1,5 +1,5 @@ /* - * Copyright 2019-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2019-2025 The OpenSSL Project Authors. All Rights Reserved. * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use @@ -50,30 +50,37 @@ static void down_ref(void *p) static int test_property_string(void) { - OSSL_METHOD_STORE *store; + OSSL_LIB_CTX *ctx; + OSSL_METHOD_STORE *store = NULL; int res = 0; OSSL_PROPERTY_IDX i, j; - if (TEST_ptr(store = ossl_method_store_new(NULL)) - && TEST_int_eq(ossl_property_name(NULL, "fnord", 0), 0) - && TEST_int_ne(ossl_property_name(NULL, "fnord", 1), 0) - && TEST_int_ne(ossl_property_name(NULL, "name", 1), 0) + /*- + * Use our own library context because we depend on ordering from a + * pristine state. + */ + if (TEST_ptr(ctx = OSSL_LIB_CTX_new()) + && TEST_ptr(store = ossl_method_store_new(ctx)) + && TEST_int_eq(ossl_property_name(ctx, "fnord", 0), 0) + && TEST_int_ne(ossl_property_name(ctx, "fnord", 1), 0) + && TEST_int_ne(ossl_property_name(ctx, "name", 1), 0) /* Property value checks */ - && TEST_int_eq(ossl_property_value(NULL, "fnord", 0), 0) - && TEST_int_ne(i = ossl_property_value(NULL, "no", 0), 0) - && TEST_int_ne(j = ossl_property_value(NULL, "yes", 0), 0) + && TEST_int_eq(ossl_property_value(ctx, "fnord", 0), 0) + && TEST_int_ne(i = ossl_property_value(ctx, "no", 0), 0) + && TEST_int_ne(j = ossl_property_value(ctx, "yes", 0), 0) && TEST_int_ne(i, j) - && TEST_int_eq(ossl_property_value(NULL, "yes", 1), j) - && TEST_int_eq(ossl_property_value(NULL, "no", 1), i) - && TEST_int_ne(i = ossl_property_value(NULL, "illuminati", 1), 0) - && TEST_int_eq(j = ossl_property_value(NULL, "fnord", 1), i + 1) - && TEST_int_eq(ossl_property_value(NULL, "fnord", 1), j) + && TEST_int_eq(ossl_property_value(ctx, "yes", 1), j) + && TEST_int_eq(ossl_property_value(ctx, "no", 1), i) + && TEST_int_ne(i = ossl_property_value(ctx, "illuminati", 1), 0) + && TEST_int_eq(j = ossl_property_value(ctx, "fnord", 1), i + 1) + && TEST_int_eq(ossl_property_value(ctx, "fnord", 1), j) /* Check name and values are distinct */ - && TEST_int_eq(ossl_property_value(NULL, "cold", 0), 0) - && TEST_int_ne(ossl_property_name(NULL, "fnord", 0), - ossl_property_value(NULL, "fnord", 0))) + && TEST_int_eq(ossl_property_value(ctx, "cold", 0), 0) + && TEST_int_ne(ossl_property_name(ctx, "fnord", 0), + ossl_property_value(ctx, "fnord", 0))) res = 1; ossl_method_store_free(store); + OSSL_LIB_CTX_free(ctx); return res; } diff --git a/deps/openssl/openssl/test/recipes/03-test_fipsinstall.t b/deps/openssl/openssl/test/recipes/03-test_fipsinstall.t index 5f514e231b5978..c243b5646d3705 100644 --- a/deps/openssl/openssl/test/recipes/03-test_fipsinstall.t +++ b/deps/openssl/openssl/test/recipes/03-test_fipsinstall.t @@ -253,6 +253,10 @@ SKIP: { SKIP: { skip "Skipping Asymmetric RSA corruption test because of no rsa in this build", 1 if disabled("rsa"); + run(test(["fips_version_test", "-config", $provconf, "<3.5.0"]), + capture => 1, statusvar => \my $exit); + skip "FIPS provider version is too new for Asymmetric RSA corruption test", 1 + if !$exit; ok(!run(app(['openssl', 'fipsinstall', '-out', 'fips.cnf', '-module', $infile, '-corrupt_desc', 'RSA_Encrypt', '-corrupt_type', 'KAT_AsymmetricCipher'])), diff --git a/deps/openssl/openssl/test/recipes/04-test_encoder_decoder.t b/deps/openssl/openssl/test/recipes/04-test_encoder_decoder.t index 19541610a9a9b9..d5d79f3a57541c 100644 --- a/deps/openssl/openssl/test/recipes/04-test_encoder_decoder.t +++ b/deps/openssl/openssl/test/recipes/04-test_encoder_decoder.t @@ -25,9 +25,26 @@ my $no_fips = disabled('fips') || ($ENV{NO_FIPS} // 0); my $rsa_key = srctop_file("test", "certs", "ee-key.pem"); my $pss_key = srctop_file("test", "certs", "ca-pss-key.pem"); -plan tests => ($no_fips ? 0 : 1) + 2; # FIPS install test + test +plan tests => ($no_fips ? 0 : 3) + 2; # FIPS install test + test my $conf = srctop_file("test", "default.cnf"); + +# Check if the specified pattern occurs in the given file +# Returns 1 if the pattern is found and 0 if not +sub find_line_file { + my ($key, $file) = @_; + + open(my $in, $file) or return -1; + while (my $line = <$in>) { + if ($line =~ /$key/) { + close($in); + return 1; + } + } + close($in); + return 0; +} + ok(run(test(["endecode_test", "-rsa", $rsa_key, "-pss", $pss_key, "-config", $conf, @@ -47,5 +64,13 @@ unless ($no_fips) { "-pss", $pss_key, "-config", $conf, "-provider", "fips"]))); +SKIP: { + skip "EC disabled", 2 if disabled("ec"); + ok(run(app([ 'openssl', 'genpkey', '-algorithm', 'EC', + '-pkeyopt', 'group:P-256', '-text', + '-config', $conf, '-provider', 'fips', '-out', 'ec.txt' ])), + 'Print a FIPS provider EC private key'); + ok(find_line_file('NIST CURVE: P-256', 'ec.txt') == 1, + 'Printing an FIPS provider EC private key'); +} } - diff --git a/deps/openssl/openssl/test/recipes/20-test_nocache.t b/deps/openssl/openssl/test/recipes/20-test_nocache.t new file mode 100644 index 00000000000000..f7a956ee05ef2f --- /dev/null +++ b/deps/openssl/openssl/test/recipes/20-test_nocache.t @@ -0,0 +1,34 @@ +#! /usr/bin/env perl +# Copyright 2016-2025 The OpenSSL Project Authors. All Rights Reserved. +# +# Licensed under the Apache License 2.0 (the "License"). You may not use +# this file except in compliance with the License. You can obtain a copy +# in the file LICENSE in the source distribution or at +# https://www.openssl.org/source/license.html + +use strict; +use warnings; + +use OpenSSL::Test qw/:DEFAULT bldtop_file srctop_file bldtop_dir with/; +use OpenSSL::Test::Utils; + +setup("test_nocache"); + +plan tests => 4; + +ok(run(app(["openssl", "list", "-mac-algorithms"], + stdout => "listout.txt")), +"List mac algorithms - default configuration"); +open DATA, "listout.txt"; +my @match = grep /MAC/, ; +close DATA; +ok(scalar @match > 1 ? 1 : 0, "Several algorithms are listed - default configuration"); + +$ENV{OPENSSL_CONF} = bldtop_file("test", "nocache-and-default.cnf"); +ok(run(app(["openssl", "list", "-mac-algorithms"], + stdout => "listout.txt")), +"List mac algorithms"); +open DATA, "listout.txt"; +my @match = grep /MAC/, ; +close DATA; +ok(scalar @match > 1 ? 1 : 0, "Several algorithms are listed - nocache-and-default"); diff --git a/deps/openssl/openssl/test/recipes/25-test_verify.t b/deps/openssl/openssl/test/recipes/25-test_verify.t index 818c9ac50dd3f8..7fa14d9daa8b3a 100644 --- a/deps/openssl/openssl/test/recipes/25-test_verify.t +++ b/deps/openssl/openssl/test/recipes/25-test_verify.t @@ -61,7 +61,7 @@ ok(verify("ee-cert-ocsp-nocheck", "", ["root-cert"], ["ca-cert"]), ok(verify("ee-cert", "sslserver", [qw(sroot-cert)], [qw(ca-cert)]), "accept server purpose"); ok(!verify("ee-cert", "sslserver", [qw(croot-cert)], [qw(ca-cert)]), - "fail client purpose"); + "fail client purpose"); # beware, questionable non-standard EKU check on trust anchor ok(verify("ee-cert", "sslserver", [qw(root+serverAuth)], [qw(ca-cert)]), "accept server trust"); ok(verify("ee-cert", "sslserver", [qw(sroot+serverAuth)], [qw(ca-cert)]), @@ -81,7 +81,7 @@ ok(verify("ee-cert", "sslserver", [qw(root-clientAuth)], [qw(ca-cert)]), ok(verify("ee-cert", "sslserver", [qw(sroot-clientAuth)], [qw(ca-cert)]), "accept client mistrust with server purpose"); ok(!verify("ee-cert", "sslserver", [qw(croot-clientAuth)], [qw(ca-cert)]), - "fail client mistrust with client purpose"); + "fail client mistrust with client purpose"); # beware, questionable non-standard EKU check on trust anchor # Inapplicable trust ok(!verify("ee-cert", "sslserver", [qw(root+clientAuth)], [qw(ca-cert)]), "fail client trust"); @@ -150,7 +150,7 @@ ok(!verify("ee-cert", "sslserver", [qw(root-expired)], [qw(ca-cert)]), ok(verify("ee-cert", "sslserver", [qw(sca-cert)], [], "-partial_chain"), "accept partial chain with server purpose"); ok(!verify("ee-cert", "sslserver", [qw(cca-cert)], [], "-partial_chain"), - "fail partial chain with client purpose"); + "fail partial chain with client purpose"); # beware, questionable non-standard EKU check on trust anchor ok(verify("ee-cert", "sslserver", [qw(ca+serverAuth)], [], "-partial_chain"), "accept server trust partial chain"); ok(verify("ee-cert", "sslserver", [qw(cca+serverAuth)], [], "-partial_chain"), @@ -188,7 +188,7 @@ ok(verify("ee-cert", "sslserver", [qw(root-cert cca+serverAuth)], [qw(ca-cert)]) ok(verify("ee-cert", "sslserver", [qw(root-cert cca+anyEKU)], [qw(ca-cert)]), "accept wildcard trust and client purpose"); ok(!verify("ee-cert", "sslserver", [qw(root-cert cca-cert)], [qw(ca-cert)]), - "fail client purpose"); + "fail client purpose intermediate trusted"); # beware, questionable non-standard EKU check on trust anchor ok(!verify("ee-cert", "sslserver", [qw(root-cert ca-anyEKU)], [qw(ca-cert)]), "fail wildcard mistrust"); ok(!verify("ee-cert", "sslserver", [qw(root-cert ca-serverAuth)], [qw(ca-cert)]), diff --git a/deps/openssl/openssl/test/recipes/30-test_evp_data/evpkdf_tls13_kdf.txt b/deps/openssl/openssl/test/recipes/30-test_evp_data/evpkdf_tls13_kdf.txt index 9ad8b9fbd2dfad..c7e7b4b5bf9073 100644 --- a/deps/openssl/openssl/test/recipes/30-test_evp_data/evpkdf_tls13_kdf.txt +++ b/deps/openssl/openssl/test/recipes/30-test_evp_data/evpkdf_tls13_kdf.txt @@ -4935,3 +4935,13 @@ Ctrl.mode = mode:EXTRACT_AND_EXPAND Ctrl.digest = digest:SHA256 Result = KDF_CTRL_ERROR +# Test that salt of arbitrary length works +FIPSversion = >=3.4.0 +KDF = TLS13-KDF +Ctrl.mode = mode:EXTRACT_ONLY +Ctrl.digest = digest:SHA2-256 +Ctrl.key = hexkey:f8af6aea2d397baf2948a25b2834200692cff17eee9165e4e27babee9edefd05 +Ctrl.salt = hexsalt:00010203040506070809000102030405060708090001020304050607080900010203040506070809 +Ctrl.prefix = hexprefix:746c73313320 +Ctrl.label = hexlabel:64657269766564 +Output = ef0aa4925ab6f4588759e15dfadcf7602ca7aa39ebb092bd7ab48f6a68c54449 diff --git a/deps/openssl/openssl/test/recipes/61-test_bio_pw_callback.t b/deps/openssl/openssl/test/recipes/61-test_bio_pw_callback.t new file mode 100644 index 00000000000000..4cb1db1f589f98 --- /dev/null +++ b/deps/openssl/openssl/test/recipes/61-test_bio_pw_callback.t @@ -0,0 +1,20 @@ +#! /usr/bin/env perl +# Copyright 2024 The OpenSSL Project Authors. All Rights Reserved. +# +# Licensed under the Apache License 2.0 (the "License"). You may not use +# this file except in compliance with the License. You can obtain a copy +# in the file LICENSE in the source distribution or at +# https://www.openssl.org/source/license.html + +use strict; +use warnings; + +use OpenSSL::Test qw(:DEFAULT data_file); + +setup('test_bio_pw_callback'); + +plan tests => 1; + +my $private_key_path = data_file("private_key.pem"); +ok(run(test(["bio_pw_callback_test", "-keyfile", $private_key_path])), + "Running bio_pw_callback_test"); diff --git a/deps/openssl/openssl/test/recipes/61-test_bio_pw_callback_data/private_key.pem b/deps/openssl/openssl/test/recipes/61-test_bio_pw_callback_data/private_key.pem new file mode 100644 index 00000000000000..f9c9ae5dbc4a58 --- /dev/null +++ b/deps/openssl/openssl/test/recipes/61-test_bio_pw_callback_data/private_key.pem @@ -0,0 +1,30 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIIFNTBfBgkqhkiG9w0BBQ0wUjAxBgkqhkiG9w0BBQwwJAQQmftpln/ZNiEznncq ++u0FuwICCAAwDAYIKoZIhvcNAgkFADAdBglghkgBZQMEASoEEBO5TGcD0mGTfRS8 +HgafEXYEggTQOasEXPm4ChGPzfXACYhaAtMFnfL9qpI1S30bHMUHsWuXLZDFPNty +7KNKWr35woaq3XFEeul7onszcBBRrRwPkTqOifuv/J01s7oS0uC6jwbvSkAFNjHe +jkgvMMQA3y7nwZ2wSwVjO2K91qasTjNivus3ZaCvGqGpgNckEXILPZJEdWteWP+1 +SN9zLxxeHwgt5SrMfylrTghLB8b119/uq4GnOYHZdhMbp4YmneuGqvlZ7nle7qLY +33tuM5deajk9hINLfbYWGwURaOZ+r++Rvrz4OxISfe70uXT+2fcSZPVkNT5a6B5T +9rCwdF69W/+3au50gfc2VEF/xZBajxLI0PBpMSpxNE3a5/3YLKXAs+z0YJdQKNhN +U+SpOUv8D2GraJVfP7MddO2JvETh8w7tGN/a8qSw07Z91SE3Vfuq0l5PheC/vXJq +/xxU3YSbZC7LCSZn1aXBlj9KbTh2o1ARzdJsVYo1xY2OIFtFpncOjQDuaAmsNcZE +CuB9FUcBwwO/bjooIkv4lJU+DWDxrCR7Si8PZ4hHgXCXXKiXA20SBccUYm0Z4HR3 +i2tm9UTwAuCy1BF7hRmPLIyvlgtlKh2V9Cre5j86GoKTmPh/q5DHdSmNAM8Aakct +GdQgscOXRmHq7/1nec28wEhlbqVyYJ45MZbWhBTrycMru/ch9+ZnsIgPXLfbBA+P +6GHK1DF+onKZtMkH0SNMU3X1arlJKRreVQsvkbgL7aw3mI0veYa4/tJUf7hbkPpA +LArQU5wQ+A9mzC+tYMfz3mrIE05FrpYkHRxiB/odeNvCTMR7DhGoghhnYUN/gSSN +qH5EBG2hQ/pJ5ZSawE+P9+vCLlvcc4n00zgi0s3rMN2AntPZoI3sWKZcbbgJoOIH +cbAmBAKCIiwmlPmI0hjEAIXRBixJzHVGNowuSc3jy5pIiSjmDESnARl+n5imqI3D +po9OuCHpo4nRLcAX0GrJqqKxUG+R1A8g/AooIGEPQgkXk/4v9gwd4aBvwT4YxR44 +onAXdyBMM0T8C+8dUmT6OPvU5w6JHFidJfhBgJhDIdj9JM+wWdr1CW94todjEyKY +Xe3NRG1bGbcN6HBVwbe4UZ39A9p4kKGyiXexlsD+DvFxwaGvSy2rp0lLabz19Kkr +fnLU1Ugb38AnEYTGYJMB9nO19lHW62Mk6+9ky42x8X9vBn81Nif/c0kmvEKsZEfw +UM7m0fIWTZOWSH01DGIXqCoCk7vJ1CSm0wUsAvyKFLm1qnM5eJJNMlBbayDDBsnU +Jj9hx7GWjujVKFwFngUOoFpmFWB72bqeBWenaQJhIVydQa1rolny0TECJIkFOsUK +Wa0y52V4h68Ig5G5p2WHG0RlEVtmcgzSoL1mLE5UdOYaH5oB7nTVM+Z0b8HJFrYc +7Xhym8uNq6UHc4Ae6TT8EA3lA3fDttedKzWxlBFXqX9behl2uBnPzCl3cS2G2Uek +xtexjecZINP8L5i6eIL7bPoVMF5CUsUhIWFA0gzIovRBRvVS91HnTrIDLvqF8YgQ +ToctUU/vS8r3x2/TIR60UBvW0vkoFa+lfzHtsxBnT1nMBZNeeHOCM8QtboyI9Ir9 +UkJbTO+QpJQ5A3ELharpcqr7iywDOnLSV9LZSUZr934zOrRl2oAXx/0= +-----END ENCRYPTED PRIVATE KEY----- diff --git a/deps/openssl/openssl/test/recipes/80-test_cmp_http.t b/deps/openssl/openssl/test/recipes/80-test_cmp_http.t index 0ca547354fc7e3..c704cc758e913d 100644 --- a/deps/openssl/openssl/test/recipes/80-test_cmp_http.t +++ b/deps/openssl/openssl/test/recipes/80-test_cmp_http.t @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2007-2022 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2007-2025 The OpenSSL Project Authors. All Rights Reserved. # Copyright Nokia 2007-2019 # Copyright Siemens AG 2015-2019 # @@ -270,7 +270,7 @@ sub start_mock_server { print "Current directory is ".getcwd()."\n"; print "Launching mock server: $cmd\n"; die "Invalid port: $server_port" unless $server_port =~ m/^\d+$/; - my $pid = open($server_fh, "$cmd|") or die "Trying to $cmd"; + my $pid = open($server_fh, "$cmd 2>".result_dir()."/error.txt |") or die "Trying to $cmd"; print "Pid is: $pid\n"; if ($server_port == 0) { # Find out the actual server port diff --git a/deps/openssl/openssl/test/recipes/80-test_cmp_http_data/test_connection.csv b/deps/openssl/openssl/test/recipes/80-test_cmp_http_data/test_connection.csv index 33a572a29da1ad..cc012411ea5f9a 100644 --- a/deps/openssl/openssl/test/recipes/80-test_cmp_http_data/test_connection.csv +++ b/deps/openssl/openssl/test/recipes/80-test_cmp_http_data/test_connection.csv @@ -2,8 +2,8 @@ expected,description, -section,val, -server,val, -proxy,val, -no_proxy,val, -tls ,Message transfer options:,,,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,,,, 1,default config, -section,,,,,,,,BLANK,,,,BLANK,,BLANK,,BLANK, -TBD,Domain name, -section,, -server,_SERVER_CN:_SERVER_PORT,,,,,,,,,,,,,, -TBD,IP address, -section,, -server,_SERVER_IP:_SERVER_PORT,,,,,,,,,,,,,, +1,disabled as not supported by some host IP configurations: server domain name, -section,, -server,localhost:_SERVER_PORT,,,,,,,,,,,,,, +1,disabled as not supported by some host IP configurations: server IPv6 address, -section,, -server,[::1]:_SERVER_PORT,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,,,, 0,wrong server, -section,, -server,xn--rksmrgs-5wao1o.example.com:_SERVER_PORT,,,,,BLANK,,,, -msg_timeout,1,BLANK,,BLANK, 0,wrong server port, -section,, -server,_SERVER_HOST:99,,,,,BLANK,,,, -msg_timeout,1,BLANK,,BLANK, diff --git a/deps/openssl/openssl/test/recipes/80-test_cms.t b/deps/openssl/openssl/test/recipes/80-test_cms.t index 31f9fbd1280ac1..0e8b0259f1c2ea 100644 --- a/deps/openssl/openssl/test/recipes/80-test_cms.t +++ b/deps/openssl/openssl/test/recipes/80-test_cms.t @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2015-2023 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2015-2025 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the Apache License 2.0 (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -25,6 +25,7 @@ use lib srctop_dir('Configurations'); use lib bldtop_dir('.'); my $no_fips = disabled('fips') || ($ENV{NO_FIPS} // 0); +my $old_fips = 0; plan skip_all => "CMS is not supported by this OpenSSL build" if disabled("cms"); @@ -50,13 +51,17 @@ my ($no_des, $no_dh, $no_dsa, $no_ec, $no_ec2m, $no_rc2, $no_zlib) $no_rc2 = 1 if disabled("legacy"); -plan tests => 19; +plan tests => 20; ok(run(test(["pkcs7_test"])), "test pkcs7"); unless ($no_fips) { - @config = ( "-config", srctop_file("test", "fips-and-base.cnf") ); + my $provconf = srctop_file("test", "fips-and-base.cnf"); + @config = ( "-config", $provconf ); $provname = 'fips'; + + run(test(["fips_version_test", "-config", $provconf, "<3.4.0"]), + capture => 1, statusvar => $old_fips); } $ENV{OPENSSL_TEST_LIBCTX} = "1"; @@ -394,6 +399,13 @@ my @smime_cms_tests = ( "-out", "{output}.txt" ], \&final_compare ], + + [ "encrypted content test streaming PEM format -noout, 128 bit AES key", + [ "{cmd1}", @prov, "-EncryptedData_encrypt", "-in", $smcont, "-outform", "PEM", + "-aes128", "-secretkey", "000102030405060708090A0B0C0D0E0F", + "-stream", "-noout" ], + [ "{cmd2}", @prov, "-help" ] + ], ); my @smime_cms_cades_tests = ( @@ -604,6 +616,7 @@ my @smime_cms_param_tests = ( "-stream", "-out", "{output}.cms", "-recip", catfile($smdir, "smec1.pem"), "-aes128", "-keyopt", "ecdh_kdf_md:sha256" ], + sub { my %opts = @_; smimeType_matches("$opts{output}.cms", "enveloped-data"); }, [ "{cmd2}", @prov, "-decrypt", "-recip", catfile($smdir, "smec1.pem"), "-in", "{output}.cms", "-out", "{output}.txt" ], \&final_compare @@ -613,6 +626,7 @@ my @smime_cms_param_tests = ( [ "{cmd1}", @prov, "-encrypt", "-in", $smcont, "-stream", "-out", "{output}.cms", "-recip", catfile($smdir, "smec1.pem"), "-aes-128-gcm", "-keyopt", "ecdh_kdf_md:sha256" ], + sub { my %opts = @_; smimeType_matches("$opts{output}.cms", "authEnveloped-data"); }, [ "{cmd2}", "-decrypt", "-recip", catfile($smdir, "smec1.pem"), "-in", "{output}.cms", "-out", "{output}.txt" ], \&final_compare @@ -626,18 +640,23 @@ my @smime_cms_param_tests = ( [ "{cmd2}", @prov, "-decrypt", "-recip", catfile($smdir, "smec2.pem"), "-in", "{output}.cms", "-out", "{output}.txt" ], \&final_compare - ], - - [ "enveloped content test streaming S/MIME format, X9.42 DH", - [ "{cmd1}", @prov, "-encrypt", "-in", $smcont, - "-stream", "-out", "{output}.cms", - "-recip", catfile($smdir, "smdh.pem"), "-aes128" ], - [ "{cmd2}", @prov, "-decrypt", "-recip", catfile($smdir, "smdh.pem"), - "-in", "{output}.cms", "-out", "{output}.txt" ], - \&final_compare ] ); +if ($no_fips || $old_fips) { + # Only SHA1 supported in dh_cms_encrypt() + push(@smime_cms_param_tests, + [ "enveloped content test streaming S/MIME format, X9.42 DH", + [ "{cmd1}", @prov, "-encrypt", "-in", $smcont, + "-stream", "-out", "{output}.cms", + "-recip", catfile($smdir, "smdh.pem"), "-aes128" ], + [ "{cmd2}", @prov, "-decrypt", "-recip", catfile($smdir, "smdh.pem"), + "-in", "{output}.cms", "-out", "{output}.txt" ], + \&final_compare + ] + ); +} + my @contenttype_cms_test = ( [ "signed content test - check that content type is added to additional signerinfo, RSA keys", [ "{cmd1}", @prov, "-sign", "-binary", "-nodetach", "-stream", "-in", $smcont, @@ -765,6 +784,28 @@ sub contentType_matches { return scalar(@c); } +# Returns 1 if the smime-type matches the passed parameter, otherwise 0. +sub smimeType_matches { + my ($in, $expected_smime_type) = @_; + + # Read the text file + open(my $fh, '<', $in) or die("open failed for $in : $!"); + local $/; + my $content = <$fh>; + close($fh); + + # Extract the Content-Type line with the smime-type attribute + if ($content =~ /Content-Type:\s*application\/pkcs7-mime.*smime-type=([^\s;]+)/) { + my $smime_type = $1; + + # Compare the extracted smime-type with the expected value + return ($smime_type eq $expected_smime_type) ? 1 : 0; + } + + # If no smime-type is found, return 0 + return 0; +} + sub rsapssSaltlen { my ($in) = @_; my $exit = 0; @@ -986,6 +1027,22 @@ ok(!run(app(['openssl', 'cms', '-verify', ])), "issue#19643"); +# Check that kari encryption with originator does not segfault +with({ exit_checker => sub { return shift == 3; } }, + sub { + SKIP: { + skip "EC is not supported in this build", 1 if $no_ec; + + ok(run(app(['openssl', 'cms', '-encrypt', + '-in', srctop_file("test", "smcont.txt"), '-aes128', + '-recip', catfile($smdir, "smec1.pem"), + '-originator', catfile($smdir, "smec3.pem"), + '-inkey', catfile($smdir, "smec3.pem") + ])), + "Check failure for currently not supported kari encryption with static originator"); + } + }); + # Check that we get the expected failure return code with({ exit_checker => sub { return shift == 6; } }, sub { diff --git a/deps/openssl/openssl/test/sslapitest.c b/deps/openssl/openssl/test/sslapitest.c index b0544d4942f7ea..368b15f22b7295 100644 --- a/deps/openssl/openssl/test/sslapitest.c +++ b/deps/openssl/openssl/test/sslapitest.c @@ -1,5 +1,5 @@ /* - * Copyright 2016-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -190,7 +190,7 @@ static int compare_hex_encoded_buffer(const char *hex_encoded, return 1; for (i = j = 0; i < raw_length && j + 1 < hex_length; i++, j += 2) { - sprintf(hexed, "%02x", raw[i]); + BIO_snprintf(hexed, sizeof(hexed), "%02x", raw[i]); if (!TEST_int_eq(hexed[0], hex_encoded[j]) || !TEST_int_eq(hexed[1], hex_encoded[j + 1])) return 1; @@ -10764,364 +10764,6 @@ static int test_multi_resume(int idx) SSL_SESSION_free(sess); return testresult; } -#ifndef OPENSSL_NO_QUIC -static int test_quic_set_encryption_secrets(SSL *ssl, - OSSL_ENCRYPTION_LEVEL level, - const uint8_t *read_secret, - const uint8_t *write_secret, - size_t secret_len) -{ - test_printf_stderr("quic_set_encryption_secrets() %s, lvl=%d, len=%zd\n", - ssl->server ? "server" : "client", level, secret_len); - return 1; -} - -static int test_quic_add_handshake_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level, - const uint8_t *data, size_t len) -{ - SSL *peer = (SSL*)SSL_get_app_data(ssl); - - TEST_info("quic_add_handshake_data() %s, lvl=%d, *data=0x%02X, len=%zd\n", - ssl->server ? "server" : "client", level, (int)*data, len); - if (!TEST_ptr(peer)) - return 0; - - /* We're called with what is locally written; this gives it to the peer */ - if (!TEST_true(SSL_provide_quic_data(peer, level, data, len))) { - ERR_print_errors_fp(stderr); - return 0; - } - - return 1; -} - -static int test_quic_flush_flight(SSL *ssl) -{ - test_printf_stderr("quic_flush_flight() %s\n", ssl->server ? "server" : "client"); - return 1; -} - -static int test_quic_send_alert(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert) -{ - test_printf_stderr("quic_send_alert() %s, lvl=%d, alert=%d\n", - ssl->server ? "server" : "client", level, alert); - return 1; -} - -static SSL_QUIC_METHOD quic_method = { - test_quic_set_encryption_secrets, - test_quic_add_handshake_data, - test_quic_flush_flight, - test_quic_send_alert, -}; - -static int test_quic_api_set_versions(SSL *ssl, int ver) -{ - SSL_set_quic_transport_version(ssl, ver); - return 1; -} - -static int test_quic_api_version(int clnt, int srvr) -{ - SSL_CTX *cctx = NULL, *sctx = NULL; - SSL *clientssl = NULL, *serverssl = NULL; - int testresult = 0; - - static const char *server_str = "SERVER"; - static const char *client_str = "CLIENT"; - const uint8_t *peer_str; - size_t peer_str_len; - - TEST_info("original clnt=0x%X, srvr=0x%X\n", clnt, srvr); - - if (!TEST_true(create_ssl_ctx_pair(libctx, - TLS_server_method(), - TLS_client_method(), - TLS1_3_VERSION, 0, - &sctx, &cctx, cert, privkey)) - || !TEST_true(SSL_CTX_set_quic_method(sctx, &quic_method)) - || !TEST_true(SSL_CTX_set_quic_method(cctx, &quic_method)) - || !TEST_true(create_ssl_objects(sctx, cctx, &serverssl, - &clientssl, NULL, NULL)) - || !TEST_true(SSL_set_quic_transport_params(serverssl, - (unsigned char*)server_str, - strlen(server_str)+1)) - || !TEST_true(SSL_set_quic_transport_params(clientssl, - (unsigned char*)client_str, - strlen(client_str)+1)) - || !TEST_true(SSL_set_app_data(serverssl, clientssl)) - || !TEST_true(SSL_set_app_data(clientssl, serverssl)) - || !TEST_true(test_quic_api_set_versions(clientssl, clnt)) - || !TEST_true(test_quic_api_set_versions(serverssl, srvr)) - || !TEST_true(create_bare_ssl_connection(serverssl, clientssl, - SSL_ERROR_NONE, 0)) - || !TEST_true(SSL_version(serverssl) == TLS1_3_VERSION) - || !TEST_true(SSL_version(clientssl) == TLS1_3_VERSION) - || !(TEST_int_eq(SSL_quic_read_level(clientssl), ssl_encryption_application)) - || !(TEST_int_eq(SSL_quic_read_level(serverssl), ssl_encryption_application)) - || !(TEST_int_eq(SSL_quic_write_level(clientssl), ssl_encryption_application)) - || !(TEST_int_eq(SSL_quic_write_level(serverssl), ssl_encryption_application))) - goto end; - - SSL_get_peer_quic_transport_params(serverssl, &peer_str, &peer_str_len); - if (!TEST_mem_eq(peer_str, peer_str_len, client_str, strlen(client_str)+1)) - goto end; - SSL_get_peer_quic_transport_params(clientssl, &peer_str, &peer_str_len); - if (!TEST_mem_eq(peer_str, peer_str_len, server_str, strlen(server_str)+1)) - goto end; - - /* Deal with two NewSessionTickets */ - if (!TEST_true(SSL_process_quic_post_handshake(clientssl))) - goto end; - - /* Dummy handshake call should succeed */ - if (!TEST_true(SSL_do_handshake(clientssl))) - goto end; - /* Test that we (correctly) fail to send KeyUpdate */ - if (!TEST_true(SSL_key_update(clientssl, SSL_KEY_UPDATE_NOT_REQUESTED)) - || !TEST_int_le(SSL_do_handshake(clientssl), 0)) - goto end; - if (!TEST_true(SSL_key_update(serverssl, SSL_KEY_UPDATE_NOT_REQUESTED)) - || !TEST_int_le(SSL_do_handshake(serverssl), 0)) - goto end; - - TEST_info("original clnt=0x%X, srvr=0x%X\n", clnt, srvr); - if (srvr == 0 && clnt == 0) - srvr = clnt = TLSEXT_TYPE_quic_transport_parameters; - else if (srvr == 0) - srvr = clnt; - else if (clnt == 0) - clnt = srvr; - TEST_info("expected clnt=0x%X, srvr=0x%X\n", clnt, srvr); - if (!TEST_int_eq(SSL_get_peer_quic_transport_version(serverssl), clnt)) - goto end; - if (!TEST_int_eq(SSL_get_peer_quic_transport_version(clientssl), srvr)) - goto end; - - testresult = 1; - - end: - SSL_free(serverssl); - SSL_free(clientssl); - SSL_CTX_free(sctx); - SSL_CTX_free(cctx); - - return testresult; -} - -static int test_quic_api(int tst) -{ - SSL_CTX *sctx = NULL; - SSL *serverssl = NULL; - int testresult = 0; - static int clnt_params[] = { 0, - TLSEXT_TYPE_quic_transport_parameters_draft, - TLSEXT_TYPE_quic_transport_parameters, - 0, - TLSEXT_TYPE_quic_transport_parameters_draft, - TLSEXT_TYPE_quic_transport_parameters, - 0, - TLSEXT_TYPE_quic_transport_parameters_draft, - TLSEXT_TYPE_quic_transport_parameters }; - static int srvr_params[] = { 0, - 0, - 0, - TLSEXT_TYPE_quic_transport_parameters_draft, - TLSEXT_TYPE_quic_transport_parameters_draft, - TLSEXT_TYPE_quic_transport_parameters_draft, - TLSEXT_TYPE_quic_transport_parameters, - TLSEXT_TYPE_quic_transport_parameters, - TLSEXT_TYPE_quic_transport_parameters }; - static int results[] = { 1, 1, 1, 1, 1, 0, 1, 0, 1 }; - - /* Failure cases: - * test 6/[5] clnt = parameters, srvr = draft - * test 8/[7] clnt = draft, srvr = parameters - */ - - /* Clean up logging space */ - memset(client_log_buffer, 0, sizeof(client_log_buffer)); - memset(server_log_buffer, 0, sizeof(server_log_buffer)); - client_log_buffer_index = 0; - server_log_buffer_index = 0; - error_writing_log = 0; - - if (!TEST_ptr(sctx = SSL_CTX_new_ex(libctx, NULL, TLS_server_method())) - || !TEST_true(SSL_CTX_set_quic_method(sctx, &quic_method)) - || !TEST_ptr(sctx->quic_method) - || !TEST_ptr(serverssl = SSL_new(sctx)) - || !TEST_true(SSL_IS_QUIC(serverssl)) - || !TEST_true(SSL_set_quic_method(serverssl, NULL)) - || !TEST_false(SSL_IS_QUIC(serverssl)) - || !TEST_true(SSL_set_quic_method(serverssl, &quic_method)) - || !TEST_true(SSL_IS_QUIC(serverssl))) - goto end; - - if (!TEST_int_eq(test_quic_api_version(clnt_params[tst], srvr_params[tst]), results[tst])) - goto end; - - testresult = 1; - -end: - SSL_CTX_free(sctx); - sctx = NULL; - SSL_free(serverssl); - serverssl = NULL; - return testresult; -} - -# ifndef OSSL_NO_USABLE_TLS1_3 -/* - * Helper method to setup objects for QUIC early data test. Caller - * frees objects on error. - */ -static int quic_setupearly_data_test(SSL_CTX **cctx, SSL_CTX **sctx, - SSL **clientssl, SSL **serverssl, - SSL_SESSION **sess, int idx) -{ - static const char *server_str = "SERVER"; - static const char *client_str = "CLIENT"; - - if (*sctx == NULL - && (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(), - TLS_client_method(), - TLS1_3_VERSION, 0, - sctx, cctx, cert, privkey)) - || !TEST_true(SSL_CTX_set_quic_method(*sctx, &quic_method)) - || !TEST_true(SSL_CTX_set_quic_method(*cctx, &quic_method)) - || !TEST_true(SSL_CTX_set_max_early_data(*sctx, 0xffffffffu)))) - return 0; - - if (idx == 1) { - /* When idx == 1 we repeat the tests with read_ahead set */ - SSL_CTX_set_read_ahead(*cctx, 1); - SSL_CTX_set_read_ahead(*sctx, 1); - } else if (idx == 2) { - /* When idx == 2 we are doing early_data with a PSK. Set up callbacks */ - SSL_CTX_set_psk_use_session_callback(*cctx, use_session_cb); - SSL_CTX_set_psk_find_session_callback(*sctx, find_session_cb); - use_session_cb_cnt = 0; - find_session_cb_cnt = 0; - srvid = pskid; - } - - if (!TEST_true(create_ssl_objects(*sctx, *cctx, serverssl, clientssl, - NULL, NULL)) - || !TEST_true(SSL_set_quic_transport_params(*serverssl, - (unsigned char*)server_str, - strlen(server_str)+1)) - || !TEST_true(SSL_set_quic_transport_params(*clientssl, - (unsigned char*)client_str, - strlen(client_str)+1)) - || !TEST_true(SSL_set_app_data(*serverssl, *clientssl)) - || !TEST_true(SSL_set_app_data(*clientssl, *serverssl))) - return 0; - - /* - * For one of the run throughs (doesn't matter which one), we'll try sending - * some SNI data in the initial ClientHello. This will be ignored (because - * there is no SNI cb set up by the server), so it should not impact - * early_data. - */ - if (idx == 1 - && !TEST_true(SSL_set_tlsext_host_name(*clientssl, "localhost"))) - return 0; - - if (idx == 2) { - clientpsk = create_a_psk(*clientssl, SHA256_DIGEST_LENGTH); - if (!TEST_ptr(clientpsk) - || !TEST_true(SSL_SESSION_set_max_early_data(clientpsk, - 0xffffffffu)) - || !TEST_true(SSL_SESSION_up_ref(clientpsk))) { - SSL_SESSION_free(clientpsk); - clientpsk = NULL; - return 0; - } - serverpsk = clientpsk; - - if (sess != NULL) { - if (!TEST_true(SSL_SESSION_up_ref(clientpsk))) { - SSL_SESSION_free(clientpsk); - SSL_SESSION_free(serverpsk); - clientpsk = serverpsk = NULL; - return 0; - } - *sess = clientpsk; - } - - SSL_set_quic_early_data_enabled(*serverssl, 1); - SSL_set_quic_early_data_enabled(*clientssl, 1); - - return 1; - } - - if (sess == NULL) - return 1; - - if (!TEST_true(create_bare_ssl_connection(*serverssl, *clientssl, - SSL_ERROR_NONE, 0))) - return 0; - - /* Deal with two NewSessionTickets */ - if (!TEST_true(SSL_process_quic_post_handshake(*clientssl))) - return 0; - - *sess = SSL_get1_session(*clientssl); - SSL_shutdown(*clientssl); - SSL_shutdown(*serverssl); - SSL_free(*serverssl); - SSL_free(*clientssl); - *serverssl = *clientssl = NULL; - - if (!TEST_true(create_ssl_objects(*sctx, *cctx, serverssl, - clientssl, NULL, NULL)) - || !TEST_true(SSL_set_session(*clientssl, *sess)) - || !TEST_true(SSL_set_quic_transport_params(*serverssl, - (unsigned char*)server_str, - strlen(server_str)+1)) - || !TEST_true(SSL_set_quic_transport_params(*clientssl, - (unsigned char*)client_str, - strlen(client_str)+1)) - || !TEST_true(SSL_set_app_data(*serverssl, *clientssl)) - || !TEST_true(SSL_set_app_data(*clientssl, *serverssl))) - return 0; - - SSL_set_quic_early_data_enabled(*serverssl, 1); - SSL_set_quic_early_data_enabled(*clientssl, 1); - - return 1; -} - -static int test_quic_early_data(int tst) -{ - SSL_CTX *cctx = NULL, *sctx = NULL; - SSL *clientssl = NULL, *serverssl = NULL; - int testresult = 0; - SSL_SESSION *sess = NULL; - - if (!TEST_true(quic_setupearly_data_test(&cctx, &sctx, &clientssl, - &serverssl, &sess, tst))) - goto end; - - if (!TEST_true(create_bare_ssl_connection(serverssl, clientssl, SSL_ERROR_NONE, 0)) - || !TEST_true(SSL_get_early_data_status(serverssl))) - goto end; - - testresult = 1; - - end: - SSL_SESSION_free(sess); - SSL_SESSION_free(clientpsk); - SSL_SESSION_free(serverpsk); - clientpsk = serverpsk = NULL; - SSL_free(serverssl); - SSL_free(clientssl); - SSL_CTX_free(sctx); - SSL_CTX_free(cctx); - return testresult; -} -# endif /* OSSL_NO_USABLE_TLS1_3 */ -#endif /* OPENSSL_NO_QUIC */ static struct next_proto_st { int serverlen; @@ -11276,6 +10918,7 @@ static int npn_advert_cb(SSL *ssl, const unsigned char **out, return SSL_TLSEXT_ERR_OK; case 1: + *out = NULL; *outlen = 0; return SSL_TLSEXT_ERR_OK; @@ -11765,12 +11408,6 @@ int setup_tests(void) ADD_ALL_TESTS(test_npn, 5); #endif ADD_ALL_TESTS(test_alpn, 4); -#ifndef OPENSSL_NO_QUIC - ADD_ALL_TESTS(test_quic_api, 9); -# ifndef OSSL_NO_USABLE_TLS1_3 - ADD_ALL_TESTS(test_quic_early_data, 3); -# endif -#endif return 1; err: diff --git a/deps/openssl/openssl/test/testutil/tests.c b/deps/openssl/openssl/test/testutil/tests.c index ef7e224cd119c3..05526870acd39b 100644 --- a/deps/openssl/openssl/test/testutil/tests.c +++ b/deps/openssl/openssl/test/testutil/tests.c @@ -1,5 +1,5 @@ /* - * Copyright 2017-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2017-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -146,6 +146,7 @@ void test_perror(const char *s) void test_note(const char *fmt, ...) { + test_flush_stdout(); if (fmt != NULL) { va_list ap; diff --git a/deps/openssl/openssl/test/threadstest.c b/deps/openssl/openssl/test/threadstest.c index 289565c14b5d8e..046a9eb80239a6 100644 --- a/deps/openssl/openssl/test/threadstest.c +++ b/deps/openssl/openssl/test/threadstest.c @@ -358,7 +358,7 @@ static void thread_general_worker(void) * Therefore we use an insecure bit length where we can (512). * In the FIPS module though we must use a longer length. */ - pkey = EVP_PKEY_Q_keygen(multi_libctx, NULL, "RSA", isfips ? 2048 : 512); + pkey = EVP_PKEY_Q_keygen(multi_libctx, NULL, "RSA", (size_t)(isfips ? 2048 : 512)); if (!TEST_ptr(pkey)) goto err; diff --git a/deps/openssl/openssl/test/tls13secretstest.c b/deps/openssl/openssl/test/tls13secretstest.c index 8323b23778754a..bf214d3d5ba755 100644 --- a/deps/openssl/openssl/test/tls13secretstest.c +++ b/deps/openssl/openssl/test/tls13secretstest.c @@ -224,13 +224,6 @@ void ssl_evp_md_free(const EVP_MD *md) { } -#ifndef OPENSSL_NO_QUIC -int quic_set_encryption_secrets(SSL *ssl, OSSL_ENCRYPTION_LEVEL level) -{ - return 1; -} -#endif - /* End of mocked out code */ static int test_secret(SSL *s, unsigned char *prk, diff --git a/deps/openssl/openssl/util/check-format-commit.sh b/deps/openssl/openssl/util/check-format-commit.sh index 7e712dc48cf655..206827dd8669a3 100755 --- a/deps/openssl/openssl/util/check-format-commit.sh +++ b/deps/openssl/openssl/util/check-format-commit.sh @@ -6,24 +6,21 @@ # You can obtain a copy in the file LICENSE in the source distribution # or at https://www.openssl.org/source/license.html # -# This script is a wrapper around check-format.pl. It accepts a commit sha -# value as input, and uses it to identify the files and ranges that were -# changed in that commit, filtering check-format.pl output only to lines that -# fall into the commits change ranges. -# - - -# List of Regexes to use when running check-format.pl. -# Style checks don't apply to any of these -EXCLUDED_FILE_REGEX=("\.pod" \ - "\.pl" \ - "\.pm" \ - "\.t" \ - "\.yml" \ - "\.sh") - -# Exit code for the script -EXIT_CODE=0 +# This script is a wrapper around check-format.pl. +# It accepts the same commit revision range as 'git diff' as arguments, +# or just a single commit id, and uses it to identify the files and line ranges +# that were changed in that commit range, filtering check-format.pl output +# only to lines that fall into the change ranges of the changed files. +# examples: +# check-format-commit.sh # check unstaged changes +# check-format-commit.sh HEAD +# check-format-commit.sh @~3.. +# check-format-commit.sh f5981c9629667a5a5d6 +# check-format-commit.sh f5981c9629667a5a5d6..ee0bf38e8709bf71888 + +# Allowlist of files to scan +# Currently this is any .c or .h file (with an optional .in suffix) +FILE_NAME_END_ALLOWLIST=("\.[ch]\(.in\)\?") # Global vars @@ -45,94 +42,107 @@ cleanup() { trap cleanup EXIT -# Get the canonical sha256 sum for the commit we are checking +# Get the list of ids of the commits we are checking, +# or empty for unstaged changes. # This lets us pass in symbolic ref names like master/etc and -# resolve them to sha256 sums easily -COMMIT=$(git rev-parse $1) +# resolve them to commit ids easily +COMMIT_RANGE="$@" +[ -n $COMMIT_RANGE ] && COMMIT_LAST=$(git rev-parse $COMMIT_RANGE) -# Fail gracefully if git rev-parse doesn't produce a valid -# commit +# Fail gracefully if git rev-parse doesn't produce a valid commit if [ $? -ne 0 ] then - echo "$1 is not a valid revision" + echo "$1 is not a valid commit range or commit id" exit 1 fi -# Create a iteratable list of files to check for a -# given commit. It produces output of the format -# , -touch $TEMPDIR/ranges.txt -git show $COMMIT | awk -v mycmt=$COMMIT ' +# If the commit range is exactly one revision, +# git rev-parse will output just the commit id of that one alone. +# In that case, we must manipulate a little to get a desirable result, +# as 'git diff' has a slightly different interpretation of a single commit id: +# it takes that to mean all commits up to HEAD, plus any unstaged changes. +if [ $(echo -n "$COMMIT_LAST" | wc -w) -ne 1 ]; then + COMMIT_LAST=$(echo "$COMMIT_LAST" | head -1) +else + # $COMMIT_RANGE is just one commit, make it an actual range + COMMIT_RANGE=$COMMIT_RANGE^..$COMMIT_RANGE +fi + +# Create an iterable list of files to check formatting on, +# including the line ranges that are changed by the commits +# It produces output of this format: +# , +git diff -U0 $COMMIT_RANGE | awk ' BEGIN {myfile=""} - /+{3}/ { - gsub(/b\//,"",$2); - myfile=$2 - } - /@@/ { - gsub(/+/,"",$3); - printf mycmt " " myfile " " $3 "\n" - }' >> $TEMPDIR/ranges.txt || true - -# filter out anything that matches on a filter regex -for i in ${EXCLUDED_FILE_REGEX[@]} -do - touch $TEMPDIR/ranges.filter - grep -v "$i" $TEMPDIR/ranges.txt >> $TEMPDIR/ranges.filter || true - REMAINING_FILES=$(wc -l $TEMPDIR/ranges.filter | awk '{print $1}') - if [ $REMAINING_FILES -eq 0 ] - then - echo "This commit has no files that require checking" - exit 0 - fi - mv $TEMPDIR/ranges.filter $TEMPDIR/ranges.txt -done + /^\+\+\+/ { sub(/^b./,"",$2); file=$2 } + /^@@/ { sub(/^\+/,"",$3); range=$3; printf file " " range "\n" } + ' > $TEMPDIR/ranges.txt -# check out the files from the commit level. -# For each file name in ranges, we show that file at the commit -# level we are checking, and redirect it to the same path, relative -# to $TEMPDIR/check-format. This give us the full file to run -# check-format.pl on with line numbers matching the ranges in the -# $TEMPDIR/ranges.txt file -for j in $(grep $COMMIT $TEMPDIR/ranges.txt | awk '{print $2}') +# filter in anything that matches on a filter regex +for i in ${FILE_NAME_END_ALLOWLIST[@]} do - FDIR=$(dirname $j) - mkdir -p $TEMPDIR/check-format/$FDIR - git show $COMMIT:$j > $TEMPDIR/check-format/$j + # Note the space after the $i below. This is done because we want + # to match on file name suffixes, but the input file is of the form + # , + # So we can't just match on end of line. The additional space + # here lets us match on suffixes followed by the expected space + # in the input file + grep "$i " $TEMPDIR/ranges.txt >> $TEMPDIR/ranges.filter || true done -# Now for each file in $TEMPDIR/check-format run check-format.pl -# Note that we use the %P formatter in the find utilty. This strips -# off the $TEMPDIR/check-format path prefix, leaving $j with the -# path to the file relative to the root of the source dir, so that -# output from check-format.pl looks correct, relative to the root -# of the git tree. -for j in $(find $TEMPDIR/check-format -type f -printf "%P\n") +REMAINING_FILES=$(wc -l <$TEMPDIR/ranges.filter) +if [ $REMAINING_FILES -eq 0 ] +then + echo "The given commit range has no C source file changes that require checking" + exit 0 +fi + +# unless checking the format of unstaged changes, +# check out the files from the commit range. +if [ -n "$COMMIT_RANGE" ] +then + # For each file name in ranges, we show that file at the commit range + # we are checking, and redirect it to the same path, + # relative to $TEMPDIR/check-format. + # This give us the full file path to run check-format.pl on + # with line numbers matching the ranges in the $TEMPDIR/ranges.filter file + for j in $(awk '{print $1}' $TEMPDIR/ranges.filter | sort -u) + do + FDIR=$(dirname $j) + mkdir -p $TEMPDIR/check-format/$FDIR + git show $COMMIT_LAST:$j > $TEMPDIR/check-format/$j + done +fi + +# Now for each file in $TEMPDIR/ranges.filter, run check-format.pl +for j in $(awk '{print $1}' $TEMPDIR/ranges.filter | sort -u) do range_start=() range_end=() # Get the ranges for this file. Create 2 arrays. range_start contains # the start lines for valid ranges from the commit. the range_end array - # contains the corresponding end line (note, since diff output gives us + # contains the corresponding end line. Note, since diff output gives us # a line count for a change, the range_end[k] entry is actually # range_start[k]+line count - for k in $(grep $COMMIT $TEMPDIR/ranges.txt | grep $j | awk '{print $3}') + for k in $(grep ^$j $TEMPDIR/ranges.filter | awk '{print $2}') do - RANGE=$k - RSTART=$(echo $RANGE | awk -F',' '{print $1}') - RLEN=$(echo $RANGE | awk -F',' '{print $2}') + RSTART=$(echo $k | awk -F',' '{print $1}') + RLEN=$(echo $k | awk -F',' '{print $2}') + # when the hunk is just one line, its length is implied + if [ -z "$RLEN" ]; then RLEN=1; fi let REND=$RSTART+$RLEN range_start+=($RSTART) range_end+=($REND) done - # Go to our checked out tree - cd $TEMPDIR/check-format + # Go to our checked out tree, unless checking unstaged changes + [ -n "$COMMIT_RANGE" ] && cd $TEMPDIR/check-format # Actually run check-format.pl on the file, capturing the output - # in a temporary file. Note the format of check-patch.pl output is - # ::: - $TOPDIR/util/check-format.pl $j > $TEMPDIR/format-results.txt + # in a temporary file. Note the format of check-format.pl output is + # ::: + $TOPDIR/util/check-format.pl $j > $TEMPDIR/results.txt # Now we filter the check-format.pl output based on the changed lines # captured in the range_start/end arrays @@ -146,26 +156,15 @@ do # Check here if any line in that output falls between any of the # start/end ranges defined in the range_start/range_end array. # If it does fall in that range, print the entire line to stdout - # If anything is printed, have awk exit with a non-zero exit code awk -v rstart=$RSTART -v rend=$REND -F':' ' - BEGIN {rc=0} - /:/ { - if (($2 >= rstart) && ($2 <= rend)) { - print $0; - rc=1 - } - } - END {exit rc;} - ' $TEMPDIR/format-results.txt - - # If awk exited with a non-zero code, this script will also exit - # with a non-zero code - if [ $? -ne 0 ] - then - EXIT_CODE=1 - fi + /:/ { if (rstart <= $2 && $2 <= rend) print $0 } + ' $TEMPDIR/results.txt >>$TEMPDIR/results-filtered.txt done done +cat $TEMPDIR/results-filtered.txt -# Exit with the recorded exit code above -exit $EXIT_CODE +# If any findings were in range, exit with a different error code +if [ -s $TEMPDIR/results-filtered.txt ] +then + exit 2 +fi diff --git a/deps/openssl/openssl/util/check-format.pl b/deps/openssl/openssl/util/check-format.pl index ef2c1920e7220a..559b9023d08c2d 100755 --- a/deps/openssl/openssl/util/check-format.pl +++ b/deps/openssl/openssl/util/check-format.pl @@ -791,7 +791,7 @@ sub check_nested_nonblock_indents { # treat remaining blinded comments and string literal contents as (single) space during matching below $intra_line =~ s/@+/ /g; # note that extra SPC has already been handled above $intra_line =~ s/\s+$//; # strip any (resulting) space at EOL - # replace ';;' or '; ;' by ';' in "for(;;)" and in "for (...)" unless "..." contains just SPC and ';' characters: + # replace ';;' or '; ;' by ';' in "for (;;)" and in "for (...)" unless "..." contains just SPC and ';' characters: $intra_line =~ s/((^|\W)for\s*\()([^;]*?)(\s*)(;\s?);(\s*)([^;]*)(\))/ "$1$3$4".("$3$4$5$6$7" eq ";" || $3 ne "" || $7 ne "" ? "" : $5).";$6$7$8"/eg; # strip trailing ';' or '; ' in "for (...)" except in "for (;;)" or "for (;; )": @@ -904,7 +904,7 @@ sub check_nested_nonblock_indents { # handle opening brace '{' after if/else/while/for/switch/do on line before if ($hanging_offset > 0 && m/^[\s@]*{/ && # leading opening '{' $line_before > 0 && - $contents_before_ =~ m/(^|^.*\W)(if|else|while|for|switch|do)(\W.*$|$)/) { + $contents_before_ =~ m/(^|^.*\W)(if|else|while|for|(OSSL_)?LIST_FOREACH(_\w+)?|switch|do)(\W.*$|$)/) { $keyword_opening_brace = $1; $hanging_offset -= INDENT_LEVEL; # cancel newly hanging_offset } @@ -966,7 +966,7 @@ sub check_nested_nonblock_indents { my $outermost_level = $block_indent - $preproc_offset == 0; - report("more than one stmt") if !m/(^|\W)for(\W.*|$)/ && # no 'for' - TODO improve matching + report("more than one stmt") if !m/(^|\W)(for|(OSSL_)?LIST_FOREACH(_\w+)?)(\W.*|$)/ && # no 'for' - TODO improve matching m/;.*;/; # two or more terminators ';', so more than one statement # check for code block containing a single line/statement @@ -1004,7 +1004,7 @@ sub check_nested_nonblock_indents { my $assignment_start = 0; my $tmp = $_; $tmp =~ s/[\!<>=]=/@@/g; # blind (in-)equality symbols like '<=' as '@@' to prevent matching them as '=' below - if (m/^((^|.*\W)(if|while|for|switch))(\W.*|$)$/) { # (last) if/for/while/switch + if (m/^((^|.*\W)(if|while|for|(OSSL_)?LIST_FOREACH(_\w+)?|switch))(\W.*|$)$/) { # (last) if/for/while/switch $paren_expr_start = 1; } elsif (m/^((^|.*\W)(return|enum))(\W.*|$)/ # (last) return/enum && !$in_expr && @nested_indents == 0 && parens_balance($1) == 0) { # not nested enum @@ -1135,7 +1135,7 @@ sub check_nested_nonblock_indents { $line_body_start = $contents =~ m/LONG BODY/ ? 0 : $line if $line_function_start != 0; } } else { - $line_opening_brace = $line if $keyword_opening_brace =~ m/if|do|while|for/; + $line_opening_brace = $line if $keyword_opening_brace =~ m/if|do|while|for|(OSSL_)?LIST_FOREACH(_\w+)?/; # using, not assigning, $keyword_opening_brace here because it could be on an earlier line $line_opening_brace = $line if $keyword_opening_brace eq "else" && $extended_1_stmt && # TODO prevent false positives for if/else where braces around single-statement branches @@ -1148,11 +1148,11 @@ sub check_nested_nonblock_indents { } } - # check for opening brace after if/while/for/switch/do not on same line + # check for opening brace after if/while/for/switch/do missing on same line # note that "missing '{' on same line after '} else'" is handled further below if (/^[\s@]*{/ && # leading '{' $line_before > 0 && !($contents_before_ =~ m/^\s*#/) && # not preprocessor directive '#if - (my ($head, $mid, $tail) = ($contents_before_ =~ m/(^|^.*\W)(if|while|for|switch|do)(\W.*$|$)/))) { + (my ($head, $mid, $tail) = ($contents_before_ =~ m/(^|^.*\W)(if|while|for|(OSSL_)?LIST_FOREACH(_\w+)?|switch|do)(\W.*$|$)/))) { my $brace_after = $tail =~ /^[\s@]*{/; # any whitespace or comments then '{' report("'{' not on same line as preceding '$mid'") if !$brace_after; } diff --git a/deps/openssl/openssl/util/libssl.num b/deps/openssl/openssl/util/libssl.num index 4a9d5b20074af5..f055c967bf1c85 100644 --- a/deps/openssl/openssl/util/libssl.num +++ b/deps/openssl/openssl/util/libssl.num @@ -520,19 +520,3 @@ SSL_load_client_CA_file_ex 520 3_0_0 EXIST::FUNCTION: SSL_set0_tmp_dh_pkey 521 3_0_0 EXIST::FUNCTION: SSL_CTX_set0_tmp_dh_pkey 522 3_0_0 EXIST::FUNCTION: SSL_group_to_name 523 3_0_0 EXIST::FUNCTION: -SSL_quic_read_level 20000 3_0_0 EXIST::FUNCTION:QUIC -SSL_set_quic_transport_params 20001 3_0_0 EXIST::FUNCTION:QUIC -SSL_CIPHER_get_prf_nid 20002 3_0_0 EXIST::FUNCTION:QUIC -SSL_is_quic 20003 3_0_0 EXIST::FUNCTION:QUIC -SSL_get_peer_quic_transport_params 20004 3_0_0 EXIST::FUNCTION:QUIC -SSL_quic_write_level 20005 3_0_0 EXIST::FUNCTION:QUIC -SSL_CTX_set_quic_method 20006 3_0_0 EXIST::FUNCTION:QUIC -SSL_set_quic_method 20007 3_0_0 EXIST::FUNCTION:QUIC -SSL_quic_max_handshake_flight_len 20008 3_0_0 EXIST::FUNCTION:QUIC -SSL_process_quic_post_handshake 20009 3_0_0 EXIST::FUNCTION:QUIC -SSL_provide_quic_data 20010 3_0_0 EXIST::FUNCTION:QUIC -SSL_set_quic_use_legacy_codepoint 20011 3_0_0 EXIST::FUNCTION:QUIC -SSL_set_quic_transport_version 20012 3_0_0 EXIST::FUNCTION:QUIC -SSL_get_peer_quic_transport_version 20013 3_0_0 EXIST::FUNCTION:QUIC -SSL_get_quic_transport_version 20014 3_0_0 EXIST::FUNCTION:QUIC -SSL_set_quic_early_data_enabled 20015 3_0_0 EXIST::FUNCTION:QUIC diff --git a/deps/openssl/openssl/util/mkbuildinf.pl b/deps/openssl/openssl/util/mkbuildinf.pl index 1c273872be11c0..799ed3cdcd0972 100755 --- a/deps/openssl/openssl/util/mkbuildinf.pl +++ b/deps/openssl/openssl/util/mkbuildinf.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the Apache License 2.0 (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -9,17 +9,21 @@ use strict; use warnings; -my ($cflags, $platform) = @ARGV; +my $platform = pop @ARGV; +my $cflags = join(' ', @ARGV); +$cflags =~ s(\\)(\\\\)g; $cflags = "compiler: $cflags"; -my $date = gmtime($ENV{'SOURCE_DATE_EPOCH'} || time()) . " UTC"; +# Use the value of the envvar SOURCE_DATE_EPOCH, even if it's +# zero or the empty string. +my $date = gmtime($ENV{'SOURCE_DATE_EPOCH'} // time()) . " UTC"; print <<"END_OUTPUT"; /* * WARNING: do not edit! * Generated by util/mkbuildinf.pl * - * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/openssl/util/other.syms b/deps/openssl/openssl/util/other.syms index 839d0d2c08c763..ea0a8caac4359c 100644 --- a/deps/openssl/openssl/util/other.syms +++ b/deps/openssl/openssl/util/other.syms @@ -143,8 +143,6 @@ custom_ext_free_cb datatype custom_ext_parse_cb datatype pem_password_cb datatype ssl_ct_validation_cb datatype -OSSL_ENCRYPTION_LEVEL datatype -SSL_QUIC_METHOD datatype # ASN1_BIT_STRING_digest define BIO_append_filename define diff --git a/deps/openssl/openssl/util/perl/OpenSSL/Template.pm b/deps/openssl/openssl/util/perl/OpenSSL/Template.pm index 7411dd8ae8d7a7..ad93278ca7613f 100644 --- a/deps/openssl/openssl/util/perl/OpenSSL/Template.pm +++ b/deps/openssl/openssl/util/perl/OpenSSL/Template.pm @@ -42,6 +42,14 @@ use Text::Template 1.46; our @ISA = qw(Text::Template); # parent +sub tmpl_error { + my (%err_dict) = @_; + + $ERROR = $err_dict{"error"}; + + return undef; +} + sub new { my $class = shift; @@ -66,6 +74,7 @@ sub fill_in { output_on => sub { $self->output_on() }, output_off => sub { $self->output_off() }, %hash }, + BROKEN => \&tmpl_error, %opts); } diff --git a/tools/dep_updaters/update-openssl.sh b/tools/dep_updaters/update-openssl.sh index 1cb1d04b5f4ecf..06fbf266706d99 100755 --- a/tools/dep_updaters/update-openssl.sh +++ b/tools/dep_updaters/update-openssl.sh @@ -11,10 +11,10 @@ cleanup() { download() { LATEST_TAG_NAME="$("$NODE" --input-type=module <<'EOF' -const res = await fetch('https://api.github.com/repos/quictls/openssl/git/matching-refs/tags/openssl-3.0'); +const res = await fetch('https://api.github.com/repos/openssl/openssl/git/matching-refs/tags/openssl-3.0'); if (!res.ok) throw new Error(`FetchError: ${res.status} ${res.statusText}`, { cause: res }); const releases = await res.json() -const latest = releases.findLast(({ ref }) => ref.includes('quic')); +const latest = releases.at(-1); if(!latest) throw new Error(`Could not find latest release`); console.log(latest.ref.replace('refs/tags/','')); EOF @@ -39,14 +39,14 @@ EOF OPENSSL_TARBALL="openssl.tar.gz" - curl -sL -o "$OPENSSL_TARBALL" "https://api.github.com/repos/quictls/openssl/tarball/$LATEST_TAG_NAME" + curl -sL -o "$OPENSSL_TARBALL" "https://api.github.com/repos/openssl/openssl/tarball/$LATEST_TAG_NAME" log_and_verify_sha256sum "openssl" "$OPENSSL_TARBALL" gzip -dc "$OPENSSL_TARBALL" | tar xf - rm "$OPENSSL_TARBALL" - mv quictls-openssl-* openssl + mv openssl-openssl-* openssl echo "Replacing existing OpenSSL..." rm -rf "$DEPS_DIR/openssl/openssl" mv "$WORKSPACE/openssl" "$DEPS_DIR/openssl/" @@ -56,7 +56,7 @@ EOF echo "Please git add openssl, and commit the new version:" echo "" echo "$ git add -A deps/openssl/openssl" - echo "$ git commit -m \"deps: upgrade openssl sources to quictls/openssl-$NEW_VERSION\"" + echo "$ git commit -m \"deps: upgrade openssl sources to openssl/openssl-$NEW_VERSION\"" echo "" # The last line of the script should always print the new version, # as we need to add it to $GITHUB_ENV variable.