arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove deallocate() overload in SecBlock for AIX (GH #485)

pull/489/head
Jeffrey Walton 2017-08-31 11:23:37 -04:00
parent ea07825127
commit d8b30e1bd4
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 1 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
secblock.h
View File

@ -219,28 +219,6 @@ public:
CRYPTOPP_ASSERT((ptr && size) || !(ptr || size)); CRYPTOPP_ASSERT((ptr && size) || !(ptr || size));
SecureWipeArray((pointer)ptr, size); SecureWipeArray((pointer)ptr, size);
#if CRYPTOPP_BOOL_ALIGN16
if (T_Align16 && size)
return AlignedDeallocate(ptr);
#endif
UnalignedDeallocate(ptr);
}
//! \brief Deallocates a block of memory
//! \param ptr the pointer for the allocation
//! \param size the size of the allocation, in elements
//! \param mark the count elements to zeroize
//! \details Internally, SecureWipeArray() is called before deallocating the memory.
//! Once the memory block is wiped or zeroized, AlignedDeallocate() or
//! UnalignedDeallocate() is called.
//! \details AlignedDeallocate() is used if T_Align16 is true.
//! UnalignedDeallocate() used if T_Align16 is false.
void deallocate(void *ptr, size_type size, size_type mark)
{
CRYPTOPP_ASSERT((ptr && size) || !(ptr || size));
SecureWipeArray((pointer)ptr, STDMIN(size, mark));
#if CRYPTOPP_BOOL_ALIGN16 #if CRYPTOPP_BOOL_ALIGN16
if (T_Align16 && size) if (T_Align16 && size)
return AlignedDeallocate(ptr); return AlignedDeallocate(ptr);
@ -424,28 +402,6 @@ public:
m_fallbackAllocator.deallocate(ptr, size); m_fallbackAllocator.deallocate(ptr, size);
} }
//! \brief Deallocates a block of memory
//! \param ptr a pointer to the memory block to deallocate
//! \param size the count elements in the memory block
//! \param mark the count elements to zeroize
//! \details The memory block is wiped or zeroized before deallocation.
//! If the statically allocated memory block is active, then no
//! additional actions are taken after the wipe.
//! \details If a dynamic memory block is active, then the pointer and
//! size are passed to the allocator for deallocation.
void deallocate(void *ptr, size_type size, size_type mark)
{
if (ptr == GetAlignedArray())
{
CRYPTOPP_ASSERT(size <= S);
CRYPTOPP_ASSERT(m_allocated);
m_allocated = false;
SecureWipeArray((pointer)ptr, STDMIN(size, mark));
}
else
m_fallbackAllocator.deallocate(ptr, size, mark);
}
//! \brief Reallocates a block of memory //! \brief Reallocates a block of memory
//! \param oldPtr the previous allocation //! \param oldPtr the previous allocation
//! \param oldSize the size of the previous allocation //! \param oldSize the size of the previous allocation
@ -567,7 +523,7 @@ public:
} }
~SecBlock() ~SecBlock()
{m_alloc.deallocate(m_ptr, m_size, m_mark);} {m_alloc.deallocate(m_ptr, STDMIN(m_size, m_mark));}
#ifdef __BORLANDC__ #ifdef __BORLANDC__
operator T *() const operator T *() const