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, 4 insertions, 4 deletions

diff --git a/src/block/blowfish/blowfish.cpp b/src/block/blowfish/blowfish.cpp
index b6319eec0..9f5ac1724 100644
--- a/src/block/blowfish/blowfish.cpp
+++ b/src/block/blowfish/blowfish.cpp
@@ -143,7 +143,7 @@ void Blowfish::eks_key_schedule(const byte key[], size_t length,
 /*
 * Generate one of the Sboxes
 */
-void Blowfish::generate_sbox(MemoryRegion<u32bit>& box,
+void Blowfish::generate_sbox(secure_vector<u32bit>& box,
                              u32bit& L, u32bit& R,
                              const byte salt[16],
                              size_t salt_off) const
diff --git a/src/block/blowfish/blowfish.h b/src/block/blowfish/blowfish.h
index 13706d21e..5bec4b231 100644
--- a/src/block/blowfish/blowfish.h
+++ b/src/block/blowfish/blowfish.h
@@ -39,7 +39,7 @@ class BOTAN_DLL Blowfish : public Block_Cipher_Fixed_Params<8, 1, 56>
                          size_t key_length,
                          const byte salt[16]);
 
-      void generate_sbox(MemoryRegion<u32bit>& box,
+      void generate_sbox(secure_vector<u32bit>& box,
                          u32bit& L, u32bit& R,
                          const byte salt[16],
                          size_t salt_off) const;
@@ -47,8 +47,8 @@ class BOTAN_DLL Blowfish : public Block_Cipher_Fixed_Params<8, 1, 56>
       static const u32bit P_INIT[18];
       static const u32bit S_INIT[1024];
 
-      SecureVector<u32bit> S;
-      SecureVector<u32bit> P;
+      secure_vector<u32bit> S;
+      secure_vector<u32bit> P;
    };
 
 }