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.

2 files changed, 11 insertions, 8 deletions

diff --git a/src/pubkey/dl_group/dl_group.cpp b/src/pubkey/dl_group/dl_group.cpp
index 3904841ba..93bbcbb2d 100644
--- a/src/pubkey/dl_group/dl_group.cpp
+++ b/src/pubkey/dl_group/dl_group.cpp
@@ -90,7 +90,8 @@ DL_Group::DL_Group(RandomNumberGenerator& rng,
 * DL_Group Constructor
 */
 DL_Group::DL_Group(RandomNumberGenerator& rng,
-                   const MemoryRegion<byte>& seed, size_t pbits, size_t qbits)
+                   const std::vector<byte>& seed,
+                   size_t pbits, size_t qbits)
    {
    if(!generate_dsa_primes(rng,
                            global_state().algorithm_factory(),
@@ -202,7 +203,7 @@ const BigInt& DL_Group::get_q() const
 /*
 * DER encode the parameters
 */
-SecureVector<byte> DL_Group::DER_encode(Format format) const
+std::vector<byte> DL_Group::DER_encode(Format format) const
    {
    init_check();
 
@@ -217,7 +218,7 @@ SecureVector<byte> DL_Group::DER_encode(Format format) const
             .encode(q)
             .encode(g)
          .end_cons()
-      .get_contents();
+      .get_contents_unlocked();
       }
    else if(format == ANSI_X9_42)
       {
@@ -227,7 +228,7 @@ SecureVector<byte> DL_Group::DER_encode(Format format) const
             .encode(g)
             .encode(q)
          .end_cons()
-      .get_contents();
+      .get_contents_unlocked();
       }
    else if(format == PKCS_3)
       {
@@ -236,7 +237,7 @@ SecureVector<byte> DL_Group::DER_encode(Format format) const
             .encode(p)
             .encode(g)
          .end_cons()
-      .get_contents();
+      .get_contents_unlocked();
       }
 
    throw Invalid_Argument("Unknown DL_Group encoding " + std::to_string(format));
@@ -247,7 +248,8 @@ SecureVector<byte> DL_Group::DER_encode(Format format) const
 */
 std::string DL_Group::PEM_encode(Format format) const
    {
-   SecureVector<byte> encoding = DER_encode(format);
+   const std::vector<byte> encoding = DER_encode(format);
+
    if(format == PKCS_3)
       return PEM_Code::encode(encoding, "DH PARAMETERS");
    else if(format == ANSI_X9_57)
diff --git a/src/pubkey/dl_group/dl_group.h b/src/pubkey/dl_group/dl_group.h
index bfc2c04e5..aa90388ae 100644
--- a/src/pubkey/dl_group/dl_group.h
+++ b/src/pubkey/dl_group/dl_group.h
@@ -77,7 +77,7 @@ class BOTAN_DLL DL_Group
       * @param format the encoding format
       * @return string holding the DER encoded group
       */
-      SecureVector<byte> DER_encode(Format format) const;
+      std::vector<byte> DER_encode(Format format) const;
 
       /**
       * Decode a DER/BER encoded group into this instance.
@@ -131,7 +131,8 @@ class BOTAN_DLL DL_Group
       * @param pbits the desired bit size of the prime p
       * @param qbits the desired bit size of the prime q.
       */
-      DL_Group(RandomNumberGenerator& rng, const MemoryRegion<byte>& seed,
+      DL_Group(RandomNumberGenerator& rng,
+               const std::vector<byte>& seed,
                size_t pbits = 1024, size_t qbits = 0);
 
       /**