Merged PR 12004683: Fix ML-DSA kernel mode tests

## Description:

Fixes ML-DSA kernel mode tests by removing places where the test driver tries to dereference key objects which may be in kernel address space.

Also removed deprecated "kernel" option from `symcryptunittest.exe`, which doesn't do anything anymore and hasn't for some time.

Author: mlindgren

unittest/inc/algorithm_base.h

@@ -865,6 +865,12 @@ class DsaImplementation: public AlgorithmImplementation
 #define SYMCRYPT_TEST_MLDSA_MAX_KEY_SIZE (4896) // Maximum size of an encoded ML-DSA private + public key - see SymCryptMlDsaInternalParams87
 #define SYMCRYPT_TEST_MLDSA_MAX_SIG_SIZE SYMCRYPT_MLDSA_SIGNATURE_SIZE_MLDSA87
 
+typedef struct _SYMCRYPT_PERF_MLDSAKEY {
+    SIZE_T                      keySize;
+    SYMCRYPT_MLDSA_PARAMS       params;
+    PSYMCRYPT_MLDSAKEY          pkMlDsakey;
+} SYMCRYPT_PERF_MLDSAKEY, *PSYMCRYPT_PERF_MLDSAKEY;
+
 typedef struct _MLDSAKEY_TESTBLOB {
     SYMCRYPT_MLDSA_PARAMS    params;
     SYMCRYPT_MLDSAKEY_FORMAT format;

unittest/inc/sc_implementations_pattern.h

@@ -513,9 +513,11 @@ template<>
 class PqDsaImpState<ImpXxx, AlgMlDsa> {
 public:
     PSYMCRYPT_MLDSAKEY  pKey;
+    SYMCRYPT_MLDSA_PARAMS params;
 
     PqDsaImpState() :
-        pKey(nullptr)
+        pKey(nullptr),
+        params(SYMCRYPT_MLDSA_PARAMS_NULL)
     { }
 
     ~PqDsaImpState()

unittest/lib/main.cpp

@@ -57,7 +57,6 @@ SIZE_T  g_modeCfbShiftParam = 1;
 Rng g_rng;
 
 BOOL g_modifiedCpuFeatures = FALSE;
-BOOL g_runKernelmodeTest = FALSE;
 BOOL g_failRegisterSave = FALSE;
 BOOL g_runRsaAverageKeyPerf = FALSE;
 
@@ -465,7 +464,6 @@ usage()
             "                           output of test command with a specific string. This can enable\n"
             "                           easier concatenation of many test runs on differing platforms into\n"
             "                           a single .csv for postprocessing.\n"
-            "  kernel            Run the kernel-mode tests \n"
             "  verbose           Print detailed information for some algorithms\n"
             "  noperftests       Skip running the performance tests - only run functional tests\n"
             "  profile:xxx [key=yyy]    Run one or more algorithms in a tight loop, xxx times for\n"
@@ -734,12 +732,6 @@ processSingleOption( _In_ PSTR option )
             optionHandled = TRUE;
         }
 
-        if( STRICMP( &option[0], "kernel" ) == 0 )
-        {
-            g_runKernelmodeTest = TRUE;
-            optionHandled = TRUE;
-        }
-
         if( STRICMP( &option[0], "rsakgp" ) == 0 )
         {
             g_runRsaAverageKeyPerf = TRUE;
@@ -1380,7 +1372,7 @@ runFunctionalTests()
 VOID
 runPerfTests()
 {
-    if( g_runKernelmodeTest || g_noPerfTests )
+    if( g_noPerfTests )
     {
         return;
     }

unittest/lib/sc_imp_pattern.cpp

@@ -10487,11 +10487,7 @@ ArithImp<ImpXxx, AlgMlKemkeySetValue>::~ArithImp()
 ////////////////////////////////////////////////////////////////////////////
 
 // Table with the ML-DSA keys' sizes and pointers to keys
-struct {
-    SIZE_T                      keySize;
-    SYMCRYPT_MLDSA_PARAMS       params;
-    PSYMCRYPT_MLDSAKEY          pkMlDsakey;
-} CONCAT2(g_precomputedMlDsaKeys, ImpXxx)[] = {
+SYMCRYPT_PERF_MLDSAKEY CONCAT2(g_precomputedMlDsaKeys, ImpXxx)[] = {
     { PERF_KEY_MLDSA_44,    SYMCRYPT_MLDSA_PARAMS_MLDSA44,  NULL },
     { PERF_KEY_MLDSA_65,    SYMCRYPT_MLDSA_PARAMS_MLDSA65,  NULL },
     { PERF_KEY_MLDSA_87,    SYMCRYPT_MLDSA_PARAMS_MLDSA87,  NULL },
@@ -10526,7 +10522,7 @@ SetupSymCryptMlDsaKey<ImpXxx>( PBYTE pbKey, SIZE_T keySize )
 
     CHECK( bFound, "Invalid ML-DSA parameter set (key size)" );
 
-    *((PSYMCRYPT_MLDSAKEY *) pbKey) = CONCAT2(g_precomputedMlDsaKeys, ImpXxx)[i].pkMlDsakey;
+    *((PSYMCRYPT_PERF_MLDSAKEY *) pbKey) = &(CONCAT2(g_precomputedMlDsaKeys, ImpXxx)[i]);
 }
 
 template<>
@@ -10538,7 +10534,7 @@ algImpKeyPerfFunction<ImpXxx, AlgMlDsa>( PBYTE pbKey, PBYTE buf2, PBYTE buf3, SI
 
     SYMCRYPT_ERROR scError = SYMCRYPT_NO_ERROR;
     SYMCRYPT_MLDSA_PARAMS params = SYMCRYPT_MLDSA_PARAMS_NULL;
-    PSYMCRYPT_MLDSAKEY* ppkMlDsakey = (PSYMCRYPT_MLDSAKEY *) pbKey;
+    PSYMCRYPT_PERF_MLDSAKEY* ppKeyInfo = (PSYMCRYPT_PERF_MLDSAKEY *) pbKey;
 
     switch( keySize )
     {
@@ -10558,7 +10554,7 @@ algImpKeyPerfFunction<ImpXxx, AlgMlDsa>( PBYTE pbKey, PBYTE buf2, PBYTE buf3, SI
 
     SetupSymCryptMlDsaKey<ImpXxx>( pbKey, keySize );
 
-    scError = ScShimSymCryptMlDsakeyGenerate( *ppkMlDsakey, 0 );
+    scError = ScShimSymCryptMlDsakeyGenerate( (*ppKeyInfo)->pkMlDsakey, 0 );
     CHECK( scError == SYMCRYPT_NO_ERROR, "SymCryptMlDsakeyGenerate" );
 }
 
@@ -10567,17 +10563,17 @@ VOID
 algImpDataPerfFunction<ImpXxx, AlgMlDsa>( PBYTE pbKey, PBYTE pbMessage, PBYTE pbSignature, SIZE_T cbData )
 {
     SYMCRYPT_ERROR scError = SYMCRYPT_NO_ERROR;
-    PCSYMCRYPT_MLDSAKEY* ppkMlDsakey = (PCSYMCRYPT_MLDSAKEY*) pbKey;
+    PSYMCRYPT_PERF_MLDSAKEY* ppKeyInfo = (PSYMCRYPT_PERF_MLDSAKEY *) pbKey;
     SIZE_T cbSignature = 0;
 
     scError = ScShimSymCryptMlDsaSizeofSignatureFromParams( 
-        (SYMCRYPT_MLDSA_PARAMS) (*ppkMlDsakey)->pParams->params,
+        (*ppKeyInfo)->params,
         &cbSignature );
     CHECK( scError == SYMCRYPT_NO_ERROR, "SymCryptMlDsaSizeofSignatureFromParams" );
     CHECK( cbSignature <= PERF_BUFFER_SIZE, "Signature buffer too small" );
 
     scError = ScShimSymCryptMlDsaSign(
-        *ppkMlDsakey,
+        (*ppKeyInfo)->pkMlDsakey,
         pbMessage, cbData,
         nullptr, 0, // context
         0, // flags
@@ -10590,17 +10586,17 @@ VOID
 algImpDecryptPerfFunction<ImpXxx, AlgMlDsa>( PBYTE pbKey, PBYTE pbMessage, PBYTE pbSignature, SIZE_T cbData )
 {
     SYMCRYPT_ERROR scError = SYMCRYPT_NO_ERROR;
-    PCSYMCRYPT_MLDSAKEY* ppkMlDsakey = (PCSYMCRYPT_MLDSAKEY*) pbKey;
+    PSYMCRYPT_PERF_MLDSAKEY* ppKeyInfo = (PSYMCRYPT_PERF_MLDSAKEY *) pbKey;
     SIZE_T cbSignature = 0;
 
     scError = ScShimSymCryptMlDsaSizeofSignatureFromParams( 
-        (SYMCRYPT_MLDSA_PARAMS) (*ppkMlDsakey)->pParams->params,
+        (*ppKeyInfo)->params,
         &cbSignature );
     CHECK( scError == SYMCRYPT_NO_ERROR, "SymCryptMlDsaSizeofSignatureFromParams" );
     CHECK( cbSignature <= PERF_BUFFER_SIZE, "Signature buffer too small" );
 
     scError = ScShimSymCryptMlDsaVerify(
-        *ppkMlDsakey,
+        (*ppKeyInfo)->pkMlDsakey,
         pbMessage, cbData,
         nullptr, 0, // context
         pbSignature, cbSignature,
@@ -10641,6 +10637,8 @@ PqDsaImp<ImpXxx, AlgMlDsa>::setKey(
     state.pKey = ScShimSymCryptMlDsakeyAllocate( testMldsakey->params );
     CHECK( state.pKey != nullptr, "SymCryptMlDsakeyAllocate" );
 
+    state.params = testMldsakey->params;
+
     scError = ScShimSymCryptMlDsakeySetValue(
         testMldsakey->abKeyBlob,
         testMldsakey->cbKeyBlob,
@@ -10663,7 +10661,7 @@ PqDsaImp<ImpXxx, AlgMlDsa>::getBlobFromKey(
     SIZE_T cbExpected = 0;
 
     scError = ScShimSymCryptMlDsaSizeofKeyFormatFromParams(
-            (SYMCRYPT_MLDSA_PARAMS) state.pKey->pParams->params,
+            state.params,
             (SYMCRYPT_MLDSAKEY_FORMAT) keyFormat,
             &cbExpected );
     CHECK( scError == SYMCRYPT_NO_ERROR, "SymCryptMlDsaSizeofKeyFormatFromParams" );