From 67161b91163afad417f9483cb557b26c5f5f4bc0 Mon Sep 17 00:00:00 2001
From: lloyd <lloyd@randombit.net>
Date: Fri, 7 Nov 2014 15:04:52 +0000
Subject: RAII and m_ namespace cleanups

---
 src/lib/pbe/pbes2/pbes2.h | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'src/lib/pbe/pbes2/pbes2.h')

diff --git a/src/lib/pbe/pbes2/pbes2.h b/src/lib/pbe/pbes2/pbes2.h
index b7160f575..623373b40 100644
--- a/src/lib/pbe/pbes2/pbes2.h
+++ b/src/lib/pbe/pbes2/pbes2.h
@@ -52,17 +52,15 @@ class BOTAN_DLL PBE_PKCS5v20 : public PBE
                    const std::string& passphrase,
                    std::chrono::milliseconds msec,
                    RandomNumberGenerator& rng);
-
-      ~PBE_PKCS5v20();
    private:
       void flush_pipe(bool);
 
-      Cipher_Dir direction;
-      BlockCipher* block_cipher;
-      MessageAuthenticationCode* m_prf;
-      secure_vector<byte> salt, key, iv;
-      size_t iterations, key_length;
-      Pipe pipe;
+      Cipher_Dir m_direction;
+      std::unique_ptr<BlockCipher> m_block_cipher;
+      std::unique_ptr<MessageAuthenticationCode> m_prf;
+      secure_vector<byte> m_salt, m_key, m_iv;
+      size_t m_iterations, m_key_length;
+      Pipe m_pipe;
    };
 
 }
-- 
cgit v1.2.3