diff options
| author | Shauren <shauren.trinity@gmail.com> | 2024-05-07 12:26:21 +0200 |
|---|---|---|
| committer | Ovahlord <dreadkiller@gmx.de> | 2024-05-28 16:55:30 +0200 |
| commit | 249eb19fe108511c5f56e30944816ebb87617ec1 (patch) | |
| tree | 34a7d03edf8f1b7f1300f1596a1a8b37c7aa0244 /src/common/Cryptography | |
| parent | b37f4d0a50ab6bc52d0016178eaf6f12ad120231 (diff) | |
Core/Misc: Minor change to make_unique_ptr_with_deleter to make it accept only pointers
(cherry picked from commit 83f4763b25891c9fe6c7f01b75cdf0f4ef66fc9a)
Diffstat (limited to 'src/common/Cryptography')
| -rw-r--r-- | src/common/Cryptography/Ed25519.cpp | 4 | ||||
| -rw-r--r-- | src/common/Cryptography/RSA.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/common/Cryptography/Ed25519.cpp b/src/common/Cryptography/Ed25519.cpp index ce706594057..6f286c74b3e 100644 --- a/src/common/Cryptography/Ed25519.cpp +++ b/src/common/Cryptography/Ed25519.cpp @@ -68,7 +68,7 @@ bool Ed25519::LoadFromFile(std::string const& fileName) _key = nullptr; } - auto keyBIO = make_unique_ptr_with_deleter(BIO_new_file(fileName.c_str(), "r"), BIO_free); + auto keyBIO = make_unique_ptr_with_deleter(BIO_new_file(fileName.c_str(), "r"), &BIO_free); if (!keyBIO) return false; @@ -89,7 +89,7 @@ bool Ed25519::LoadFromString(std::string const& keyPem) auto keyBIO = make_unique_ptr_with_deleter(BIO_new_mem_buf( const_cast<char*>(keyPem.c_str()) /*api hack - this function assumes memory is readonly but lacks const modifier*/, - keyPem.length() + 1), BIO_free); + keyPem.length() + 1), &BIO_free); if (!keyBIO) return false; diff --git a/src/common/Cryptography/RSA.cpp b/src/common/Cryptography/RSA.cpp index eb85b6e5750..cef03fdc1bb 100644 --- a/src/common/Cryptography/RSA.cpp +++ b/src/common/Cryptography/RSA.cpp @@ -429,7 +429,7 @@ bool RsaSignature::LoadKeyFromFile(std::string const& fileName) _key = nullptr; } - auto keyBIO = make_unique_ptr_with_deleter(BIO_new_file(fileName.c_str(), "r"), BIO_free); + auto keyBIO = make_unique_ptr_with_deleter(BIO_new_file(fileName.c_str(), "r"), &BIO_free); if (!keyBIO) return false; @@ -450,7 +450,7 @@ bool RsaSignature::LoadKeyFromString(std::string const& keyPem) auto keyBIO = make_unique_ptr_with_deleter(BIO_new_mem_buf( const_cast<char*>(keyPem.c_str()) /*api hack - this function assumes memory is readonly but lacks const modifier*/, - keyPem.length() + 1), BIO_free); + keyPem.length() + 1), &BIO_free); if (!keyBIO) return false; @@ -466,7 +466,7 @@ bool RsaSignature::Sign(uint8 const* message, std::size_t messageLength, DigestG std::unique_ptr<EVP_MD, DigestGenerator::EVP_MD_Deleter> digestGenerator = generator.GetGenerator(); #if OPENSSL_VERSION_NUMBER >= 0x30000000L - auto keyCtx = make_unique_ptr_with_deleter(EVP_PKEY_CTX_new_from_pkey(generator.GetLib(), _key, nullptr), EVP_PKEY_CTX_free); + auto keyCtx = make_unique_ptr_with_deleter(EVP_PKEY_CTX_new_from_pkey(generator.GetLib(), _key, nullptr), &EVP_PKEY_CTX_free); EVP_MD_CTX_set_pkey_ctx(_ctx, keyCtx.get()); std::unique_ptr<OSSL_PARAM[]> params = generator.GetParams(); |
