glguy/xbot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean up ref use

Browse Source
This commit is contained in:
Eric Mertens 2025-01-30 11:56:03 -08:00
parent c3650ba38d
commit 0e708e72f8
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
myirc/challenge.cpp
View File

@ -39,7 +39,6 @@ auto Challenge::on_ircmsg(IrcCommand cmd, const IrcMsg &msg) -> void {
auto Challenge::finish_challenge() -> void auto Challenge::finish_challenge() -> void
{ {
Ref<EVP_PKEY_CTX> ctx;
unsigned int digestlen = EVP_MAX_MD_SIZE; unsigned int digestlen = EVP_MAX_MD_SIZE;
unsigned char digest[EVP_MAX_MD_SIZE]; unsigned char digest[EVP_MAX_MD_SIZE];
size_t len = mybase64::decoded_size(buffer_.size()); size_t len = mybase64::decoded_size(buffer_.size());
@ -50,8 +49,8 @@ auto Challenge::finish_challenge() -> void
ciphertext.resize(len); ciphertext.resize(len);
// Setup decryption context // Setup decryption context
ctx.reset(EVP_PKEY_CTX_new(key_.get(), nullptr)); Ref<EVP_PKEY_CTX> ctx{EVP_PKEY_CTX_new(key_.get(), nullptr)};
if (ctx.get() == nullptr) if (not ctx)
return log_openssl_errors("Challenge EVP_PKEY_CTX_new: "); return log_openssl_errors("Challenge EVP_PKEY_CTX_new: ");
if (1 != EVP_PKEY_decrypt_init(ctx.get())) if (1 != EVP_PKEY_decrypt_init(ctx.get()))

6
myirc/include/ref.hpp
View File

@ -25,14 +25,14 @@ template <> struct RefTraits<EVP_PKEY_CTX> {
}; };
template <typename T> template <typename T>
struct FnDeleter { struct RefDeleter {
auto operator()(T *ptr) const -> void { RefTraits<T>::Free(ptr); } auto operator()(T *ptr) const -> void { RefTraits<T>::Free(ptr); }
}; };
template <typename T> template <typename T>
struct Ref : std::unique_ptr<T, FnDeleter<T>> struct Ref : std::unique_ptr<T, RefDeleter<T>>
{ {
using base = std::unique_ptr<T, FnDeleter<T>>; using base = std::unique_ptr<T, RefDeleter<T>>;
/// Owns nothing /// Owns nothing
Ref() noexcept = default; Ref() noexcept = default;