Merge c5f2f9b57a into b8c46cba5f

These are not present in FIPS providers <3.6.0.

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Nicola Tuveri <nic.tuv@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/28133)

doc/man3/SSL_CONF_cmd.pod

@@ -176,7 +176,27 @@ respectively:
     $ openssl list -tls1_2 -tls-groups
     $ openssl list -tls1_3 -tls-groups
 
-The recommended groups (in order of decreasing performance) for TLS 1.3 are presently:
+The recommended groups for TLS 1.3 are presently in a decreasing
+performance/risk-mitigation mix:
+
+B<X25519MLKEM768>,
+B<SecP256r1MLKEM768>,
+B<ML-KEM-512>,
+B<ML-KEM-768>,
+B<x25519>,
+B<ML-KEM-1024>,
+B<X448MLKEM1024>,
+B<secp256r1>,
+B<x448>, 
+B<SecP384r1MLKEM1024>,
+and 
+B<secp384r1>.
+
+This recommendation takes into consideration also the risk posed by future
+quantum computers by harnessing PQC algorithms available since OpenSSL 3.5.
+
+For users not concerned about these risks, the following list documents
+classic group algorithms in the order of decreasing performance:
 
 B<x25519>,
 B<secp256r1>,

test/recipes/80-test_cms.t

@@ -43,6 +43,7 @@ my @config = ( );
 my $provname = 'default';
 my $dsaallow = '1';
 my $no_pqc = 0;
+my $no_hkdf_fixed = 0;
 
 my $datadir = srctop_dir("test", "recipes", "80-test_cms_data");
 my $smdir    = srctop_dir("test", "smime-certs");
@@ -68,6 +69,8 @@ unless ($no_fips) {
     $old_fips = 1 if $dsaallow != '0';
     run(test(["fips_version_test", "-config", $provconf, "<3.5.0"]),
         capture => 1, statusvar => \$no_pqc);
+    run(test(["fips_version_test", "-config", $provconf, "<3.6.0"]),
+        capture => 1, statusvar => \$no_hkdf_fixed);
 }
 
 $ENV{OPENSSL_TEST_LIBCTX} = "1";
@@ -1534,7 +1537,7 @@ subtest "ML-KEM KEMRecipientInfo tests for CMS" => sub {
 
     SKIP: {
         skip "ML-KEM is not supported in this build", 5
-            if disabled("ml-kem") || $no_pqc;
+            if disabled("ml-kem") || $no_hkdf_fixed;
 
         ok(run(app(["openssl", "cms", @prov, "-encrypt", "-in", $smcont,
                     "-out", "mlkem512.cms",