From da1984cf643e522028cad032e786b49cabdc5355 Mon Sep 17 00:00:00 2001
From: Jack Lloyd <jack@randombit.net>
Date: Wed, 27 Sep 2017 06:18:53 -0400
Subject: Move the SecureVector typedef to secmem.h

No point making someone include a deprecated header to get this.
---
 src/lib/base/botan.h  | 12 ------------
 src/lib/base/secmem.h |  3 +++
 2 files changed, 3 insertions(+), 12 deletions(-)

(limited to 'src/lib/base')

diff --git a/src/lib/base/botan.h b/src/lib/base/botan.h
index e3886a6c7..ddea0d4ad 100644
--- a/src/lib/base/botan.h
+++ b/src/lib/base/botan.h
@@ -42,16 +42,4 @@
   #include <botan/pkcs8.h>
 #endif
 
-/*
-* The reason the name changed is because the types are not
-* completely compatible. But allow it as a standin
-*/
-
-namespace Botan {
-
-template<typename T>
-using SecureVector = secure_vector<T>;
-
-}
-
 #endif
diff --git a/src/lib/base/secmem.h b/src/lib/base/secmem.h
index 5b77ed925..9ae4431f5 100644
--- a/src/lib/base/secmem.h
+++ b/src/lib/base/secmem.h
@@ -122,6 +122,9 @@ operator!=(const secure_allocator<T>&, const secure_allocator<U>&)
 template<typename T> using secure_vector = std::vector<T, secure_allocator<T>>;
 template<typename T> using secure_deque = std::deque<T, secure_allocator<T>>;
 
+// For better compatability with 1.10 API
+template<typename T> using SecureVector = secure_vector<T>;
+
 template<typename T>
 std::vector<T> unlock(const secure_vector<T>& in)
    {
-- 
cgit v1.2.3