Merge pull request #9965 from kojo1/mldsa

Add ML-DSA to X509_get_pubkey and EVP_PKEY_base_id

wolfcrypt/src/evp.c

@@ -10057,6 +10057,10 @@ int wolfSSL_EVP_PKEY_type(int type)
             return WC_EVP_PKEY_EC;
         case WC_EVP_PKEY_DH:
             return WC_EVP_PKEY_DH;
+    #ifdef HAVE_DILITHIUM
+        case WC_EVP_PKEY_DILITHIUM:
+            return WC_EVP_PKEY_DILITHIUM;
+    #endif
         default:
             return WC_NID_undef;
     }

wolfcrypt/src/evp_pk.c

@@ -708,7 +708,7 @@ static int d2iTryAltDhKey(WOLFSSL_EVP_PKEY** out, const unsigned char* mem,
     /* Create DH key object from data. */
     dhObj = wolfSSL_DH_new();
     if (dhObj == NULL) {
-        ret = 0;
+        ret = WOLFSSL_FATAL_ERROR;
     }
 
     if (ret == 1) {