8 files changed, 17 insertions, 17 deletions
diff --git a/src/stream/arc4/arc4.h b/src/stream/arc4/arc4.h
index e3df97f83..8f8de87b6 100644
--- a/src/stream/arc4/arc4.h
+++ b/src/stream/arc4/arc4.h
@@ -44,9 +44,9 @@ class BOTAN_DLL ARC4 : public StreamCipher
       const size_t SKIP;
 
       byte X, Y;
-      SecureVector<byte> state;
+      secure_vector<byte> state;
 
-      SecureVector<byte> buffer;
+      secure_vector<byte> buffer;
       size_t position;
    };
 
diff --git a/src/stream/ctr/ctr.h b/src/stream/ctr/ctr.h
index 64b43b0f5..9f391da7e 100644
--- a/src/stream/ctr/ctr.h
+++ b/src/stream/ctr/ctr.h
@@ -48,7 +48,7 @@ class BOTAN_DLL CTR_BE : public StreamCipher
       void increment_counter();
 
       BlockCipher* permutation;
-      SecureVector<byte> counter, buffer;
+      secure_vector<byte> counter, buffer;
       size_t position;
    };
 
diff --git a/src/stream/ofb/ofb.h b/src/stream/ofb/ofb.h
index c4d8b2601..9d4fd882f 100644
--- a/src/stream/ofb/ofb.h
+++ b/src/stream/ofb/ofb.h
@@ -47,7 +47,7 @@ class BOTAN_DLL OFB : public StreamCipher
       void key_schedule(const byte key[], size_t key_len);
 
       BlockCipher* permutation;
-      SecureVector<byte> buffer;
+      secure_vector<byte> buffer;
       size_t position;
    };
 
diff --git a/src/stream/salsa20/salsa20.cpp b/src/stream/salsa20/salsa20.cpp
index 7d062befe..65ee3d758 100644
--- a/src/stream/salsa20/salsa20.cpp
+++ b/src/stream/salsa20/salsa20.cpp
@@ -193,7 +193,7 @@ void Salsa20::set_iv(const byte iv[], size_t length)
       state[8] = load_le<u32bit>(iv, 2);
       state[9] = load_le<u32bit>(iv, 3);
 
-      SecureVector<u32bit> hsalsa(8);
+      secure_vector<u32bit> hsalsa(8);
       hsalsa20(&hsalsa[0], &state[0]);
 
       state[ 1] = hsalsa[0];
diff --git a/src/stream/salsa20/salsa20.h b/src/stream/salsa20/salsa20.h
index d9645015f..ac2a9b33a 100644
--- a/src/stream/salsa20/salsa20.h
+++ b/src/stream/salsa20/salsa20.h
@@ -38,8 +38,8 @@ class BOTAN_DLL Salsa20 : public StreamCipher
    private:
       void key_schedule(const byte key[], size_t key_len);
 
-      SecureVector<u32bit> state;
-      SecureVector<byte> buffer;
+      secure_vector<u32bit> state;
+      secure_vector<byte> buffer;
       size_t position;
    };
 
diff --git a/src/stream/turing/turing.cpp b/src/stream/turing/turing.cpp
index 697c660ed..c455185b0 100644
--- a/src/stream/turing/turing.cpp
+++ b/src/stream/turing/turing.cpp
@@ -17,7 +17,7 @@ namespace {
 /*
 * Perform an N-way PHT
 */
-inline void PHT(MemoryRegion<u32bit>& B)
+inline void PHT(secure_vector<u32bit>& B)
    {
    u32bit sum = 0;
    for(size_t i = 0; i < B.size() - 1; ++i)
@@ -284,7 +284,7 @@ void Turing::set_iv(const byte iv[], size_t length)
    if(!valid_iv_length(length))
       throw Invalid_IV_Length(name(), length);
 
-   SecureVector<u32bit> IV(length / 4);
+   secure_vector<u32bit> IV(length / 4);
    for(size_t i = 0; i != length; ++i)
       IV[i/4] = (IV[i/4] << 8) + iv[i];
 
diff --git a/src/stream/turing/turing.h b/src/stream/turing/turing.h
index aff314080..84bfbe9c0 100644
--- a/src/stream/turing/turing.h
+++ b/src/stream/turing/turing.h
@@ -45,10 +45,10 @@ class BOTAN_DLL Turing : public StreamCipher
       static const u32bit Q_BOX[256];
       static const byte SBOX[256];
 
-      SecureVector<u32bit> S0, S1, S2, S3;
-      SecureVector<u32bit> R;
-      SecureVector<u32bit> K;
-      SecureVector<byte> buffer;
+      secure_vector<u32bit> S0, S1, S2, S3;
+      secure_vector<u32bit> R;
+      secure_vector<u32bit> K;
+      secure_vector<byte> buffer;
       size_t position;
    };
 
diff --git a/src/stream/wid_wake/wid_wake.h b/src/stream/wid_wake/wid_wake.h
index 05842a574..ca8d9a316 100644
--- a/src/stream/wid_wake/wid_wake.h
+++ b/src/stream/wid_wake/wid_wake.h
@@ -45,10 +45,10 @@ class BOTAN_DLL WiderWake_41_BE : public StreamCipher
 
       void generate(size_t);
 
-      SecureVector<u32bit> T;
-      SecureVector<u32bit> state;
-      SecureVector<u32bit> t_key;
-      SecureVector<byte> buffer;
+      secure_vector<u32bit> T;
+      secure_vector<u32bit> state;
+      secure_vector<u32bit> t_key;
+      secure_vector<byte> buffer;
       size_t position;
    };