Fixed compilation when ML-DSA is not supported

mldsaAlgNameFromParameterSet is a constant

Co-authored-by: kalvdans <github@kalvdans.no-ip.org>

Author: 2 people

src/lib/SoftHSM.cpp

@@ -6352,6 +6352,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,
@@ -6360,7 +6361,7 @@ CK_RV SoftHSM::C_GenerateKeyPair
 									 phPublicKey, phPrivateKey,
 									 ispublicKeyToken, ispublicKeyPrivate, isprivateKeyToken, isprivateKeyPrivate);
 	}
-
+#endif
 	return CKR_GENERAL_ERROR;
 }
 
@@ -10070,6 +10071,7 @@ CK_RV SoftHSM::generateED
 	return rv;
 }
 
+#ifdef WITH_ML_DSA
 // Generate an MLDSA key pair
 CK_RV SoftHSM::generateMLDSA
 (CK_SESSION_HANDLE hSession,
@@ -10328,6 +10330,7 @@ CK_RV SoftHSM::generateMLDSA
 
 	return rv;
 }
+#endif
 
 // Generate a DH key pair
 CK_RV SoftHSM::generateDH

src/lib/crypto/OSSLUtil.cpp

@@ -41,7 +41,7 @@
 #include <openssl/err.h>
 
 #ifdef WITH_ML_DSA
-static std::map<unsigned long, const char*> mldsaAlgNameFromParameterSet {
+static const std::map<unsigned long, const char*> mldsaAlgNameFromParameterSet {
 	{MLDSAParameters::ML_DSA_44_PARAMETER_SET, "ML-DSA-44"},
 	{MLDSAParameters::ML_DSA_65_PARAMETER_SET, "ML-DSA-65"},
 	{MLDSAParameters::ML_DSA_87_PARAMETER_SET, "ML-DSA-87"}
@@ -223,7 +223,7 @@ int OSSL::byteString2oid(const ByteString& byteString)
 #ifdef WITH_ML_DSA
 const char* OSSL::mldsaParameterSet2Name(unsigned long parameterSet) {
 
-	std::map<unsigned long, const char*>::iterator it = mldsaAlgNameFromParameterSet.find(parameterSet);
+	std::map<unsigned long, const char*>::const_iterator it = mldsaAlgNameFromParameterSet.find(parameterSet);
 
 	if (it != mldsaAlgNameFromParameterSet.end()) {
 		return it->second;