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/mars/mars.cpp b/src/block/mars/mars.cpp
index 6b73ea054..57a224fac 100644
--- a/src/block/mars/mars.cpp
+++ b/src/block/mars/mars.cpp
@@ -320,7 +320,7 @@ void MARS::decrypt_n(const byte in[], byte out[], u32bit blocks) const
 */
 void MARS::key_schedule(const byte key[], u32bit length)
    {
-   SecureBuffer<u32bit, 15> T;
+   SecureVector<u32bit, 15> T;
    for(u32bit j = 0; j != length / 4; ++j)
       T[j] = load_le<u32bit>(key, j);
    T[length / 4] = length / 4;
diff --git a/src/block/mars/mars.h b/src/block/mars/mars.h
index 7a598d2bd..f2a6d0197 100644
--- a/src/block/mars/mars.h
+++ b/src/block/mars/mars.h
@@ -26,7 +26,7 @@ class BOTAN_DLL MARS : public BlockCipher
    private:
       void key_schedule(const byte[], u32bit);
 
-      SecureBuffer<u32bit, 40> EK;
+      SecureVector<u32bit, 40> EK;
    };
 
 }