propagate from branch 'net.randombit.botan' (head db3791f6bba4b57dd8aed17893565dc5bcd68f02)

            to branch 'net.randombit.botan.remove-libstate' (head 627d12447b2bb32aa08ff5daa499ac9580a77a05)

2 files changed, 25 insertions, 19 deletions

diff --git a/include/x509_ext.h b/include/x509_ext.h
index 2e7370fbd..13a58d7d5 100644
--- a/include/x509_ext.h
+++ b/include/x509_ext.h
@@ -50,14 +50,12 @@ class Extensions : public ASN1_Object
       void add(Certificate_Extension* extn)
          { extensions.push_back(extn); }
 
-      Extensions& operator=(const Extensions& e)
-         { return copy_this(e); }
+      Extensions& operator=(const Extensions&);
 
+      Extensions(const Extensions&);
       Extensions(bool st = true) : should_throw(st) {}
-      Extensions(const Extensions& e) : ASN1_Object() { copy_this(e); }
       ~Extensions();
    private:
-      Extensions& copy_this(const Extensions&);
       std::vector<Certificate_Extension*> extensions;
       bool should_throw;
    };
diff --git a/src/x509_ext.cpp b/src/x509_ext.cpp
index 65ea2872c..197a86004 100644
--- a/src/x509_ext.cpp
+++ b/src/x509_ext.cpp
@@ -18,6 +18,29 @@
 namespace Botan {
 
 /*************************************************
+* Extensions Copy Constructor                    *
+*************************************************/
+Extensions::Extensions(const Extensions& extensions) : ASN1_Object()
+   {
+   *this = extensions;
+   }
+
+/*************************************************
+* Extensions Assignment Operator                 *
+*************************************************/
+Extensions& Extensions::operator=(const Extensions& other)
+   {
+   for(u32bit j = 0; j != extensions.size(); ++j)
+      delete extensions[j];
+   extensions.clear();
+
+   for(u32bit j = 0; j != other.extensions.size(); ++j)
+      extensions.push_back(other.extensions[j]->copy());
+
+   return (*this);
+   }
+
+/*************************************************
 * Return the OID of this extension               *
 *************************************************/
 OID Certificate_Extension::oid_of() const
@@ -114,21 +137,6 @@ void Extensions::contents_to(Data_Store& subject_info,
    }
 
 /*************************************************
-* Copy another extensions list                   *
-*************************************************/
-Extensions& Extensions::copy_this(const Extensions& other)
-   {
-   for(u32bit j = 0; j != extensions.size(); ++j)
-      delete extensions[j];
-   extensions.clear();
-
-   for(u32bit j = 0; j != other.extensions.size(); ++j)
-      extensions.push_back(other.extensions[j]->copy());
-
-   return (*this);
-   }
-
-/*************************************************
 * Delete an Extensions list                      *
 *************************************************/
 Extensions::~Extensions()