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

4 files changed, 11 insertions, 11 deletions

diff --git a/src/stream/arc4/arc4.h b/src/stream/arc4/arc4.h
index ae37cb165..07633f9ef 100644
--- a/src/stream/arc4/arc4.h
+++ b/src/stream/arc4/arc4.h
@@ -34,8 +34,8 @@ class BOTAN_DLL ARC4 : public StreamCipher
 
       const u32bit SKIP;
 
-      SecureBuffer<byte, DEFAULT_BUFFERSIZE> buffer;
-      SecureBuffer<u32bit, 256> state;
+      SecureVector<byte, DEFAULT_BUFFERSIZE> buffer;
+      SecureVector<u32bit, 256> state;
       u32bit X, Y, position;
    };
 
diff --git a/src/stream/salsa20/salsa20.h b/src/stream/salsa20/salsa20.h
index af7ddd145..67fe54dda 100644
--- a/src/stream/salsa20/salsa20.h
+++ b/src/stream/salsa20/salsa20.h
@@ -34,8 +34,8 @@ class BOTAN_DLL Salsa20 : public StreamCipher
    private:
       void key_schedule(const byte key[], u32bit key_len);
 
-      SecureBuffer<u32bit, 16> state;
-      SecureBuffer<byte, 64> buffer;
+      SecureVector<u32bit, 16> state;
+      SecureVector<byte, 64> buffer;
       u32bit position;
    };
 
diff --git a/src/stream/turing/turing.h b/src/stream/turing/turing.h
index 7291647ea..19d151fca 100644
--- a/src/stream/turing/turing.h
+++ b/src/stream/turing/turing.h
@@ -37,10 +37,10 @@ class BOTAN_DLL Turing : public StreamCipher
       static const u32bit Q_BOX[256];
       static const byte SBOX[256];
 
-      SecureBuffer<u32bit, 256> S0, S1, S2, S3;
-      SecureBuffer<u32bit, 17> R;
+      SecureVector<u32bit, 256> S0, S1, S2, S3;
+      SecureVector<u32bit, 17> R;
       SecureVector<u32bit> K;
-      SecureBuffer<byte, 340> buffer;
+      SecureVector<byte, 340> buffer;
       u32bit position;
    };
 
diff --git a/src/stream/wid_wake/wid_wake.h b/src/stream/wid_wake/wid_wake.h
index 23e1eacab..1c52e8ba1 100644
--- a/src/stream/wid_wake/wid_wake.h
+++ b/src/stream/wid_wake/wid_wake.h
@@ -33,10 +33,10 @@ class BOTAN_DLL WiderWake_41_BE : public StreamCipher
 
       void generate(u32bit);
 
-      SecureBuffer<byte, DEFAULT_BUFFERSIZE> buffer;
-      SecureBuffer<u32bit, 256> T;
-      SecureBuffer<u32bit, 5> state;
-      SecureBuffer<u32bit, 4> t_key;
+      SecureVector<byte, DEFAULT_BUFFERSIZE> buffer;
+      SecureVector<u32bit, 256> T;
+      SecureVector<u32bit, 5> state;
+      SecureVector<u32bit, 4> t_key;
       u32bit position;
    };