aboutsummaryrefslogtreecommitdiffstats
path: root/src/asn1/asn1_int.cpp
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/asn1/asn1_int.cpp
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/asn1/asn1_int.cpp')
-rw-r--r--src/asn1/asn1_int.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/asn1/asn1_int.cpp b/src/asn1/asn1_int.cpp
index bb4a3ecf7..ff8eba54e 100644
--- a/src/asn1/asn1_int.cpp
+++ b/src/asn1/asn1_int.cpp
@@ -31,13 +31,13 @@ namespace ASN1 {
/*
* Put some arbitrary bytes into a SEQUENCE
*/
-SecureVector<byte> put_in_sequence(const MemoryRegion<byte>& contents)
+std::vector<byte> put_in_sequence(const std::vector<byte>& contents)
{
return DER_Encoder()
.start_cons(SEQUENCE)
.raw_bytes(contents)
.end_cons()
- .get_contents();
+ .get_contents_unlocked();
}
/*