From 0e708e72f8982a48e6347f462cbd5cc5357d0fcd Mon Sep 17 00:00:00 2001
From: Eric Mertens <emertens@gmail.com>
Date: Thu, 30 Jan 2025 11:56:03 -0800
Subject: [PATCH] clean up ref use

---
 myirc/challenge.cpp   | 5 ++---
 myirc/include/ref.hpp | 6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/myirc/challenge.cpp b/myirc/challenge.cpp
index c03f618..32b8289 100644
--- a/myirc/challenge.cpp
+++ b/myirc/challenge.cpp
@@ -39,7 +39,6 @@ auto Challenge::on_ircmsg(IrcCommand cmd, const IrcMsg &msg) -> void {
 
 auto Challenge::finish_challenge() -> void
 {
-    Ref<EVP_PKEY_CTX> ctx;
     unsigned int digestlen = EVP_MAX_MD_SIZE;
     unsigned char digest[EVP_MAX_MD_SIZE];
     size_t len = mybase64::decoded_size(buffer_.size());
@@ -50,8 +49,8 @@ auto Challenge::finish_challenge() -> void
     ciphertext.resize(len);
 
     // Setup decryption context
-    ctx.reset(EVP_PKEY_CTX_new(key_.get(), nullptr));
-    if (ctx.get() == nullptr)
+    Ref<EVP_PKEY_CTX> ctx{EVP_PKEY_CTX_new(key_.get(), nullptr)};
+    if (not ctx)
         return log_openssl_errors("Challenge EVP_PKEY_CTX_new: ");
 
     if (1 != EVP_PKEY_decrypt_init(ctx.get()))
diff --git a/myirc/include/ref.hpp b/myirc/include/ref.hpp
index 9eeb307..a4518e6 100644
--- a/myirc/include/ref.hpp
+++ b/myirc/include/ref.hpp
@@ -25,14 +25,14 @@ template <> struct RefTraits<EVP_PKEY_CTX> {
 };
 
 template <typename T>
-struct FnDeleter {
+struct RefDeleter {
     auto operator()(T *ptr) const -> void { RefTraits<T>::Free(ptr); }
 };
 
 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
     Ref() noexcept = default;