5 files changed, 9 insertions, 15 deletions
diff --git a/src/cert/x509/x509_ca.cpp b/src/cert/x509/x509_ca.cpp
index 9633d1466..486d769ef 100644
--- a/src/cert/x509/x509_ca.cpp
+++ b/src/cert/x509/x509_ca.cpp
@@ -13,7 +13,6 @@
 #include <botan/parsing.h>
 #include <botan/lookup.h>
 #include <botan/oids.h>
-#include <botan/time.h>
 #include <botan/key_constraint.h>
 #include <algorithm>
 #include <typeinfo>
@@ -58,7 +57,7 @@ X509_Certificate X509_CA::sign_request(const PKCS10_Request& req,
    else
       {
       std::unique_ptr<Public_Key> key(req.subject_public_key());
-      constraints = X509::find_constraints(*key, req.constraints());
+      constraints = find_constraints(*key, req.constraints());
       }
 
    Extensions extensions;
diff --git a/src/cert/x509/x509_crl.cpp b/src/cert/x509/x509_crl.cpp
index 1d6393470..29495a627 100644
--- a/src/cert/x509/x509_crl.cpp
+++ b/src/cert/x509/x509_crl.cpp
@@ -51,14 +51,14 @@ bool X509_CRL::is_revoked(const X509_Certificate& cert) const
    if(cert.issuer_dn() != issuer_dn())
       return false;
 
-   MemoryVector<byte> crl_akid = authority_key_id();
-   MemoryVector<byte> cert_akid = cert.authority_key_id();
+   std::vector<byte> crl_akid = authority_key_id();
+   std::vector<byte> cert_akid = cert.authority_key_id();
 
    if(!crl_akid.empty() && !cert_akid.empty())
       if(crl_akid != cert_akid)
          return false;
 
-   MemoryVector<byte> cert_serial = cert.serial_number();
+   std::vector<byte> cert_serial = cert.serial_number();
 
    bool is_revoked = false;
 
diff --git a/src/cert/x509/x509_obj.cpp b/src/cert/x509/x509_obj.cpp
index af8be0384..4270dfec2 100644
--- a/src/cert/x509/x509_obj.cpp
+++ b/src/cert/x509/x509_obj.cpp
@@ -177,7 +177,7 @@ std::string X509_Object::hash_used_for_signature() const
 */
 bool X509_Object::check_signature(const Public_Key* pub_key) const
    {
-   std::unique_ptr<Public_Key> key(pub_key);
+   std::unique_ptr<const Public_Key> key(pub_key);
    return check_signature(*key);
    }
 
diff --git a/src/cert/x509/x509path.cpp b/src/cert/x509/x509path.cpp
index 1d0667f85..159787800 100644
--- a/src/cert/x509/x509path.cpp
+++ b/src/cert/x509/x509path.cpp
@@ -33,7 +33,7 @@ X509_Certificate find_issuing_cert(const X509_Certificate& cert,
                                    const std::vector<Certificate_Store*>& certstores)
    {
    const X509_DN issuer_dn = cert.issuer_dn();
-   const MemoryVector<byte> auth_key_id = cert.authority_key_id();
+   const std::vector<byte> auth_key_id = cert.authority_key_id();
 
    for(size_t i = 0; i != certstores.size(); ++i)
       {
@@ -55,7 +55,7 @@ std::vector<X509_CRL> find_crls_from(const X509_Certificate& cert,
                                      const std::vector<Certificate_Store*>& certstores)
    {
    const X509_DN issuer_dn = cert.subject_dn();
-   const MemoryVector<byte> auth_key_id = cert.subject_key_id();
+   const std::vector<byte> auth_key_id = cert.subject_key_id();
 
    for(size_t i = 0; i != certstores.size(); ++i)
       {
@@ -143,7 +143,7 @@ std::string Path_Validation_Result::result_string() const
          return "CA certificate not allowed to issue CRLs";
 
       default:
-         return "Unknown code " + to_string(m_result);
+         return "Unknown code " + std::to_string(m_result);
       }
     }
 
@@ -210,7 +210,7 @@ Path_Validation_Result x509_path_validate(
 
       const bool self_signed_ee_cert = (cert_path.size() == 1);
 
-      X509_Time current_time(system_time());
+      X509_Time current_time(std::chrono::system_clock::now());
 
       for(size_t i = 0; i != cert_path.size(); ++i)
          {
diff --git a/src/cert/x509/x509path.h b/src/cert/x509/x509path.h
index fc784d429..18129a236 100644
--- a/src/cert/x509/x509path.h
+++ b/src/cert/x509/x509path.h
@@ -10,12 +10,7 @@
 
 #include <botan/x509cert.h>
 #include <botan/certstor.h>
-<<<<<<< variant A
 #include <set>
->>>>>>> variant B
-#include <functional>
-####### Ancestor
-======= end
 
 namespace Botan {