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/kdf/kdf2/kdf2.cpp b/src/kdf/kdf2/kdf2.cpp
index 51b9e41ea..39a929b58 100644
--- a/src/kdf/kdf2/kdf2.cpp
+++ b/src/kdf/kdf2/kdf2.cpp
@@ -12,11 +12,11 @@ namespace Botan {
 /*
 * KDF2 Key Derivation Mechanism
 */
-SecureVector<byte> KDF2::derive(size_t out_len,
+secure_vector<byte> KDF2::derive(size_t out_len,
                                 const byte secret[], size_t secret_len,
                                 const byte P[], size_t P_len) const
    {
-   SecureVector<byte> output;
+   secure_vector<byte> output;
    u32bit counter = 1;
 
    while(out_len && counter)
@@ -25,7 +25,7 @@ SecureVector<byte> KDF2::derive(size_t out_len,
       hash->update_be(counter);
       hash->update(P, P_len);
 
-      SecureVector<byte> hash_result = hash->final();
+      secure_vector<byte> hash_result = hash->final();
 
       size_t added = std::min(hash_result.size(), out_len);
       output += std::make_pair(&hash_result[0], added);
diff --git a/src/kdf/kdf2/kdf2.h b/src/kdf/kdf2/kdf2.h
index e85fe6d1c..e33939df9 100644
--- a/src/kdf/kdf2/kdf2.h
+++ b/src/kdf/kdf2/kdf2.h
@@ -19,7 +19,7 @@ namespace Botan {
 class BOTAN_DLL KDF2 : public KDF
    {
    public:
-      SecureVector<byte> derive(size_t, const byte[], size_t,
+      secure_vector<byte> derive(size_t, const byte[], size_t,
                                 const byte[], size_t) const;
 
       std::string name() const { return "KDF2(" + hash->name() + ")"; }