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/hash/keccak/keccak.cpp b/src/hash/keccak/keccak.cpp
index 107055509..e34c0fd43 100644
--- a/src/hash/keccak/keccak.cpp
+++ b/src/hash/keccak/keccak.cpp
@@ -178,12 +178,12 @@ void Keccak_1600::add_data(const byte input[], size_t length)
 
 void Keccak_1600::final_result(byte output[])
    {
-   MemoryVector<byte> padding(bitrate / 8 - S_pos);
+   std::vector<byte> padding(bitrate / 8 - S_pos);
 
    padding[0] = 0x01;
    padding[padding.size()-1] |= 0x80;
 
-   add_data(padding, padding.size());
+   add_data(&padding[0], padding.size());
 
    /*
    * We never have to run the permutation again because we only support
diff --git a/src/hash/keccak/keccak.h b/src/hash/keccak/keccak.h
index 17ae632ba..e91a04d32 100644
--- a/src/hash/keccak/keccak.h
+++ b/src/hash/keccak/keccak.h
@@ -38,7 +38,7 @@ class BOTAN_DLL Keccak_1600 : public HashFunction
       void final_result(byte out[]);
 
       size_t output_bits, bitrate;
-      SecureVector<u64bit> S;
+      secure_vector<u64bit> S;
       size_t S_pos;
    };