Move the SecureVector typedef to secmem.h

No point making someone include a deprecated header to get this.

3 files changed, 6 insertions, 12 deletions

diff --git a/news.rst b/news.rst
index fd85fc2c7..986139102 100644
--- a/news.rst
+++ b/news.rst
@@ -171,6 +171,9 @@ Version 2.3.0, Not Yet Released
   intended for derivation. This keyword was already in use but was not
   applied consistently.
 
+* A typedef ``SecureVector`` has been added for the ``secure_vector`` type.
+  This makes porting code from 1.10 to 2.x API slightly simpler.
+
 * Header files have been cleaned up to remove uncessary inclusions. In some
   cases it may be required to include additional botan headers to get all the
   declarations that were previously visible. For example, ``bigint.h`` no longer
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)
    {