I forgot to add this in the commit: MFC after: 1 week
I added a reminder to my calendar to take care of this manually.
Cheers,
-Enji
> On Oct 3, 2025, at 9:01 PM, Enji Cooper <[email protected]> wrote:
>
> The branch main has been updated by ngie:
>
> URL:
> https://cgit.FreeBSD.org/src/commit/?id=046c625e9382e17da953767b881aaa782fa73af8
>
> commit 046c625e9382e17da953767b881aaa782fa73af8
> Merge: 4a5a884c4a77 8e12a5c4eb35
> Author: Enji Cooper <[email protected]>
> AuthorDate: 2025-10-04 03:26:18 +0000
> Commit: Enji Cooper <[email protected]>
> CommitDate: 2025-10-04 03:26:18 +0000
>
> crypto/openssl: update to 3.5.4
>
> This change includes all necessary changes required to update to OpenSSL
> 3.5.4.
>
> More information about the 3.5.4 release can be found in the relevant
> release notes (see 8e12a5c4eb3507846b5 for more details).
>
> Merge commit '8e12a5c4eb3507846b507d0afe87d115af41df40'
>
> crypto/openssl/CHANGES.md | 69 ++++++
> crypto/openssl/NEWS.md | 40 +++-
> crypto/openssl/VERSION.dat | 4 +-
> crypto/openssl/apps/storeutl.c | 16 +-
> crypto/openssl/crypto/bio/bss_file.c | 2 +-
> crypto/openssl/crypto/ec/ecp_sm2p256.c | 2 +-
> crypto/openssl/crypto/evp/bio_ok.c | 27 ++-
> crypto/openssl/crypto/evp/ctrl_params_translate.c | 2 +-
> crypto/openssl/crypto/evp/p_lib.c | 17 +-
> crypto/openssl/crypto/info.c | 14 +-
> crypto/openssl/crypto/ml_dsa/ml_dsa_key.c | 4 +-
> crypto/openssl/crypto/ml_kem/ml_kem.c | 2 +-
> crypto/openssl/crypto/modes/siv128.c | 3 +
> crypto/openssl/crypto/property/property_parse.c | 2 +-
> crypto/openssl/crypto/rsa/rsa_gen.c | 15 --
> crypto/openssl/crypto/rsa/rsa_sign.c | 4 +-
> crypto/openssl/crypto/threads_pthread.c | 12 +-
> crypto/openssl/crypto/x509/t_x509.c | 3 +-
> crypto/openssl/crypto/x509/x509_lu.c | 1 -
> crypto/openssl/doc/man3/DEFINE_STACK_OF.pod | 19 +-
> crypto/openssl/doc/man3/OpenSSL_version.pod | 9 +-
> crypto/openssl/doc/man3/SSL_CIPHER_get_name.pod | 4 +-
> .../openssl/doc/man3/SSL_SESSION_get0_hostname.pod | 10 +-
> crypto/openssl/include/crypto/rsa.h | 4 -
> crypto/openssl/include/openssl/opensslv.h.in | 4 +-
> crypto/openssl/providers/fips-sources.checksums | 20 +-
> crypto/openssl/providers/fips.checksum | 2 +-
> crypto/openssl/providers/fips/self_test_data.inc | 42 ++++
> crypto/openssl/providers/fips/self_test_kats.c | 100 ++++++++
> .../providers/implementations/kdfs/krb5kdf.c | 7 +-
> .../providers/implementations/keymgmt/ecx_kmgmt.c | 8 -
> crypto/openssl/ssl/quic/quic_impl.c | 7 +-
> crypto/openssl/ssl/record/methods/tls_common.c | 11 +-
> crypto/openssl/ssl/ssl_rsa.c | 5 +-
> crypto/openssl/ssl/t1_trce.c | 4 +
> crypto/openssl/test/build.info | 3 +-
> crypto/openssl/test/fake_rsaprov.c | 4 +-
> crypto/openssl/test/fake_rsaprov.h | 11 +-
> crypto/openssl/test/ml_kem_evp_extra_test.c | 10 +
> crypto/openssl/test/property_test.c | 19 +-
> crypto/openssl/test/provider_pkey_test.c | 72 ++++++
> crypto/openssl/test/quicapitest.c | 95 +-------
> crypto/openssl/test/radix/terp.c | 6 +-
> crypto/openssl/test/recipes/03-test_fipsinstall.t | 12 +-
> crypto/openssl/test/recipes/25-test_verify.t | 5 +-
> .../test/recipes/30-test_evp_data/evpkdf_krb5.txt | 10 +-
> .../30-test_evp_data/evppkey_rsa_sigalg.txt | 4 +-
> crypto/openssl/test/recipes/90-test_sslapi.t | 17 +-
> .../90-test_sslapi_data/ssltraceref-zlib.txt | 255 +++++++++++++++++++++
> .../recipes/90-test_sslapi_data/ssltraceref.txt | 253 ++++++++++++++++++++
> crypto/openssl/test/sslapitest.c | 87 +++++++
> crypto/openssl/test/testutil.h | 2 +
> crypto/openssl/test/testutil/compare.c | 88 +++++++
> crypto/openssl/test/threadstest.c | 11 +-
> crypto/openssl/test/wpackettest.c | 2 +-
> 55 files changed, 1241 insertions(+), 220 deletions(-)
>
> diff --cc crypto/openssl/test/recipes/90-test_sslapi_data/ssltraceref-zlib.txt
> index 000000000000,05aed8299b0e..05aed8299b0e
> mode 000000,100644..100644
> --- a/crypto/openssl/test/recipes/90-test_sslapi_data/ssltraceref-zlib.txt
> +++ b/crypto/openssl/test/recipes/90-test_sslapi_data/ssltraceref-zlib.txt
> diff --cc crypto/openssl/test/recipes/90-test_sslapi_data/ssltraceref.txt
> index 000000000000,5d332da235fb..5d332da235fb
> mode 000000,100644..100644
> --- a/crypto/openssl/test/recipes/90-test_sslapi_data/ssltraceref.txt
> +++ b/crypto/openssl/test/recipes/90-test_sslapi_data/ssltraceref.txt
> diff --cc crypto/openssl/test/testutil/compare.c
> index 000000000000,067fb878b58e..067fb878b58e
> mode 000000,100644..100644
> --- a/crypto/openssl/test/testutil/compare.c
> +++ b/crypto/openssl/test/testutil/compare.c
signature.asc
Description: Message signed with OpenPGP
