PKCS#7: add ML-DSA support

certs/mldsa/README.txt

@@ -9,6 +9,24 @@ File variants, per level N in {44, 65, 87}:
   mldsa<N>_oqskeypair.der   liboqs concatenated (priv || pub) format
   mldsa<N>_pub-spki.der     SubjectPublicKeyInfo wrapping the public key
 
+Self-signed certificates and their matching keys (used by the PKCS#7/CMS
+SignedData tests), per level N in {44, 65, 87}:
+  mldsa<N>-cert.pem / mldsa<N>-cert.der   self-signed ML-DSA certificate
+  mldsa<N>-key.pem                        matching private key (PEM,
+                                          seed-and-expanded PKCS#8)
+  mldsa<N>-key.der                        matching private key (DER,
+                                          expanded-only PKCS#8)
+
+The mldsa<N>-key.der files were derived from the matching mldsa<N>-key.pem
+using OpenSSL 3.5+, selecting the portable expanded-only private-key shape:
+
+  openssl pkey -in mldsa<N>-key.pem \
+      -provparam ml-dsa.output_formats=priv -outform DER \
+      -out mldsa<N>-key.der
+
+Unlike the standalone mldsa<N>_priv-only.der vectors above, these correspond
+to the public key in mldsa<N>-cert.der.
+
 The *_pub-spki.der files were derived from the matching *_priv-only.der files
 using OpenSSL 3.5+:
 

certs/mldsa/include.am

@@ -26,12 +26,15 @@ EXTRA_DIST += \
 		 certs/mldsa/mldsa87_bare-seed.der \
 		 certs/mldsa/mldsa87_bare-priv.der \
 		 certs/mldsa/mldsa44-key.pem \
+		 certs/mldsa/mldsa44-key.der \
 		 certs/mldsa/mldsa44-cert.pem \
 		 certs/mldsa/mldsa44-cert.der \
 		 certs/mldsa/mldsa65-key.pem \
+		 certs/mldsa/mldsa65-key.der \
 		 certs/mldsa/mldsa65-cert.pem \
 		 certs/mldsa/mldsa65-cert.der \
 		 certs/mldsa/mldsa87-key.pem \
+		 certs/mldsa/mldsa87-key.der \
 		 certs/mldsa/mldsa87-cert.pem \
 		 certs/mldsa/mldsa87-cert.der \
 		 certs/mldsa/bench_mldsa_44_key.der \

wolfcrypt/src/hash.c

@@ -353,6 +353,20 @@ enum wc_HashType wc_OidGetHash(int oid)
             hash_type = WC_ERR_TRACE(WC_HASH_TYPE_NONE);
         #endif
             break;
+        case SHAKE128h:
+        #if defined(WOLFSSL_SHA3) && defined(WOLFSSL_SHAKE128)
+            hash_type = WC_HASH_TYPE_SHAKE128;
+        #else
+            hash_type = WC_ERR_TRACE(WC_HASH_TYPE_NONE);
+        #endif
+            break;
+        case SHAKE256h:
+        #if defined(WOLFSSL_SHA3) && defined(WOLFSSL_SHAKE256)
+            hash_type = WC_HASH_TYPE_SHAKE256;
+        #else
+            hash_type = WC_ERR_TRACE(WC_HASH_TYPE_NONE);
+        #endif
+            break;
         case SM3h:
         #ifdef WOLFSSL_SM3
             hash_type = WC_HASH_TYPE_SM3;