7 files changed, 11 insertions, 11 deletions
diff --git a/src/rng/hmac_rng/hmac_rng.cpp b/src/rng/hmac_rng/hmac_rng.cpp
index 311942c19..da7535b18 100644
--- a/src/rng/hmac_rng/hmac_rng.cpp
+++ b/src/rng/hmac_rng/hmac_rng.cpp
@@ -15,7 +15,7 @@ namespace Botan {
 namespace {
 
 void hmac_prf(MessageAuthenticationCode* prf,
-              MemoryRegion<byte>& K,
+              secure_vector<byte>& K,
               u32bit& counter,
               const std::string& label)
    {
@@ -200,7 +200,7 @@ HMAC_RNG::HMAC_RNG(MessageAuthenticationCode* extractor_mac,
    the estimated entropy counter is high enough. That variable is only
    set when a reseeding is performed.
    */
-   MemoryVector<byte> prf_key(extractor->output_length());
+   secure_vector<byte> prf_key(extractor->output_length());
    prf->set_key(prf_key);
 
    /*
diff --git a/src/rng/hmac_rng/hmac_rng.h b/src/rng/hmac_rng/hmac_rng.h
index fc6a14f3a..1e70c00a7 100644
--- a/src/rng/hmac_rng/hmac_rng.h
+++ b/src/rng/hmac_rng/hmac_rng.h
@@ -51,7 +51,7 @@ class BOTAN_DLL HMAC_RNG : public RandomNumberGenerator
       std::vector<EntropySource*> entropy_sources;
       bool seeded;
 
-      SecureVector<byte> K, io_buffer;
+      secure_vector<byte> K, io_buffer;
       size_t user_input_len;
       u32bit counter;
    };
diff --git a/src/rng/randpool/randpool.cpp b/src/rng/randpool/randpool.cpp
index 51354db12..ef55f3975 100644
--- a/src/rng/randpool/randpool.cpp
+++ b/src/rng/randpool/randpool.cpp
@@ -56,7 +56,7 @@ void Randpool::update_buffer()
 
    mac->update(static_cast<byte>(GEN_OUTPUT));
    mac->update(counter);
-   SecureVector<byte> mac_val = mac->final();
+   secure_vector<byte> mac_val = mac->final();
 
    for(size_t i = 0; i != mac_val.size(); ++i)
       buffer[i % buffer.size()] ^= mac_val[i];
@@ -112,7 +112,7 @@ void Randpool::reseed(size_t poll_bits)
          }
       }
 
-   SecureVector<byte> mac_val = mac->final();
+   secure_vector<byte> mac_val = mac->final();
 
    xor_buf(pool, mac_val, mac_val.size());
    mix_pool();
@@ -126,7 +126,7 @@ void Randpool::reseed(size_t poll_bits)
 */
 void Randpool::add_entropy(const byte input[], size_t length)
    {
-   SecureVector<byte> mac_val = mac->process(input, length);
+   secure_vector<byte> mac_val = mac->process(input, length);
    xor_buf(pool, mac_val, mac_val.size());
    mix_pool();
 
diff --git a/src/rng/randpool/randpool.h b/src/rng/randpool/randpool.h
index ed224221c..64572bcfb 100644
--- a/src/rng/randpool/randpool.h
+++ b/src/rng/randpool/randpool.h
@@ -52,7 +52,7 @@ class BOTAN_DLL Randpool : public RandomNumberGenerator
       MessageAuthenticationCode* mac;
 
       std::vector<EntropySource*> entropy_sources;
-      SecureVector<byte> pool, buffer, counter;
+      secure_vector<byte> pool, buffer, counter;
       bool seeded;
    };
 
diff --git a/src/rng/rng.h b/src/rng/rng.h
index c078ef08f..12b423e7c 100644
--- a/src/rng/rng.h
+++ b/src/rng/rng.h
@@ -37,9 +37,9 @@ class BOTAN_DLL RandomNumberGenerator
       * @param bytes number of bytes in the result
       * @return randomized vector of length bytes
       */
-      SecureVector<byte> random_vec(size_t bytes)
+      secure_vector<byte> random_vec(size_t bytes)
          {
-         SecureVector<byte> output(bytes);
+         secure_vector<byte> output(bytes);
          randomize(&output[0], output.size());
          return output;
          }
diff --git a/src/rng/x931_rng/x931_rng.cpp b/src/rng/x931_rng/x931_rng.cpp
index ac77b4344..7562c7ad5 100644
--- a/src/rng/x931_rng/x931_rng.cpp
+++ b/src/rng/x931_rng/x931_rng.cpp
@@ -40,7 +40,7 @@ void ANSI_X931_RNG::update_buffer()
    {
    const size_t BLOCK_SIZE = cipher->block_size();
 
-   SecureVector<byte> DT = prng->random_vec(BLOCK_SIZE);
+   secure_vector<byte> DT = prng->random_vec(BLOCK_SIZE);
    cipher->encrypt(DT);
 
    xor_buf(&R[0], &V[0], &DT[0], BLOCK_SIZE);
diff --git a/src/rng/x931_rng/x931_rng.h b/src/rng/x931_rng/x931_rng.h
index 41fa9328b..c8a1b8707 100644
--- a/src/rng/x931_rng/x931_rng.h
+++ b/src/rng/x931_rng/x931_rng.h
@@ -42,7 +42,7 @@ class BOTAN_DLL ANSI_X931_RNG : public RandomNumberGenerator
 
       BlockCipher* cipher;
       RandomNumberGenerator* prng;
-      SecureVector<byte> V, R;
+      secure_vector<byte> V, R;
       size_t position;
    };