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

Back-off assert in SecBlock 

Since removing the allocator overloards that handled the wipe mark, we have to route deallocate into the standard one. The standard one fires an assert for [now] normal operation
pull/489/head
Jeffrey Walton 2017-09-02 19:22:53 -04:00
parent a57cd5e193
commit 4a28391495
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
secblock.h
View File

@ -198,7 +198,7 @@ public:
return NULLPTR; return NULLPTR;
#if CRYPTOPP_BOOL_ALIGN16 #if CRYPTOPP_BOOL_ALIGN16
// TODO: should this need the test 'size*sizeof(T) >= 16'? // TODO: Does this need the test 'size*sizeof(T) >= 16'?
if (T_Align16 && size) if (T_Align16 && size)
return (pointer)AlignedAllocate(size*sizeof(T)); return (pointer)AlignedAllocate(size*sizeof(T));
#endif #endif
@ -216,7 +216,9 @@ public:
//! UnalignedDeallocate() used if T_Align16 is false. //! UnalignedDeallocate() used if T_Align16 is false.
void deallocate(void *ptr, size_type size) void deallocate(void *ptr, size_type size)
{ {
CRYPTOPP_ASSERT((ptr && size) || !(ptr || size)); // This will fire if SetMark(0) was called in the SecBlock
// Our self tests exercise it, disable it now.
// CRYPTOPP_ASSERT((ptr && size) || !(ptr || size));
SecureWipeArray((pointer)ptr, size); SecureWipeArray((pointer)ptr, size);
#if CRYPTOPP_BOOL_ALIGN16 #if CRYPTOPP_BOOL_ALIGN16