Merge GH #2452 Simplify some functions in secmem.h

2 files changed, 36 insertions, 50 deletions

diff --git a/src/lib/base/secmem.h b/src/lib/base/secmem.h
index 68dd4c678..a5ba5857a 100644
--- a/src/lib/base/secmem.h
+++ b/src/lib/base/secmem.h
@@ -71,38 +71,7 @@ template<typename T> using SecureVector = secure_vector<T>;
 template<typename T>
 std::vector<T> unlock(const secure_vector<T>& in)
    {
-   std::vector<T> out(in.size());
-   copy_mem(out.data(), in.data(), in.size());
-   return out;
-   }
-
-template<typename T, typename Alloc>
-size_t buffer_insert(std::vector<T, Alloc>& buf,
-                     size_t buf_offset,
-                     const T input[],
-                     size_t input_length)
-   {
-   BOTAN_ASSERT_NOMSG(buf_offset <= buf.size());
-   const size_t to_copy = std::min(input_length, buf.size() - buf_offset);
-   if(to_copy > 0)
-      {
-      copy_mem(&buf[buf_offset], input, to_copy);
-      }
-   return to_copy;
-   }
-
-template<typename T, typename Alloc, typename Alloc2>
-size_t buffer_insert(std::vector<T, Alloc>& buf,
-                     size_t buf_offset,
-                     const std::vector<T, Alloc2>& input)
-   {
-   BOTAN_ASSERT_NOMSG(buf_offset <= buf.size());
-   const size_t to_copy = std::min(input.size(), buf.size() - buf_offset);
-   if(to_copy > 0)
-      {
-      copy_mem(&buf[buf_offset], input.data(), to_copy);
-      }
-   return to_copy;
+   return std::vector<T>(in.begin(), in.end());
    }
 
 template<typename T, typename Alloc, typename Alloc2>
@@ -110,12 +79,8 @@ std::vector<T, Alloc>&
 operator+=(std::vector<T, Alloc>& out,
            const std::vector<T, Alloc2>& in)
    {
-   const size_t copy_offset = out.size();
-   out.resize(out.size() + in.size());
-   if(in.size() > 0)
-      {
-      copy_mem(&out[copy_offset], in.data(), in.size());
-      }
+   out.reserve(out.size() + in.size());
+   out.insert(out.end(), in.begin(), in.end());
    return out;
    }
 
@@ -130,12 +95,8 @@ template<typename T, typename Alloc, typename L>
 std::vector<T, Alloc>& operator+=(std::vector<T, Alloc>& out,
                                   const std::pair<const T*, L>& in)
    {
-   const size_t copy_offset = out.size();
-   out.resize(out.size() + in.second);
-   if(in.second > 0)
-      {
-      copy_mem(&out[copy_offset], in.first, in.second);
-      }
+   out.reserve(out.size() + in.second);
+   out.insert(out.end(), in.first, in.first + in.second);
    return out;
    }
 
@@ -143,12 +104,8 @@ template<typename T, typename Alloc, typename L>
 std::vector<T, Alloc>& operator+=(std::vector<T, Alloc>& out,
                                   const std::pair<T*, L>& in)
    {
-   const size_t copy_offset = out.size();
-   out.resize(out.size() + in.second);
-   if(in.second > 0)
-      {
-      copy_mem(&out[copy_offset], in.first, in.second);
-      }
+   out.reserve(out.size() + in.second);
+   out.insert(out.end(), in.first, in.first + in.second);
    return out;
    }
 
diff --git a/src/lib/utils/mem_ops.h b/src/lib/utils/mem_ops.h
index 15db4c365..deb4c01f2 100644
--- a/src/lib/utils/mem_ops.h
+++ b/src/lib/utils/mem_ops.h
@@ -224,6 +224,35 @@ template<typename T> inline bool same_mem(const T* p1, const T* p2, size_t n)
    return difference == 0;
    }
 
+template<typename T, typename Alloc>
+size_t buffer_insert(std::vector<T, Alloc>& buf,
+                     size_t buf_offset,
+                     const T input[],
+                     size_t input_length)
+   {
+   BOTAN_ASSERT_NOMSG(buf_offset <= buf.size());
+   const size_t to_copy = std::min(input_length, buf.size() - buf_offset);
+   if(to_copy > 0)
+      {
+      copy_mem(&buf[buf_offset], input, to_copy);
+      }
+   return to_copy;
+   }
+
+template<typename T, typename Alloc, typename Alloc2>
+size_t buffer_insert(std::vector<T, Alloc>& buf,
+                     size_t buf_offset,
+                     const std::vector<T, Alloc2>& input)
+   {
+   BOTAN_ASSERT_NOMSG(buf_offset <= buf.size());
+   const size_t to_copy = std::min(input.size(), buf.size() - buf_offset);
+   if(to_copy > 0)
+      {
+      copy_mem(&buf[buf_offset], input.data(), to_copy);
+      }
+   return to_copy;
+   }
+
 /**
 * XOR arrays. Postcondition out[i] = in[i] ^ out[i] forall i = 0...length
 * @param out the input/output buffer