From c691561f3198f481c13457433efbccc1c9fcd898 Mon Sep 17 00:00:00 2001
From: lloyd <lloyd@randombit.net>
Date: Fri, 18 May 2012 20:32:36 +0000
Subject: 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.

---
 src/pubkey/dlies/dlies.h | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'src/pubkey/dlies/dlies.h')

diff --git a/src/pubkey/dlies/dlies.h b/src/pubkey/dlies/dlies.h
index 8e5c05852..9739afeb2 100644
--- a/src/pubkey/dlies/dlies.h
+++ b/src/pubkey/dlies/dlies.h
@@ -27,13 +27,14 @@ class BOTAN_DLL DLIES_Encryptor : public PK_Encryptor
 
       ~DLIES_Encryptor();
 
-      void set_other_key(const MemoryRegion<byte>&);
+      void set_other_key(const std::vector<byte>&);
    private:
-      SecureVector<byte> enc(const byte[], size_t,
-                             RandomNumberGenerator&) const;
+      std::vector<byte> enc(const byte[], size_t,
+                            RandomNumberGenerator&) const;
+
       size_t maximum_input_size() const;
 
-      SecureVector<byte> other_key, my_key;
+      std::vector<byte> other_key, my_key;
 
       PK_Key_Agreement ka;
       KDF* kdf;
@@ -55,9 +56,9 @@ class BOTAN_DLL DLIES_Decryptor : public PK_Decryptor
       ~DLIES_Decryptor();
 
    private:
-      SecureVector<byte> dec(const byte[], size_t) const;
+      secure_vector<byte> dec(const byte[], size_t) const;
 
-      SecureVector<byte> my_key;
+      std::vector<byte> my_key;
 
       PK_Key_Agreement ka;
       KDF* kdf;
-- 
cgit v1.2.3