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.

2 files changed, 3 insertions, 3 deletions

diff --git a/src/block/misty1/misty1.cpp b/src/block/misty1/misty1.cpp
index d5d3513a2..1d032172d 100644
--- a/src/block/misty1/misty1.cpp
+++ b/src/block/misty1/misty1.cpp
@@ -204,7 +204,7 @@ void MISTY1::decrypt_n(const byte in[], byte out[], u32bit blocks) const
 */
 void MISTY1::key_schedule(const byte key[], u32bit length)
    {
-   SecureVector<u16bit, 32> KS;
+   SecureVector<u16bit> KS(32);
    for(u32bit j = 0; j != length / 2; ++j)
       KS[j] = load_be<u16bit>(key, j);
 
@@ -251,7 +251,7 @@ void MISTY1::key_schedule(const byte key[], u32bit length)
 /*
 * MISTY1 Constructor
 */
-MISTY1::MISTY1(u32bit rounds) : BlockCipher(8, 16)
+MISTY1::MISTY1(u32bit rounds) : BlockCipher(8, 16), EK(100), DK(100)
    {
    if(rounds != 8)
       throw Invalid_Argument("MISTY1: Invalid number of rounds: "
diff --git a/src/block/misty1/misty1.h b/src/block/misty1/misty1.h
index dbb8e2c45..7a9f1f9d9 100644
--- a/src/block/misty1/misty1.h
+++ b/src/block/misty1/misty1.h
@@ -33,7 +33,7 @@ class BOTAN_DLL MISTY1 : public BlockCipher
    private:
       void key_schedule(const byte[], u32bit);
 
-      SecureVector<u16bit, 100> EK, DK;
+      SecureVector<u16bit> EK, DK;
    };
 
 }