Fairly huge update that replaces the old secmem types with std::vector

using a custom allocator. Currently our allocator just does new/delete
with a memset before deletion, and the mmap and mlock allocators have
been removed.

2 files changed, 3 insertions, 3 deletions

diff --git a/src/block/serpent/serpent.cpp b/src/block/serpent/serpent.cpp
index b1e632c29..0f0a4fd63 100644
--- a/src/block/serpent/serpent.cpp
+++ b/src/block/serpent/serpent.cpp
@@ -358,7 +358,7 @@ void Serpent::key_schedule(const byte key[], size_t length)
    {
    const u32bit PHI = 0x9E3779B9;
 
-   SecureVector<u32bit> W(140);
+   secure_vector<u32bit> W(140);
    for(size_t i = 0; i != length / 4; ++i)
       W[i] = load_le<u32bit>(key, i);
 
diff --git a/src/block/serpent/serpent.h b/src/block/serpent/serpent.h
index df3f039aa..6191e50d7 100644
--- a/src/block/serpent/serpent.h
+++ b/src/block/serpent/serpent.h
@@ -31,7 +31,7 @@ class BOTAN_DLL Serpent : public Block_Cipher_Fixed_Params<16, 16, 32, 8>
       * For use by subclasses using SIMD, asm, etc
       * @return const reference to the key schedule
       */
-      const SecureVector<u32bit>& get_round_keys() const
+      const secure_vector<u32bit>& get_round_keys() const
          { return round_key; }
 
       /**
@@ -45,7 +45,7 @@ class BOTAN_DLL Serpent : public Block_Cipher_Fixed_Params<16, 16, 32, 8>
 
    private:
       void key_schedule(const byte key[], size_t length);
-      SecureVector<u32bit> round_key;
+      secure_vector<u32bit> round_key;
    };
 
 }