Ertuğrul Erata
60 lines
2.4 KiB
Diff
60 lines
2.4 KiB
Diff
--- src/botantools/botan/botan/secmem.h.orig 2012/01/14 16:09:19 1273507
|
|
+++ src/botantools/botan/botan/secmem.h 2012/01/14 17:12:15 1273508
|
|
@@ -191,15 +191,15 @@
|
|
{
|
|
public:
|
|
MemoryVector<T>& operator=(const MemoryRegion<T>& in)
|
|
- { if(this != &in) set(in); return (*this); }
|
|
+ { if(this != &in) this->set(in); return (*this); }
|
|
|
|
MemoryVector(u32bit n = 0) { MemoryRegion<T>::init(false, n); }
|
|
MemoryVector(const T in[], u32bit n)
|
|
- { MemoryRegion<T>::init(false); set(in, n); }
|
|
+ { MemoryRegion<T>::init(false); this->set(in, n); }
|
|
MemoryVector(const MemoryRegion<T>& in)
|
|
- { MemoryRegion<T>::init(false); set(in); }
|
|
+ { MemoryRegion<T>::init(false); this->set(in); }
|
|
MemoryVector(const MemoryRegion<T>& in1, const MemoryRegion<T>& in2)
|
|
- { MemoryRegion<T>::init(false); set(in1); append(in2); }
|
|
+ { MemoryRegion<T>::init(false); this->set(in1); append(in2); }
|
|
};
|
|
|
|
/*************************************************
|
|
@@ -210,15 +210,15 @@
|
|
{
|
|
public:
|
|
SecureVector<T>& operator=(const MemoryRegion<T>& in)
|
|
- { if(this != &in) set(in); return (*this); }
|
|
+ { if(this != &in) this->set(in); return (*this); }
|
|
|
|
SecureVector(u32bit n = 0) { MemoryRegion<T>::init(true, n); }
|
|
SecureVector(const T in[], u32bit n)
|
|
- { MemoryRegion<T>::init(true); set(in, n); }
|
|
+ { MemoryRegion<T>::init(true); this->set(in, n); }
|
|
SecureVector(const MemoryRegion<T>& in)
|
|
- { MemoryRegion<T>::init(true); set(in); }
|
|
+ { MemoryRegion<T>::init(true); this->set(in); }
|
|
SecureVector(const MemoryRegion<T>& in1, const MemoryRegion<T>& in2)
|
|
- { MemoryRegion<T>::init(true); set(in1); append(in2); }
|
|
+ { MemoryRegion<T>::init(true); this->set(in1); append(in2); }
|
|
};
|
|
|
|
/*************************************************
|
|
@@ -229,14 +229,14 @@
|
|
{
|
|
public:
|
|
SecureBuffer<T,L>& operator=(const SecureBuffer<T,L>& in)
|
|
- { if(this != &in) set(in); return (*this); }
|
|
+ { if(this != &in) this->set(in); return (*this); }
|
|
|
|
SecureBuffer() { MemoryRegion<T>::init(true, L); }
|
|
SecureBuffer(const T in[], u32bit n)
|
|
{ MemoryRegion<T>::init(true, L); copy(in, n); }
|
|
private:
|
|
SecureBuffer<T, L>& operator=(const MemoryRegion<T>& in)
|
|
- { if(this != &in) set(in); return (*this); }
|
|
+ { if(this != &in) this->set(in); return (*this); }
|
|
};
|
|
|
|
}
|