Address review comments

Author: ruiliio

src/lib/SoftHSM.cpp

@@ -6793,7 +6793,7 @@ CK_RV SoftHSM::C_WrapKey
 		emphKey->destroyObject();
 		hEmphKey = CK_INVALID_HANDLE;
 
-		CK_MECHANISM oaepMech = {CKM_RSA_PKCS_OAEP, params->oaep_params, sizeof(CK_RSA_AES_KEY_WRAP_PARAMS)};
+		CK_MECHANISM oaepMech = {CKM_RSA_PKCS_OAEP, params->oaep_params, sizeof(CK_RSA_PKCS_OAEP_PARAMS)};
 
 		// Wraps the AES emph key with the wrapping RSA key using CKM_RSA_PKCS_OAEP with parameters of OAEPParams.
 		rv = SoftHSM::WrapKeyAsym(&oaepMech, token, wrapKey, emphkeydata, wrapped_1);
@@ -7242,17 +7242,23 @@ CK_RV SoftHSM::C_UnwrapKey
 		CK_OBJECT_HANDLE hEmphKey = CK_INVALID_HANDLE;
 		CK_RSA_AES_KEY_WRAP_PARAMS_PTR params = (CK_RSA_AES_KEY_WRAP_PARAMS_PTR)pMechanism->pParameter;
 		ByteString emphkeydata;
-		ByteString pubexp = unwrapKey->getByteStringValue(CKA_PUBLIC_EXPONENT);
-		ByteString modulus = unwrapKey->getByteStringValue(CKA_MODULUS);
-		CK_ULONG wrappedLen1 = modulus.size();
+		ByteString modulus;
+		ByteString modulusValue = unwrapKey->getByteStringValue(CKA_MODULUS);
+
 		if(isUnwrapKeyPrivate)
 		{
-			wrappedLen1 = modulus.size() - pubexp.size();
+			token->decrypt(modulusValue, modulus);
+		}
+		else
+		{
+			modulus = modulusValue;
 		}
+
+		CK_ULONG wrappedLen1 = modulus.size();
 		CK_ULONG wrappedLen2 = ulWrappedKeyLen - wrappedLen1;
 
 		ByteString wrapped_1(pWrappedKey, wrappedLen1); // the wrapped AES key
-		CK_MECHANISM oaepMech = {CKM_RSA_PKCS_OAEP, params->oaep_params, sizeof(CK_RSA_AES_KEY_WRAP_PARAMS)};
+		CK_MECHANISM oaepMech = {CKM_RSA_PKCS_OAEP, params->oaep_params, sizeof(CK_RSA_PKCS_OAEP_PARAMS)};
 
 		// Un-wraps the temporary AES key from the first part with the private RSA key using CKM_RSA_PKCS_OAEP.
 		rv = UnwrapKeyAsym(&oaepMech, wrapped_1, token, unwrapKey, emphkeydata);
@@ -13119,14 +13125,9 @@ CK_RV SoftHSM::MechParamCheckRSAAESKEYWRAP(CK_MECHANISM_PTR pMechanism)
 		ERROR_MSG("oaep_params must be of type CK_RSA_PKCS_OAEP_PARAMS");
 		return CKR_ARGUMENTS_BAD;
 	}
-	if (params->oaep_params->hashAlg != CKM_SHA_1)
-	{
-		ERROR_MSG("hashAlg must be CKM_SHA_1");
-		return CKR_ARGUMENTS_BAD;
-	}
-	if (params->oaep_params->mgf != CKG_MGF1_SHA1)
+	if (params->oaep_params->mgf < 1UL || params->oaep_params->mgf > 5UL)
 	{
-		ERROR_MSG("mgf must be CKG_MGF1_SHA1");
+		ERROR_MSG("mgf not supported");
 		return CKR_ARGUMENTS_BAD;
 	}
 	if (params->oaep_params->source != CKZ_DATA_SPECIFIED)

src/lib/test/AsymWrapUnwrapTests.cpp

@@ -77,7 +77,6 @@ CK_RV AsymWrapUnwrapTests::generateRsaKeyPair(CK_SESSION_HANDLE hSession, CK_BBO
 	CK_BYTE pubExp[] = {0x01, 0x00, 0x01};
 	CK_BYTE subject[] = { 0x12, 0x34 }; // dummy
 	CK_BYTE id[] = { 123 } ; // dummy
-	// CK_BBOOL bFalse = CK_FALSE;
 	CK_BBOOL bTrue = CK_TRUE;
 	CK_ATTRIBUTE pukAttribs[] = {
 		{ CKA_TOKEN, &bTokenPuk, sizeof(bTokenPuk) },
@@ -117,10 +116,7 @@ void AsymWrapUnwrapTests::rsaWrapUnwrapPvt(CK_SESSION_HANDLE hSession, CK_OBJECT
 	CK_RV rv = CKR_OK;
 	CK_MECHANISM_INFO mechInfo;
 	CK_RSA_PKCS_OAEP_PARAMS oaepParams = { CKM_SHA_1, CKG_MGF1_SHA1, CKZ_DATA_SPECIFIED, NULL_PTR, 0 };
-	CK_RSA_AES_KEY_WRAP_PARAMS rsa_aes_params = {
-        .aes_key_bits = 256,
-        .oaep_params = &oaepParams
-    };
+	CK_RSA_AES_KEY_WRAP_PARAMS rsa_aes_params = { 256, &oaepParams };
 	CK_MECHANISM mechanism = {CKM_RSA_AES_KEY_WRAP, &rsa_aes_params, sizeof(rsa_aes_params)};
 	CK_MECHANISM sv_mechanism = { CKM_RSA_PKCS, NULL_PTR, 0 };
 	CK_BYTE data[] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B,0x0C, 0x0D, 0x0F };

src/lib/test/AsymWrapUnwrapTests.h

@@ -49,8 +49,10 @@ class AsymWrapUnwrapTests : public TestsBase
 protected:
 	CK_RV generateAesKey(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE &hKey);
 	CK_RV generateRsaKeyPair(CK_SESSION_HANDLE hSession, CK_BBOOL bTokenPuk, CK_BBOOL bPrivatePuk, CK_BBOOL bTokenPrk, CK_BBOOL bPrivatePrk, CK_OBJECT_HANDLE &hPuk, CK_OBJECT_HANDLE &hPrk);
-	void rsaWrapUnwrapPvt(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hPublicKey, CK_OBJECT_HANDLE hPrivateKey);
 	void rsaWrapUnwrap(CK_MECHANISM_TYPE mechanismType, CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hPublicKey, CK_OBJECT_HANDLE hPrivateKey);
+
+private:
+	void rsaWrapUnwrapPvt(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hPublicKey, CK_OBJECT_HANDLE hPrivateKey);
 };
 
 #endif // !_SOFTHSM_V2_ASYMWRAPUNWRAPTESTS_H