From ae59295ea945fdcc482df2233409a5f878fa20c7 Mon Sep 17 00:00:00 2001 From: lloyd Date: Tue, 14 Sep 2010 01:16:32 +0000 Subject: Completely remove the second parameter to SecureVector which specifies the initial/default length of the array, update all users to instead pass the value to the constructor. This is a old vestigal thing from a class (SecureBuffer) that used this compile-time constant in order to store the values in an array. However this was changed way back in 2002 to use the same allocator hooks as the rest of the containers, so the only advantage to using the length field was that the initial length was set and didn't have to be set in the constructor which was midly convenient. However this directly conflicts with the desire to be able to (eventually) use std::vector with a custom allocator, since of course vector doesn't support this. Fortunately almost all of the uses are in classes which have only a single constructor, so there is little to no duplication by instead initializing the size in the constructor. --- src/block/serpent/serpent.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/block/serpent/serpent.h') diff --git a/src/block/serpent/serpent.h b/src/block/serpent/serpent.h index 56afd3330..f980c602e 100644 --- a/src/block/serpent/serpent.h +++ b/src/block/serpent/serpent.h @@ -24,13 +24,13 @@ class BOTAN_DLL Serpent : public BlockCipher void clear() { zeroise(round_key); } std::string name() const { return "Serpent"; } BlockCipher* clone() const { return new Serpent; } - Serpent() : BlockCipher(16, 16, 32, 8) {} + Serpent() : BlockCipher(16, 16, 32, 8), round_key(132) {} protected: /** * For use by subclasses using SIMD, asm, etc * @return const reference to the key schedule */ - const SecureVector& get_round_keys() const + const SecureVector& get_round_keys() const { return round_key; } /** @@ -42,7 +42,7 @@ class BOTAN_DLL Serpent : public BlockCipher private: void key_schedule(const byte key[], u32bit length); - SecureVector round_key; + SecureVector round_key; }; } -- cgit v1.2.3