For block and stream ciphers, don't set the size of the key vectors

until we are actually setting a key. This avoids the problem of
prototype objects consuming not just memory but the precious few bytes
of mlock'able memory that we're given by Linux.

Use clear_mem instead of a loop in BigInt::mask_bits

If OS2ECP encounters an invalid format type, include what type it was
in the exception message.

2 files changed, 2 insertions, 3 deletions

diff --git a/src/block/tea/tea.cpp b/src/block/tea/tea.cpp
index 4ef995a7c..e45f7cb48 100644
--- a/src/block/tea/tea.cpp
+++ b/src/block/tea/tea.cpp
@@ -65,6 +65,7 @@ void TEA::decrypt_n(const byte in[], byte out[], size_t blocks) const
 */
 void TEA::key_schedule(const byte key[], size_t)
    {
+   K.resize(4);
    for(size_t i = 0; i != 4; ++i)
       K[i] = load_be<u32bit>(key, i);
    }
diff --git a/src/block/tea/tea.h b/src/block/tea/tea.h
index 5d418e084..d2f81da17 100644
--- a/src/block/tea/tea.h
+++ b/src/block/tea/tea.h
@@ -21,11 +21,9 @@ class BOTAN_DLL TEA : public Block_Cipher_Fixed_Params<8, 16>
       void encrypt_n(const byte in[], byte out[], size_t blocks) const;
       void decrypt_n(const byte in[], byte out[], size_t blocks) const;
 
-      void clear() { zeroise(K); }
+      void clear() { K.clear(); }
       std::string name() const { return "TEA"; }
       BlockCipher* clone() const { return new TEA; }
-
-      TEA() : K(4) {}
    private:
       void key_schedule(const byte[], size_t);
       secure_vector<u32bit> K;