en Copyright 2015 Java http://kernelsources.org:8080/source/history/freebsd/crypto/openssl/test/cms-msg/missing-kdf.der#1523ccfd9c8c254f7928143d31c305384b05fd11 MFV: openssl 3.5.7This change is a security release which resolves several issues with OpenSSL 3.5,the highest severity issue being ranked "High". Users are strongly encouraged toupdate to this release.More information about the release (from a high level) can be found inthe release notes [1].1. https://github.com/openssl/openssl/blob/openssl-3.5.7/NEWS.mdAll conflicts were resolved with `--theirs`, taking the release diffover the local diff; the conflicts occurred due to preemptive securityfixes applied by so@ in e508c343.MFC after: 3 days (the important security issues have beenpreemptively addressed)Merge commit '3a71a35ad9dad0e5d2cad8efecc8ba9d57c42d43'Conflicts: crypto/openssl/include/internal/quic_channel.h crypto/openssl/ssl/quic/quic_channel_local.h crypto/openssl/ssl/quic/quic_rx_depack.c crypto/openssl/test/cmsapitest.c crypto/openssl/test/evp_extra_test.c List of files: /freebsd/crypto/openssl/test/cms-msg/missing-kdf.der Wed, 10 Jun 2026 17:25:28 +0200 Enji Cooper <ngie@FreeBSD.org>