Remove SecureBuffer, which is the fixed-size variant of SecureVector.

Add a second template param to SecureVector which specifies the initial
length.

Change all callers to be SecureVector instead of SecureBuffer.

This can go away in C++0x, once compilers implement N2712 ("Non-static
data member initializers"), and we can just write code as

SecureVector<byte> P{18};

instead

2 files changed, 2 insertions, 2 deletions

diff --git a/src/block/rc2/rc2.cpp b/src/block/rc2/rc2.cpp
index b5e4a7d50..3114c6055 100644
--- a/src/block/rc2/rc2.cpp
+++ b/src/block/rc2/rc2.cpp
@@ -124,7 +124,7 @@ void RC2::key_schedule(const byte key[], u32bit length)
       0xC5, 0xF3, 0xDB, 0x47, 0xE5, 0xA5, 0x9C, 0x77, 0x0A, 0xA6, 0x20, 0x68,
       0xFE, 0x7F, 0xC1, 0xAD };
 
-   SecureBuffer<byte, 128> L;
+   SecureVector<byte, 128> L;
    L.copy(key, length);
 
    for(u32bit j = length; j != 128; ++j)
diff --git a/src/block/rc2/rc2.h b/src/block/rc2/rc2.h
index c6e4946f9..dd0295572 100644
--- a/src/block/rc2/rc2.h
+++ b/src/block/rc2/rc2.h
@@ -31,7 +31,7 @@ class BOTAN_DLL RC2 : public BlockCipher
    private:
       void key_schedule(const byte[], u32bit);
 
-      SecureBuffer<u16bit, 64> K;
+      SecureVector<u16bit, 64> K;
    };
 
 }