diff options
| -rw-r--r-- | src/lib/base/symkey.cpp | 4 | ||||
| -rw-r--r-- | src/lib/block/lion/lion.cpp | 4 | ||||
| -rw-r--r-- | src/lib/utils/exceptn.h | 13 |
3 files changed, 10 insertions, 11 deletions
diff --git a/src/lib/base/symkey.cpp b/src/lib/base/symkey.cpp index 2f739998f..d5a02a45d 100644 --- a/src/lib/base/symkey.cpp +++ b/src/lib/base/symkey.cpp @@ -16,9 +16,9 @@ namespace Botan { * Create an OctetString from RNG output */ OctetString::OctetString(RandomNumberGenerator& rng, - size_t length) + size_t len) { - m_data = rng.random_vec(length); + m_data = rng.random_vec(len); } /* diff --git a/src/lib/block/lion/lion.cpp b/src/lib/block/lion/lion.cpp index 559816aea..7ae620504 100644 --- a/src/lib/block/lion/lion.cpp +++ b/src/lib/block/lion/lion.cpp @@ -130,8 +130,8 @@ void Lion::clear() /* * Lion Constructor */ -Lion::Lion(HashFunction* hash, StreamCipher* cipher, size_t block_size) : - m_block_size(std::max<size_t>(2*hash->output_length() + 1, block_size)), +Lion::Lion(HashFunction* hash, StreamCipher* cipher, size_t bs) : + m_block_size(std::max<size_t>(2*hash->output_length() + 1, bs)), m_hash(hash), m_cipher(cipher) { diff --git a/src/lib/utils/exceptn.h b/src/lib/utils/exceptn.h index 7ac32288d..1e9cd68d5 100644 --- a/src/lib/utils/exceptn.h +++ b/src/lib/utils/exceptn.h @@ -21,12 +21,11 @@ namespace Botan { class BOTAN_DLL Exception : public std::exception { public: - Exception(const std::string& what) : m_what(what) {} - Exception(const char* prefix, const std::string& what) : m_what(std::string(prefix) + " " + what) {} - //const char* what() const override BOTAN_NOEXCEPT { return m_what.c_str(); } - const char* what() const BOTAN_NOEXCEPT override { return m_what.c_str(); } + Exception(const std::string& msg) : m_msg(msg) {} + Exception(const char* prefix, const std::string& msg) : m_msg(std::string(prefix) + " " + msg) {} + const char* what() const BOTAN_NOEXCEPT override { return m_msg.c_str(); } private: - std::string m_what; + std::string m_msg; }; /** @@ -35,8 +34,8 @@ class BOTAN_DLL Exception : public std::exception class BOTAN_DLL Invalid_Argument : public Exception { public: - Invalid_Argument(const std::string& what) : - Exception("Invalid argument", what) {} + Invalid_Argument(const std::string& msg) : + Exception("Invalid argument", msg) {} }; /** |