Use correct expectedMgf in WrapKeyAsym for OAEP

Author: LawrenceHunter

src/lib/SoftHSM.cpp

@@ -6537,28 +6537,28 @@ CK_RV SoftHSM::WrapKeyAsym
 					break;
 				case CKM_SHA224:
 					mech = AsymMech::RSA_PKCS_OAEP_SHA224;
-					expectedMgf = CKG_MGF1_SHA1;
+					expectedMgf = CKG_MGF1_SHA224;
 					// PKCS#11 2.40 draft 2 section 2.1.8: input length <= k-2-2hashLen
 					if (keydata.size() > modulus_length - 2 - 2 * 224 / 8)
 						return CKR_KEY_SIZE_RANGE;
 					break;
 				case CKM_SHA256:
 					mech = AsymMech::RSA_PKCS_OAEP_SHA256;
-					expectedMgf = CKG_MGF1_SHA1;
+					expectedMgf = CKG_MGF1_SHA256;
 					// PKCS#11 2.40 draft 2 section 2.1.8: input length <= k-2-2hashLen
 					if (keydata.size() > modulus_length - 2 - 2 * 256 / 8)
 						return CKR_KEY_SIZE_RANGE;
 					break;
 				case CKM_SHA384:
 					mech = AsymMech::RSA_PKCS_OAEP_SHA384;
-					expectedMgf = CKG_MGF1_SHA1;
+					expectedMgf = CKG_MGF1_SHA384;
 					// PKCS#11 2.40 draft 2 section 2.1.8: input length <= k-2-2hashLen
 					if (keydata.size() > modulus_length - 2 - 2 * 384 / 8)
 						return CKR_KEY_SIZE_RANGE;
 					break;
 				case CKM_SHA512:
 					mech = AsymMech::RSA_PKCS_OAEP_SHA512;
-					expectedMgf = CKG_MGF1_SHA1;
+					expectedMgf = CKG_MGF1_SHA512;
 					// PKCS#11 2.40 draft 2 section 2.1.8: input length <= k-2-2hashLen
 					if (keydata.size() > modulus_length - 2 - 2 * 512 / 8)
 						return CKR_KEY_SIZE_RANGE;