From c691561f3198f481c13457433efbccc1c9fcd898 Mon Sep 17 00:00:00 2001
From: lloyd <lloyd@randombit.net>
Date: Fri, 18 May 2012 20:32:36 +0000
Subject: 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.

---
 src/cert/certstore/certstor.cpp | 8 ++++----
 src/cert/certstore/certstor.h   | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/cert/certstore')

diff --git a/src/cert/certstore/certstor.cpp b/src/cert/certstore/certstor.cpp
index 3cba2f39e..9c383d9e8 100644
--- a/src/cert/certstore/certstor.cpp
+++ b/src/cert/certstore/certstor.cpp
@@ -28,7 +28,7 @@ void Certificate_Store_Memory::add_certificate(const X509_Certificate& cert)
 std::vector<X509_Certificate>
 Certificate_Store_Memory::find_cert_by_subject_and_key_id(
    const X509_DN& subject_dn,
-   const MemoryRegion<byte>& key_id) const
+   const std::vector<byte>& key_id) const
    {
    std::vector<X509_Certificate> result;
 
@@ -37,7 +37,7 @@ Certificate_Store_Memory::find_cert_by_subject_and_key_id(
       // Only compare key ids if set in both call and in the cert
       if(key_id.size())
          {
-         MemoryVector<byte> skid = certs[i].subject_key_id();
+         std::vector<byte> skid = certs[i].subject_key_id();
 
          if(skid.size() && skid != key_id) // no match
             continue;
@@ -74,7 +74,7 @@ void Certificate_Store_Memory::add_crl(const X509_CRL& crl)
 std::vector<X509_CRL>
 Certificate_Store_Memory::find_crl_by_subject_and_key_id(
    const X509_DN& issuer_dn,
-   const MemoryRegion<byte>& key_id) const
+   const std::vector<byte>& key_id) const
    {
    std::vector<X509_CRL> result;
 
@@ -83,7 +83,7 @@ Certificate_Store_Memory::find_crl_by_subject_and_key_id(
       // Only compare key ids if set in both call and in the CRL
       if(key_id.size())
          {
-         MemoryVector<byte> akid = crls[i].authority_key_id();
+         std::vector<byte> akid = crls[i].authority_key_id();
 
          if(akid.size() && akid != key_id) // no match
             continue;
diff --git a/src/cert/certstore/certstor.h b/src/cert/certstore/certstor.h
index 374013984..a0526e1a6 100644
--- a/src/cert/certstore/certstor.h
+++ b/src/cert/certstore/certstor.h
@@ -39,7 +39,7 @@ class BOTAN_DLL Certificate_Store
       virtual std::vector<X509_Certificate>
          find_cert_by_subject_and_key_id(
             const X509_DN& subject_dn,
-            const MemoryRegion<byte>& key_id) const = 0;
+            const std::vector<byte>& key_id) const = 0;
 
       /**
       * Find CRLs by the DN and key id of the issuer
@@ -47,7 +47,7 @@ class BOTAN_DLL Certificate_Store
       virtual std::vector<X509_CRL>
          find_crl_by_subject_and_key_id(
             const X509_DN& issuer_dn,
-            const MemoryRegion<byte>& key_id) const = 0;
+            const std::vector<byte>& key_id) const = 0;
    };
 
 /**
@@ -64,11 +64,11 @@ class BOTAN_DLL Certificate_Store_Memory : public Certificate_Store
 
       std::vector<X509_Certificate> find_cert_by_subject_and_key_id(
          const X509_DN& subject_dn,
-         const MemoryRegion<byte>& key_id) const;
+         const std::vector<byte>& key_id) const;
 
       std::vector<X509_CRL> find_crl_by_subject_and_key_id(
          const X509_DN& issuer_dn,
-         const MemoryRegion<byte>& key_id) const;
+         const std::vector<byte>& key_id) const;
 
       Certificate_Store_Memory() {}
    private:
-- 
cgit v1.2.3