From 113f4035f41cf3152832e1753d28b79a7ea811a4 Mon Sep 17 00:00:00 2001 From: lloyd Date: Fri, 25 May 2012 02:11:10 +0000 Subject: 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. --- src/block/mars/mars.cpp | 2 ++ src/block/mars/mars.h | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/block/mars') diff --git a/src/block/mars/mars.cpp b/src/block/mars/mars.cpp index 64ece83ab..5badc40cc 100644 --- a/src/block/mars/mars.cpp +++ b/src/block/mars/mars.cpp @@ -326,6 +326,8 @@ void MARS::key_schedule(const byte key[], size_t length) T[length / 4] = static_cast(length) / 4; + EK.resize(40); + for(u32bit i = 0; i != 4; ++i) { T[ 0] ^= rotate_left(T[ 8] ^ T[13], 3) ^ (i ); diff --git a/src/block/mars/mars.h b/src/block/mars/mars.h index fc732ae10..488ea1b83 100644 --- a/src/block/mars/mars.h +++ b/src/block/mars/mars.h @@ -21,11 +21,9 @@ class BOTAN_DLL MARS : public Block_Cipher_Fixed_Params<16, 16, 32, 4> 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(EK); } + void clear() { EK.clear(); } std::string name() const { return "MARS"; } BlockCipher* clone() const { return new MARS; } - - MARS() : EK(40) {} private: void key_schedule(const byte[], size_t); -- cgit v1.2.3