aboutsummaryrefslogtreecommitdiffstats
path: root/src/utils/datastor/datastor.h
diff options
context:
space:
mode:
authorlloyd <[email protected]>2012-05-18 20:32:36 +0000
committerlloyd <[email protected]>2012-05-18 20:32:36 +0000
commitc691561f3198f481c13457433efbccc1c9fcd898 (patch)
treea45ea2c5a30e0cb009fbcb68a61ef39332ff790c /src/utils/datastor/datastor.h
parentd76700f01c7ecac5633edf75f8d7408b46c5dbac (diff)
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.
Diffstat (limited to 'src/utils/datastor/datastor.h')
-rw-r--r--src/utils/datastor/datastor.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/utils/datastor/datastor.h b/src/utils/datastor/datastor.h
index 26a0d418c..b471f85e1 100644
--- a/src/utils/datastor/datastor.h
+++ b/src/utils/datastor/datastor.h
@@ -35,7 +35,7 @@ class BOTAN_DLL Data_Store
std::string get1(const std::string&) const;
- MemoryVector<byte> get1_memvec(const std::string&) const;
+ std::vector<byte> get1_memvec(const std::string&) const;
u32bit get1_u32bit(const std::string&, u32bit = 0) const;
bool has_value(const std::string&) const;
@@ -43,7 +43,8 @@ class BOTAN_DLL Data_Store
void add(const std::multimap<std::string, std::string>&);
void add(const std::string&, const std::string&);
void add(const std::string&, u32bit);
- void add(const std::string&, const MemoryRegion<byte>&);
+ void add(const std::string&, const secure_vector<byte>&);
+ void add(const std::string&, const std::vector<byte>&);
private:
std::multimap<std::string, std::string> contents;
};