diff options
author | lloyd <[email protected]> | 2014-11-07 15:04:52 +0000 |
---|---|---|
committer | lloyd <[email protected]> | 2014-11-07 15:04:52 +0000 |
commit | 67161b91163afad417f9483cb557b26c5f5f4bc0 (patch) | |
tree | b7ea1f30bfd003cd97aa565f3161205ee92ebf06 /src/lib/pbe/pbes2/pbes2.h | |
parent | ce72ae0073b18f82efe558a3bf44564f0245d6db (diff) |
RAII and m_ namespace cleanups
Diffstat (limited to 'src/lib/pbe/pbes2/pbes2.h')
-rw-r--r-- | src/lib/pbe/pbes2/pbes2.h | 14 |
1 files changed, 6 insertions, 8 deletions
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; }; } |