Merge 'master' into 'ecies'

pull/263/head
Jeffrey Walton 2016-09-09 06:33:42 -04:00
commit 96e818ace0
3 changed files with 6 additions and 3 deletions

View File

@ -1,7 +1,7 @@
// integer.h - written and placed in the public domain by Wei Dai
//! \file integer.h
//! \brief High performance arbitrary size integer class
//! \brief Multiple precision integer with arithmetic operations
#ifndef CRYPTOPP_INTEGER_H
#define CRYPTOPP_INTEGER_H

View File

@ -244,6 +244,9 @@ CRYPTOPP_DLL_TEMPLATE_CLASS AllocatorWithCleanup<byte>;
CRYPTOPP_DLL_TEMPLATE_CLASS AllocatorWithCleanup<word16>;
CRYPTOPP_DLL_TEMPLATE_CLASS AllocatorWithCleanup<word32>;
CRYPTOPP_DLL_TEMPLATE_CLASS AllocatorWithCleanup<word64>;
#if defined(CRYPTOPP_WORD128_AVAILABLE)
CRYPTOPP_DLL_TEMPLATE_CLASS AllocatorWithCleanup<word128, true>; // for Integer
#endif
#if CRYPTOPP_BOOL_X86
CRYPTOPP_DLL_TEMPLATE_CLASS AllocatorWithCleanup<word, true>; // for Integer
#endif

View File

@ -1229,7 +1229,7 @@ bool TestSecBlock()
try
{
static const unsigned int SIZE = 8;
SecBlockWithHint<word128, SIZE> block(SIZE);
SecBlock<word128, AllocatorWithCleanup<word128, true> > block(SIZE);
memset(block, 0xaa, block.SizeInBytes());
temp = true;