From a3757d89e10db017f9fec46e98bebd970d9e6ebf Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Fri, 30 Jul 2010 12:29:58 +0200
Subject: [PATCH] Provide access to the declarations of set() and append().
---
src/libs/3rdparty/botan/build/botan/secmem.h | 10 ++++++++++
src/libs/3rdparty/botan/src/alloc/secmem.h | 10 ++++++++++
2 files changed, 20 insertions(+)
diff --git a/src/libs/3rdparty/botan/build/botan/secmem.h b/src/libs/3rdparty/botan/build/botan/secmem.h
index d64a376ca0c..1e82353cce6 100644
--- a/src/libs/3rdparty/botan/build/botan/secmem.h
+++ b/src/libs/3rdparty/botan/build/botan/secmem.h
@@ -339,6 +339,9 @@ class MemoryVector : public MemoryRegion<T>
*/
MemoryVector(const MemoryRegion<T>& in1, const MemoryRegion<T>& in2)
{ MemoryRegion<T>::init(false); set(in1); append(in2); }
+
+ using MemoryRegion<T>::set;
+ using MemoryRegion<T>::append;
};
/**
@@ -393,6 +396,9 @@ class SecureVector : public MemoryRegion<T>
*/
SecureVector(const MemoryRegion<T>& in1, const MemoryRegion<T>& in2)
{ MemoryRegion<T>::init(true); set(in1); append(in2); }
+
+ using MemoryRegion<T>::set;
+ using MemoryRegion<T>::append;
};
/**
@@ -428,6 +434,10 @@ class SecureBuffer : public MemoryRegion<T>
*/
SecureBuffer(const T in[], u32bit n)
{ MemoryRegion<T>::init(true, L); copy(in, n); }
+
+ using MemoryRegion<T>::set;
+ using MemoryRegion<T>::copy;
+
private:
SecureBuffer<T, L>& operator=(const MemoryRegion<T>& in)
{ if(this != &in) set(in); return (*this); }
diff --git a/src/libs/3rdparty/botan/src/alloc/secmem.h b/src/libs/3rdparty/botan/src/alloc/secmem.h
index d64a376ca0c..1e82353cce6 100644
--- a/src/libs/3rdparty/botan/src/alloc/secmem.h
+++ b/src/libs/3rdparty/botan/src/alloc/secmem.h
@@ -339,6 +339,9 @@ class MemoryVector : public MemoryRegion<T>
*/
MemoryVector(const MemoryRegion<T>& in1, const MemoryRegion<T>& in2)
{ MemoryRegion<T>::init(false); set(in1); append(in2); }
+
+ using MemoryRegion<T>::set;
+ using MemoryRegion<T>::append;
};
/**
@@ -393,6 +396,9 @@ class SecureVector : public MemoryRegion<T>
*/
SecureVector(const MemoryRegion<T>& in1, const MemoryRegion<T>& in2)
{ MemoryRegion<T>::init(true); set(in1); append(in2); }
+
+ using MemoryRegion<T>::set;
+ using MemoryRegion<T>::append;
};
/**
@@ -428,6 +434,10 @@ class SecureBuffer : public MemoryRegion<T>
*/
SecureBuffer(const T in[], u32bit n)
{ MemoryRegion<T>::init(true, L); copy(in, n); }
+
+ using MemoryRegion<T>::set;
+ using MemoryRegion<T>::copy;
+
private:
SecureBuffer<T, L>& operator=(const MemoryRegion<T>& in)
{ if(this != &in) set(in); return (*this); }
--
GitLab