rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-23 11:23:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5358

Browse Source 
dffdccdc No longer use deprecated RSA_generate_key in favor of RSA_generate_key_ex (Martijn Otto)
This commit is contained in:
Riccardo Spagni 2019-04-06 16:02:30 +02:00
commit 17fefb8786
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 40 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,8 +46,7 @@ namespace
{ {
void operator()(BIO* ptr) const noexcept void operator()(BIO* ptr) const noexcept
{ {
if (ptr) BIO_free(ptr);
BIO_free(ptr);
} }
}; };
using openssl_bio = std::unique_ptr<BIO, openssl_bio_free>; using openssl_bio = std::unique_ptr<BIO, openssl_bio_free>;
@ -56,12 +55,28 @@ namespace
{ {
void operator()(EVP_PKEY* ptr) const noexcept void operator()(EVP_PKEY* ptr) const noexcept
{ {
if (ptr) EVP_PKEY_free(ptr);
EVP_PKEY_free(ptr);
} }
}; };
using openssl_pkey = std::unique_ptr<EVP_PKEY, openssl_pkey_free>; using openssl_pkey = std::unique_ptr<EVP_PKEY, openssl_pkey_free>;
struct openssl_rsa_free
{
void operator()(RSA* ptr) const noexcept
{
RSA_free(ptr);
}
};
using openssl_rsa = std::unique_ptr<RSA, openssl_rsa_free>;
struct openssl_bignum_free
{
void operator()(BIGNUM* ptr) const noexcept
{
BN_free(ptr);
}
};
using openssl_bignum = std::unique_ptr<BIGNUM, openssl_bignum_free>;
} }
namespace epee namespace epee
@ -81,19 +96,37 @@ bool create_ssl_certificate(EVP_PKEY *&pkey, X509 *&cert)
} }
openssl_pkey pkey_deleter{pkey}; openssl_pkey pkey_deleter{pkey};
RSA *rsa = RSA_generate_key(4096, RSA_F4, NULL, NULL); openssl_rsa rsa{RSA_new()};
if (!rsa) if (!rsa)
{
MERROR("Error allocating RSA private key");
return false;
}
openssl_bignum exponent{BN_new()};
if (!exponent)
{
MERROR("Error allocating exponent");
return false;
}
BN_set_word(exponent.get(), RSA_F4);
if (RSA_generate_key_ex(rsa.get(), 4096, exponent.get(), nullptr) != 1)
{ {
MERROR("Error generating RSA private key"); MERROR("Error generating RSA private key");
return false; return false;
} }
if (EVP_PKEY_assign_RSA(pkey, rsa) <= 0) // The RSA will be automatically freed when the EVP_PKEY structure is freed.
if (EVP_PKEY_assign_RSA(pkey, rsa.get()) <= 0)
{ {
MERROR("Error assigning RSA private key"); MERROR("Error assigning RSA private key");
RSA_free(rsa);
return false; return false;
} }
// the RSA key is now managed by the EVP_PKEY structure
(void)rsa.release();
cert = X509_new(); cert = X509_new();
if (!cert) if (!cert)
{ {