Refactor rsa/add modern hashs in OAEP encrypt-decrypt

src/lib/SoftHSM.h

@@ -509,7 +509,9 @@ class SoftHSM
 
 	CK_RV MechParamCheckRSAPKCSOAEP(CK_MECHANISM_PTR pMechanism);
 	CK_RV MechParamCheckRSAAESKEYWRAP(CK_MECHANISM_PTR pMechanism);
-
+    CK_RV BuildRSAOAEPParam(const CK_RSA_PKCS_OAEP_PARAMS* par,
+                                void** parameters,size_t* paramLen,
+							    size_t* hashLen = NULL);
 	bool isMechanismPermitted(OSObject* key, CK_MECHANISM_TYPE mechanism);
 	void prepareSupportedMechanisms(std::map<std::string, CK_MECHANISM_TYPE> &t);
 	bool detectFork(void);

src/lib/crypto/AsymmetricAlgorithm.cpp

@@ -156,20 +156,22 @@ bool AsymmetricAlgorithm::isWrappingMech(AsymMech::Type padding)
 }
 
 // Wrap/Unwrap keys
-bool AsymmetricAlgorithm::wrapKey(PublicKey* publicKey, const ByteString& data, ByteString& encryptedData, const AsymMech::Type padding)
+bool AsymmetricAlgorithm::wrapKey(PublicKey* publicKey, const ByteString& data, ByteString& encryptedData, const AsymMech::Type padding,
+		const void* param, size_t paramLen)
 {
 	if (!isWrappingMech(padding))
 		return false;
 
-	return encrypt(publicKey, data, encryptedData, padding);
+	return encrypt(publicKey, data, encryptedData, padding, param, paramLen);
 }
 
-bool AsymmetricAlgorithm::unwrapKey(PrivateKey* privateKey, const ByteString& encryptedData, ByteString& data, const AsymMech::Type padding)
+bool AsymmetricAlgorithm::unwrapKey(PrivateKey* privateKey, const ByteString& encryptedData, ByteString& data, const AsymMech::Type padding,
+	const void* param, size_t paramLen)
 {
 	if (!isWrappingMech(padding))
 		return false;
 
-	return decrypt(privateKey, encryptedData, data, padding);
+	return decrypt(privateKey, encryptedData, data, padding, param, paramLen);
 }
 
 

src/lib/crypto/AsymmetricAlgorithm.h

@@ -116,6 +116,14 @@ struct RSA_PKCS_PSS_PARAMS
 	size_t sLen;
 };
 
+struct RSA_PKCS_OAEP_PARAMS
+{
+	HashAlgo::Type hashAlg;
+	AsymRSAMGF::Type mgf;
+	void *sourceData;
+	size_t sourceDataLen;
+};
+
 class AsymmetricAlgorithm
 {
 public:
@@ -138,14 +146,17 @@ class AsymmetricAlgorithm
 	virtual bool verifyFinal(const ByteString& signature);
 
 	// Encryption functions
-	virtual bool encrypt(PublicKey* publicKey, const ByteString& data, ByteString& encryptedData, const AsymMech::Type padding) = 0;
-
+	virtual bool encrypt(PublicKey* publicKey, const ByteString& data, ByteString& encryptedData, const AsymMech::Type padding,
+		const void* param = NULL, const size_t paramLen = 0) = 0;
 	// Decryption functions
-	virtual bool decrypt(PrivateKey* privateKey, const ByteString& encryptedData, ByteString& data, const AsymMech::Type padding) = 0;
+	virtual bool decrypt(PrivateKey* privateKey, const ByteString& encryptedData, ByteString& data, const AsymMech::Type padding,
+		const void* param = NULL, const size_t paramLen = 0) = 0;
 
 	// Wrap/Unwrap keys
-	bool wrapKey(PublicKey* publicKey, const ByteString& data, ByteString& encryptedData, const AsymMech::Type padding);
-	bool unwrapKey(PrivateKey* privateKey, const ByteString& encryptedData, ByteString& data, const AsymMech::Type padding);
+	bool wrapKey(PublicKey* publicKey, const ByteString& data, ByteString& encryptedData, const AsymMech::Type padding,
+		const void* param = NULL, size_t paramLen = 0);
+	bool unwrapKey(PrivateKey* privateKey, const ByteString& encryptedData, ByteString& data, const AsymMech::Type padding,
+		const void* param = NULL, size_t paramLen = 0);
 
 	// Key factory
 	virtual bool generateKeyPair(AsymmetricKeyPair** ppKeyPair, AsymmetricParameters* parameters, RNG* rng = NULL) = 0;

src/lib/crypto/BotanDH.cpp

@@ -93,7 +93,8 @@ bool BotanDH::verifyFinal(const ByteString& /*signature*/)
 
 // Encryption functions
 bool BotanDH::encrypt(PublicKey* /*publicKey*/, const ByteString& /*data*/,
-		      ByteString& /*encryptedData*/, const AsymMech::Type /*padding*/)
+		      ByteString& /*encryptedData*/, const AsymMech::Type /*padding*/,
+			   const void* /* param = NULL */, const size_t /* paramLen = 0 */)
 {
 	ERROR_MSG("DH does not support encryption");
 
@@ -102,7 +103,8 @@ bool BotanDH::encrypt(PublicKey* /*publicKey*/, const ByteString& /*data*/,
 
 // Decryption functions
 bool BotanDH::decrypt(PrivateKey* /*privateKey*/, const ByteString& /*encryptedData*/,
-		      ByteString& /*data*/, const AsymMech::Type /*padding*/)
+		      ByteString& /*data*/, const AsymMech::Type /*padding*/,
+			  const void* /* param = NULL */, const size_t /* paramLen = 0 */)
 {
 	ERROR_MSG("DH does not support decryption");
 

src/lib/crypto/BotanDH.h

@@ -54,10 +54,12 @@ class BotanDH : public AsymmetricAlgorithm
 	virtual bool verifyFinal(const ByteString& signature);
 
 	// Encryption functions
-	virtual bool encrypt(PublicKey* publicKey, const ByteString& data, ByteString& encryptedData, const AsymMech::Type padding);
+	virtual bool encrypt(PublicKey* publicKey, const ByteString& data, ByteString& encryptedData, const AsymMech::Type padding,
+		const void* param = NULL, const size_t paramLen = 0);
 
 	// Decryption functions
-	virtual bool decrypt(PrivateKey* privateKey, const ByteString& encryptedData, ByteString& data, const AsymMech::Type padding);
+	virtual bool decrypt(PrivateKey* privateKey, const ByteString& encryptedData, ByteString& data, const AsymMech::Type padding,
+		const void* param = NULL, const size_t paramLen = 0);
 
 	// Key factory
 	virtual bool generateKeyPair(AsymmetricKeyPair** ppKeyPair, AsymmetricParameters* parameters, RNG* rng = NULL);

src/lib/crypto/BotanDSA.cpp

@@ -485,7 +485,8 @@ bool BotanDSA::verifyFinal(const ByteString& signature)
 
 // Encryption functions
 bool BotanDSA::encrypt(PublicKey* /*publicKey*/, const ByteString& /*data*/,
-		       ByteString& /*encryptedData*/, const AsymMech::Type /*padding*/)
+		       ByteString& /*encryptedData*/, const AsymMech::Type /*padding*/,
+			   const void* /* param = NULL */, const size_t /* paramLen = 0 */)
 {
 	ERROR_MSG("DSA does not support encryption");
 
@@ -494,7 +495,8 @@ bool BotanDSA::encrypt(PublicKey* /*publicKey*/, const ByteString& /*data*/,
 
 // Decryption functions
 bool BotanDSA::decrypt(PrivateKey* /*privateKey*/, const ByteString& /*encryptedData*/,
-		       ByteString& /*data*/, const AsymMech::Type /*padding*/)
+		       ByteString& /*data*/, const AsymMech::Type /*padding*/,
+			   const void* /*param = NULL */, const size_t /* paramLen = 0 */)
 {
 	ERROR_MSG("DSA does not support decryption");
 

src/lib/crypto/BotanDSA.h

@@ -59,10 +59,12 @@ class BotanDSA : public AsymmetricAlgorithm
 	virtual bool verifyFinal(const ByteString& signature);
 
 	// Encryption functions
-	virtual bool encrypt(PublicKey* publicKey, const ByteString& data, ByteString& encryptedData, const AsymMech::Type padding);
+	virtual bool encrypt(PublicKey* publicKey, const ByteString& data, ByteString& encryptedData, const AsymMech::Type padding,
+		const void* param = NULL, const size_t paramLen = 0);
 
 	// Decryption functions
-	virtual bool decrypt(PrivateKey* privateKey, const ByteString& encryptedData, ByteString& data, const AsymMech::Type padding);
+	virtual bool decrypt(PrivateKey* privateKey, const ByteString& encryptedData, ByteString& data, const AsymMech::Type padding,
+		const void* param = NULL, const size_t paramLen = 0);
 
 	// Key factory
 	virtual bool generateKeyPair(AsymmetricKeyPair** ppKeyPair, AsymmetricParameters* parameters, RNG* rng = NULL);

src/lib/crypto/BotanECDH.cpp

@@ -94,7 +94,8 @@ bool BotanECDH::verifyFinal(const ByteString& /*signature*/)
 
 // Encryption functions
 bool BotanECDH::encrypt(PublicKey* /*publicKey*/, const ByteString& /*data*/,
-			ByteString& /*encryptedData*/, const AsymMech::Type /*padding*/)
+			ByteString& /*encryptedData*/, const AsymMech::Type /*padding*/,
+		     const void* /* param = NULL */, const size_t /* paramLen = 0 */)
 {
 	ERROR_MSG("ECDH does not support encryption");
 
@@ -103,7 +104,8 @@ bool BotanECDH::encrypt(PublicKey* /*publicKey*/, const ByteString& /*data*/,
 
 // Decryption functions
 bool BotanECDH::decrypt(PrivateKey* /*privateKey*/, const ByteString& /*encryptedData*/,
-			ByteString& /*data*/, const AsymMech::Type /*padding*/)
+			ByteString& /*data*/, const AsymMech::Type /*padding*/,
+		    const void* /* param = NULL */, const size_t /* paramLen = 0 */)
 {
 	ERROR_MSG("ECDH does not support decryption");
 

src/lib/crypto/BotanECDH.h

@@ -54,10 +54,12 @@ class BotanECDH : public AsymmetricAlgorithm
 	virtual bool verifyFinal(const ByteString& signature);
 
 	// Encryption functions
-	virtual bool encrypt(PublicKey* publicKey, const ByteString& data, ByteString& encryptedData, const AsymMech::Type padding);
+	virtual bool encrypt(PublicKey* publicKey, const ByteString& data, ByteString& encryptedData, const AsymMech::Type padding,
+		const void* param = NULL, const size_t paramLen = 0);
 
 	// Decryption functions
-	virtual bool decrypt(PrivateKey* privateKey, const ByteString& encryptedData, ByteString& data, const AsymMech::Type padding);
+	virtual bool decrypt(PrivateKey* privateKey, const ByteString& encryptedData, ByteString& data, const AsymMech::Type padding,
+		const void* param = NULL, const size_t paramLen = 0);
 
 	// Key factory
 	virtual bool generateKeyPair(AsymmetricKeyPair** ppKeyPair, AsymmetricParameters* parameters, RNG* rng = NULL);

src/lib/crypto/BotanECDSA.cpp

@@ -321,7 +321,8 @@ bool BotanECDSA::verifyFinal(const ByteString& /*signature*/)
 
 // Encryption functions
 bool BotanECDSA::encrypt(PublicKey* /*publicKey*/, const ByteString& /*data*/,
-			 ByteString& /*encryptedData*/, const AsymMech::Type /*padding*/)
+			 ByteString& /*encryptedData*/, const AsymMech::Type /*padding*/,
+			  const void* /* param = NULL */, const size_t /* paramLen = 0 */)
 {
 	ERROR_MSG("ECDSA does not support encryption");
 
@@ -330,7 +331,8 @@ bool BotanECDSA::encrypt(PublicKey* /*publicKey*/, const ByteString& /*data*/,
 
 // Decryption functions
 bool BotanECDSA::decrypt(PrivateKey* /*privateKey*/, const ByteString& /*encryptedData*/,
-			 ByteString& /*data*/, const AsymMech::Type /*padding*/)
+			 ByteString& /*data*/, const AsymMech::Type /*padding*/,
+			  const void* /* param = NULL */, const size_t /* paramLen = 0 */)
 {
 	ERROR_MSG("ECDSA does not support decryption");
 

src/lib/crypto/BotanECDSA.h

@@ -47,38 +47,40 @@ class BotanECDSA : public AsymmetricAlgorithm
 	virtual ~BotanECDSA();
 
 	// Signing functions
-	virtual bool sign(PrivateKey* privateKey, const ByteString& dataToSign, ByteString& signature, const AsymMech::Type mechanism, const void* param = NULL, const size_t paramLen = 0);
-	virtual bool signInit(PrivateKey* privateKey, const AsymMech::Type mechanism, const void* param = NULL, const size_t paramLen = 0);
-	virtual bool signUpdate(const ByteString& dataToSign);
-	virtual bool signFinal(ByteString& signature);
+	virtual bool sign(PrivateKey *privateKey, const ByteString &dataToSign, ByteString &signature, const AsymMech::Type mechanism, const void *param = NULL, const size_t paramLen = 0);
+	virtual bool signInit(PrivateKey *privateKey, const AsymMech::Type mechanism, const void *param = NULL, const size_t paramLen = 0);
+	virtual bool signUpdate(const ByteString &dataToSign);
+	virtual bool signFinal(ByteString &signature);
 
 	// Verification functions
-	virtual bool verify(PublicKey* publicKey, const ByteString& originalData, const ByteString& signature, const AsymMech::Type mechanism, const void* param = NULL, const size_t paramLen = 0);
-	virtual bool verifyInit(PublicKey* publicKey, const AsymMech::Type mechanism, const void* param = NULL, const size_t paramLen = 0);
-	virtual bool verifyUpdate(const ByteString& originalData);
-	virtual bool verifyFinal(const ByteString& signature);
+	virtual bool verify(PublicKey *publicKey, const ByteString &originalData, const ByteString &signature, const AsymMech::Type mechanism, const void *param = NULL, const size_t paramLen = 0);
+	virtual bool verifyInit(PublicKey *publicKey, const AsymMech::Type mechanism, const void *param = NULL, const size_t paramLen = 0);
+	virtual bool verifyUpdate(const ByteString &originalData);
+	virtual bool verifyFinal(const ByteString &signature);
 
 	// Encryption functions
-	virtual bool encrypt(PublicKey* publicKey, const ByteString& data, ByteString& encryptedData, const AsymMech::Type padding);
+	virtual bool encrypt(PublicKey *publicKey, const ByteString &data, ByteString &encryptedData, const AsymMech::Type padding,
+						 const void *param = NULL, const size_t paramLen = 0);
 
 	// Decryption functions
-	virtual bool decrypt(PrivateKey* privateKey, const ByteString& encryptedData, ByteString& data, const AsymMech::Type padding);
+	virtual bool decrypt(PrivateKey *privateKey, const ByteString &encryptedData, ByteString &data, const AsymMech::Type padding,
+						 const void *param = NULL, const size_t paramLen = 0);
 
 	// Key factory
-	virtual bool generateKeyPair(AsymmetricKeyPair** ppKeyPair, AsymmetricParameters* parameters, RNG* rng = NULL);
+	virtual bool generateKeyPair(AsymmetricKeyPair **ppKeyPair, AsymmetricParameters *parameters, RNG *rng = NULL);
 	virtual unsigned long getMinKeySize();
 	virtual unsigned long getMaxKeySize();
-	virtual bool reconstructKeyPair(AsymmetricKeyPair** ppKeyPair, ByteString& serialisedData);
-	virtual bool reconstructPublicKey(PublicKey** ppPublicKey, ByteString& serialisedData);
-	virtual bool reconstructPrivateKey(PrivateKey** ppPrivateKey, ByteString& serialisedData);
-	virtual bool reconstructParameters(AsymmetricParameters** ppParams, ByteString& serialisedData);
-	virtual PublicKey* newPublicKey();
-	virtual PrivateKey* newPrivateKey();
-	virtual AsymmetricParameters* newParameters();
+	virtual bool reconstructKeyPair(AsymmetricKeyPair **ppKeyPair, ByteString &serialisedData);
+	virtual bool reconstructPublicKey(PublicKey **ppPublicKey, ByteString &serialisedData);
+	virtual bool reconstructPrivateKey(PrivateKey **ppPrivateKey, ByteString &serialisedData);
+	virtual bool reconstructParameters(AsymmetricParameters **ppParams, ByteString &serialisedData);
+	virtual PublicKey *newPublicKey();
+	virtual PrivateKey *newPrivateKey();
+	virtual AsymmetricParameters *newParameters();
 
 private:
-	Botan::PK_Signer* signer;
-	Botan::PK_Verifier* verifier;
+	Botan::PK_Signer *signer;
+	Botan::PK_Verifier *verifier;
 };
 
 #endif // !_SOFTHSM_V2_BOTANECDSA_H

src/lib/crypto/BotanEDDSA.cpp

@@ -256,7 +256,8 @@ bool BotanEDDSA::verifyFinal(const ByteString& /*signature*/)
 
 // Encryption functions
 bool BotanEDDSA::encrypt(PublicKey* /*publicKey*/, const ByteString& /*data*/,
-			 ByteString& /*encryptedData*/, const AsymMech::Type /*padding*/)
+			 ByteString& /*encryptedData*/, const AsymMech::Type /*padding*/,
+			  const void* /* param = NULL */, const size_t /* paramLen = 0 */)
 {
 	ERROR_MSG("EDDSA does not support encryption");
 
@@ -265,7 +266,8 @@ bool BotanEDDSA::encrypt(PublicKey* /*publicKey*/, const ByteString& /*data*/,
 
 // Decryption functions
 bool BotanEDDSA::decrypt(PrivateKey* /*privateKey*/, const ByteString& /*encryptedData*/,
-			 ByteString& /*data*/, const AsymMech::Type /*padding*/)
+			 ByteString& /*data*/, const AsymMech::Type /*padding*/,
+			  const void* /* param = NULL */, const size_t /* paramLen = 0 */)
 {
 	ERROR_MSG("EDDSA does not support decryption");
 

src/lib/crypto/BotanEDDSA.h

@@ -59,10 +59,12 @@ class BotanEDDSA : public AsymmetricAlgorithm
 	virtual bool verifyFinal(const ByteString& signature);
 
 	// Encryption functions
-	virtual bool encrypt(PublicKey* publicKey, const ByteString& data, ByteString& encryptedData, const AsymMech::Type padding);
+	virtual bool encrypt(PublicKey* publicKey, const ByteString& data, ByteString& encryptedData, const AsymMech::Type padding,
+		const void* param = NULL, const size_t paramLen = 0);
 
 	// Decryption functions
-	virtual bool decrypt(PrivateKey* privateKey, const ByteString& encryptedData, ByteString& data, const AsymMech::Type padding);
+	virtual bool decrypt(PrivateKey* privateKey, const ByteString& encryptedData, ByteString& data, const AsymMech::Type padding,
+		const void* param = NULL, const size_t paramLen = 0);
 
 	// Key factory
 	virtual bool generateKeyPair(AsymmetricKeyPair** ppKeyPair, AsymmetricParameters* parameters, RNG* rng = NULL);

src/lib/crypto/BotanGOST.cpp

@@ -326,7 +326,8 @@ bool BotanGOST::verifyFinal(const ByteString& signature)
 
 // Encryption functions
 bool BotanGOST::encrypt(PublicKey* /*publicKey*/, const ByteString& /*data*/,
-			ByteString& /*encryptedData*/, const AsymMech::Type /*padding*/)
+			ByteString& /*encryptedData*/, const AsymMech::Type /*padding*/,
+		    const void* /* param = NULL */, const size_t /* paramLen = 0 */)
 {
 	ERROR_MSG("GOST does not support encryption");
 
@@ -335,7 +336,8 @@ bool BotanGOST::encrypt(PublicKey* /*publicKey*/, const ByteString& /*data*/,
 
 // Decryption functions
 bool BotanGOST::decrypt(PrivateKey* /*privateKey*/, const ByteString& /*encryptedData*/,
-			ByteString& /*data*/, const AsymMech::Type /*padding*/)
+			ByteString& /*data*/, const AsymMech::Type /*padding*/,
+		     const void* /* param = NULL */, const size_t /* paramLen = 0 */)
 {
 	ERROR_MSG("GOST does not support decryption");
 

src/lib/crypto/BotanGOST.h

@@ -57,10 +57,12 @@ class BotanGOST : public AsymmetricAlgorithm
 	virtual bool verifyFinal(const ByteString& signature);
 
 	// Encryption functions
-	virtual bool encrypt(PublicKey* publicKey, const ByteString& data, ByteString& encryptedData, const AsymMech::Type padding);
+	virtual bool encrypt(PublicKey* publicKey, const ByteString& data, ByteString& encryptedData, const AsymMech::Type padding,
+		const void* param = NULL, const size_t paramLen = 0);
 
 	// Decryption functions
-	virtual bool decrypt(PrivateKey* privateKey, const ByteString& encryptedData, ByteString& data, const AsymMech::Type padding);
+	virtual bool decrypt(PrivateKey* privateKey, const ByteString& encryptedData, ByteString& data, const AsymMech::Type padding,
+		const void* param = NULL, const size_t paramLen = 0);
 
 	// Key factory
 	virtual bool generateKeyPair(AsymmetricKeyPair** ppKeyPair, AsymmetricParameters* parameters, RNG* rng = NULL);