diff options
author | lloyd <[email protected]> | 2014-12-31 12:57:47 +0000 |
---|---|---|
committer | lloyd <[email protected]> | 2014-12-31 12:57:47 +0000 |
commit | b5b92a8a3847e2f3ad5ea2b429c4c6129ed6cb53 (patch) | |
tree | 850bfce01ac98e6d3b90e28157535d45ef043f76 | |
parent | 28eaccc661862b5e129e1226e2a0ac6af99bec75 (diff) |
Decruft
-rw-r--r-- | src/lib/stream/chacha/chacha.cpp | 14 | ||||
-rw-r--r-- | src/lib/stream/chacha/chacha.h | 2 |
2 files changed, 1 insertions, 15 deletions
diff --git a/src/lib/stream/chacha/chacha.cpp b/src/lib/stream/chacha/chacha.cpp index 419f8f67a..f404b3933 100644 --- a/src/lib/stream/chacha/chacha.cpp +++ b/src/lib/stream/chacha/chacha.cpp @@ -124,9 +124,6 @@ void ChaCha::key_schedule(const byte key[], size_t length) set_iv(ZERO, sizeof(ZERO)); } -/* -* Return the name of this type -*/ void ChaCha::set_iv(const byte iv[], size_t length) { if(!valid_iv_length(length)) @@ -154,17 +151,6 @@ void ChaCha::set_iv(const byte iv[], size_t length) m_position = 0; } -/* -* Return the name of this type -*/ -std::string ChaCha::name() const - { - return "ChaCha"; - } - -/* -* Clear memory of sensitive data -*/ void ChaCha::clear() { zap(m_state); diff --git a/src/lib/stream/chacha/chacha.h b/src/lib/stream/chacha/chacha.h index c7c11771d..635da2af4 100644 --- a/src/lib/stream/chacha/chacha.h +++ b/src/lib/stream/chacha/chacha.h @@ -31,7 +31,7 @@ class BOTAN_DLL ChaCha : public StreamCipher } void clear(); - std::string name() const; + std::string name() const { return "ChaCha"; } StreamCipher* clone() const { return new ChaCha; } protected: |