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.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/pbe/pbes1/pbes1.h b/src/pbe/pbes1/pbes1.h
index e10cbbb53..bbdbd5b9d 100644
--- a/src/pbe/pbes1/pbes1.h
+++ b/src/pbe/pbes1/pbes1.h
@@ -40,7 +40,7 @@ class BOTAN_DLL PBE_PKCS5v15 : public PBE
    private:
       void set_key(const std::string&);
       void new_params(RandomNumberGenerator& rng);
-      MemoryVector<byte> encode_params() const;
+      std::vector<byte> encode_params() const;
       void decode_params(DataSource&);
       OID get_oid() const;
 
@@ -50,7 +50,7 @@ class BOTAN_DLL PBE_PKCS5v15 : public PBE
       BlockCipher* block_cipher;
       HashFunction* hash_function;
 
-      SecureVector<byte> salt, key, iv;
+      secure_vector<byte> salt, key, iv;
       size_t iterations;
       Pipe pipe;
    };