4rkal/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-13 11:56:31 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

epee: certificate generation fix, pkey deleted

Browse Source 
- pkey gets deleted by the pkey_deleter but the caller tries to serialize it which causes errors as the memory is freed
This commit is contained in:
Dusan Klinec 2019-03-08 18:27:24 +01:00
parent d281b81962
commit bb8eab24da
No known key found for this signature in database
GPG Key ID: 6337E118CCBCE103
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/epee/src/net_ssl.cpp
View File

@ -74,22 +74,23 @@ bool create_ssl_certificate(EVP_PKEY *&pkey, X509 *&cert)
{
MGINFO("Generating SSL certificate");
pkey = EVP_PKEY_new();
openssl_pkey pkey_deleter{pkey};
if (!pkey)
{
MERROR("Failed to create new private key");
return false;
}
openssl_pkey pkey_deleter{pkey};
RSA *rsa = RSA_generate_key(4096, RSA_F4, NULL, NULL);
if (!rsa)
{
MERROR("Error generating RSA private key");
return false;
}
if (EVP_PKEY_assign_RSA(pkey, rsa) <= 0)
if (EVP_PKEY_assign_RSA(pkey, rsa) <= 0) // The RSA will be automatically freed when the EVP_PKEY structure is freed.
{
RSA_free(rsa);
MERROR("Error assigning RSA private key");
RSA_free(rsa);
return false;
}
@ -117,6 +118,7 @@ bool create_ssl_certificate(EVP_PKEY *&pkey, X509 *&cert)
X509_free(cert);
return false;
}
(void)pkey_deleter.release();
return true;
}