fix(Crypto): some ASAN errors (still probem with bignum alloc)

Crypto/include/Poco/Crypto/EVPPKey.h

@@ -86,7 +86,7 @@ public:
 #endif // OPENSSL_VERSION_NUMBER >= 0x10000000L
 
 #if OPENSSL_VERSION_NUMBER >= 0x30000000L
-	explicit EVPPKey(const std::vector<unsigned char>* public_key, const std::vector<unsigned char>* private_key, unsigned long exponent, int type);
+	explicit EVPPKey(const std::vector<unsigned char>* publicKey, const std::vector<unsigned char>* privateKey, unsigned long exponent, int type);
 #endif
 	
 	explicit EVPPKey(EVP_PKEY* pEVPPKey);
@@ -178,7 +178,7 @@ public:
 private:
 	EVPPKey();
 #if OPENSSL_VERSION_NUMBER >= 0x30000000L	
-	void SetKeyFromParameters(OSSL_PARAM* parameters);
+	void setKeyFromParameters(OSSL_PARAM* parameters);
 #endif
 	static int type(const EVP_PKEY* pEVPPKey);
 	void checkType();

Crypto/src/EVPPKey.cpp

@@ -70,54 +70,103 @@ EVPPKey::EVPPKey(const PKCS12Container& cont): EVPPKey(cont.getKey())
 }
 
 #if OPENSSL_VERSION_NUMBER >= 0x30000000L
-void PushBuildParamBignum(OSSL_PARAM_BLD* param_bld, const char* key, const std::vector<unsigned char>& bytes) {
-	BIGNUM* bignum = BN_bin2bn(bytes.data(), (int)bytes.size(), nullptr);
-	OSSL_PARAM_BLD_push_BN(param_bld, key, bignum);
-}
-OSSL_PARAM* GetKeyParameters(const std::vector<unsigned char>* public_key, const std::vector<unsigned char>* private_key) {
-	auto param_bld = OSSL_PARAM_BLD_new();
 
-	if (public_key != nullptr) {
-		PushBuildParamBignum(param_bld, "n", *public_key);
+void pushBuildParamBignum(OSSL_PARAM_BLD* paramBld, const char* key, const std::vector<unsigned char>& bytes)
+{
+	BIGNUM* bignum = nullptr;
+	if (!(bignum = BN_bin2bn(bytes.data(), (int)bytes.size(), nullptr)))
+	{
+		std::string msg = "pushBuildParamBignum(): BN_bin2bn()\n";
+		throw OpenSSLException(getError(msg));
 	}
 
-	if (private_key != nullptr) {
-		PushBuildParamBignum(param_bld, "d", *private_key);
+	OSSL_PARAM_BLD_push_BN(paramBld, key, bignum);
+}
+
+
+OSSL_PARAM* getKeyParameters(const std::vector<unsigned char>* publicKey, const std::vector<unsigned char>* privateKey)
+{
+	OSSL_PARAM* parameters = nullptr;
+	auto paramBld = OSSL_PARAM_BLD_new();
+	if (!paramBld)
+	{
+		std::string msg = "getKeyParameters(): OSSL_PARAM_BLD_new()\n";
+		throw OpenSSLException(getError(msg));
 	}
 
-	// default rsa exponent
-	OSSL_PARAM_BLD_push_ulong(param_bld, "e", RSA_F4);
+	try
+	{
+		if (publicKey != nullptr)
+			pushBuildParamBignum(paramBld, "n", *publicKey);
+
+		if (privateKey != nullptr)
+			pushBuildParamBignum(paramBld, "d", *privateKey);
 
-	auto parameters = OSSL_PARAM_BLD_to_param(param_bld);
-	OSSL_PARAM_BLD_free(param_bld);
+		// default rsa exponent
+		OSSL_PARAM_BLD_push_ulong(paramBld, "e", RSA_F4);
+
+		parameters = OSSL_PARAM_BLD_to_param(paramBld);
+		if (!parameters)
+		{
+			std::string msg = "getKeyParameters(): OSSL_PARAM_BLD_to_param()\n";
+			throw OpenSSLException(getError(msg));
+		}
+	}
+	catch(OpenSSLException&)
+	{
+		OSSL_PARAM_BLD_free(paramBld);
+		throw;
+	}
+
+	OSSL_PARAM_BLD_free(paramBld);
 
 	return parameters;
 }
-void EVPPKey::SetKeyFromParameters(OSSL_PARAM* parameters) {
+
+
+void EVPPKey::setKeyFromParameters(OSSL_PARAM* parameters)
+{
 	auto ctx = EVP_PKEY_CTX_new_id(EVP_PKEY_RSA, nullptr);
-	if (EVP_PKEY_fromdata_init(ctx) <= 0) {
+	if (EVP_PKEY_fromdata_init(ctx) <= 0)
+	{
 		OSSL_PARAM_free(parameters);
+		EVP_PKEY_CTX_free(ctx);
 		throw OpenSSLException("EVPPKey cannot init create key");
 	}
 
 	if (_pEVPPKey != 0) EVP_PKEY_free(_pEVPPKey);
-	if (EVP_PKEY_fromdata(ctx, &_pEVPPKey, EVP_PKEY_KEYPAIR, parameters) <= 0) {
+	if (EVP_PKEY_fromdata(ctx, &_pEVPPKey, EVP_PKEY_KEYPAIR, parameters) <= 0)
+	{
 		OSSL_PARAM_free(parameters);
+		EVP_PKEY_CTX_free(ctx);
 		throw OpenSSLException("EVPPKey cannot create key");
 	}
+
+	EVP_PKEY_CTX_free(ctx);
 }
 
+
 EVPPKey::EVPPKey(const std::vector<unsigned char>* public_key, const std::vector<unsigned char>* private_key, unsigned long exponent, int type) : _pEVPPKey(0)
 {
-	if ((EVP_PKEY_RSA != type) || (RSA_F4 != exponent)) {
+	if ((EVP_PKEY_RSA != type) || (RSA_F4 != exponent))
+	{
 		std::string msg = Poco::format("EVPPKey(%d):Invalid format\n", type);
 		throw OpenSSLException(getError(msg));
 	}
 
-	OSSL_PARAM* parameters = GetKeyParameters(public_key, private_key);
-	SetKeyFromParameters(parameters);
-	OSSL_PARAM_free(parameters);
+	OSSL_PARAM* parameters = getKeyParameters(public_key, private_key);
+	if (parameters)
+	{
+		setKeyFromParameters(parameters);
+		OSSL_PARAM_free(parameters);
+	}
+	else
+	{
+		std::string msg = "EVPPKey(): getKeyParameters()\n";
+		throw OpenSSLException(getError(msg));
+	}
 }
+
 #endif
 	
 #if OPENSSL_VERSION_NUMBER >= 0x10000000L