Fixed compilation when ML-DSA is not supported

Antoine Lochet · Antoine Lochet · commit 5fac46281d65 · 2025-08-19T15:46:08.000+02:00
diff --git a/src/lib/SoftHSM.cpp b/src/lib/SoftHSM.cpp
@@ -6299,6 +6299,7 @@ CK_RV SoftHSM::C_GenerateKeyPair
 									 ispublicKeyToken, ispublicKeyPrivate, isprivateKeyToken, isprivateKeyPrivate);
 	}
 
+#ifdef WITH_ML_DSA
 	if (pMechanism->mechanism == CKM_ML_DSA_KEY_PAIR_GEN)
 	{
 			return this->generateMLDSA(hSession,
@@ -6307,7 +6308,7 @@ CK_RV SoftHSM::C_GenerateKeyPair
 									 phPublicKey, phPrivateKey,
 									 ispublicKeyToken, ispublicKeyPrivate, isprivateKeyToken, isprivateKeyPrivate);
 	}
-
+#endif
 	return CKR_GENERAL_ERROR;
 }
 
@@ -10017,6 +10018,7 @@ CK_RV SoftHSM::generateED
 	return rv;
 }
 
+#ifdef WITH_ML_DSA
 // Generate an MLDSA key pair
 CK_RV SoftHSM::generateMLDSA
 (CK_SESSION_HANDLE hSession,
@@ -10275,6 +10277,7 @@ CK_RV SoftHSM::generateMLDSA
 
 	return rv;
 }
+#endif
 
 // Generate a DH key pair
 CK_RV SoftHSM::generateDH

Original file line number	Diff line number	Diff line change
`@@ -6299,6 +6299,7 @@ CK_RV SoftHSM::C_GenerateKeyPair`
`6299`	`6299`	`ispublicKeyToken, ispublicKeyPrivate, isprivateKeyToken, isprivateKeyPrivate);`
`6300`	`6300`	`}`
`6301`	`6301`
	`6302`	`+#ifdef WITH_ML_DSA`
`6302`	`6303`	`if (pMechanism->mechanism == CKM_ML_DSA_KEY_PAIR_GEN)`
`6303`	`6304`	`{`
`6304`	`6305`	`return this->generateMLDSA(hSession,`
`@@ -6307,7 +6308,7 @@ CK_RV SoftHSM::C_GenerateKeyPair`
`6307`	`6308`	`phPublicKey, phPrivateKey,`
`6308`	`6309`	`ispublicKeyToken, ispublicKeyPrivate, isprivateKeyToken, isprivateKeyPrivate);`
`6309`	`6310`	`}`
`6310`		`-`
	`6311`	`+#endif`
`6311`	`6312`	`return CKR_GENERAL_ERROR;`
`6312`	`6313`	`}`
`6313`	`6314`
`@@ -10017,6 +10018,7 @@ CK_RV SoftHSM::generateED`
`10017`	`10018`	`return rv;`
`10018`	`10019`	`}`
`10019`	`10020`
	`10021`	`+#ifdef WITH_ML_DSA`
`10020`	`10022`	`// Generate an MLDSA key pair`
`10021`	`10023`	`CK_RV SoftHSM::generateMLDSA`
`10022`	`10024`	`(CK_SESSION_HANDLE hSession,`
`@@ -10275,6 +10277,7 @@ CK_RV SoftHSM::generateMLDSA`
`10275`	`10277`
`10276`	`10278`	`return rv;`
`10277`	`10279`	`}`
	`10280`	`+#endif`
`10278`	`10281`
`10279`	`10282`	`// Generate a DH key pair`
`10280`	`10283`	`CK_RV SoftHSM::generateDH`