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

Use stdext::make_checked_array_iterator for reverse_copy on VS2008 and above (Issue 123)

pull/136/head
Jeffrey Walton 2016-02-05 02:43:08 -05:00
parent d55d7fe90a
commit f45813bd12
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
integer.cpp
View File

@ -2874,7 +2874,7 @@ signed long Integer::ConvertToLong() const
Integer::Integer(BufferedTransformation &encodedInteger, size_t byteCount, Signedness s, ByteOrder o) Integer::Integer(BufferedTransformation &encodedInteger, size_t byteCount, Signedness s, ByteOrder o)
{ {
assert(o == BIG_ENDIAN_ORDER || o == LITTLE_ENDIAN_ORDER); assert(o == BIG_ENDIAN_ORDER || o == LITTLE_ENDIAN_ORDER);
if(o == LITTLE_ENDIAN_ORDER) if(o == LITTLE_ENDIAN_ORDER)
{ {
SecByteBlock block(byteCount); SecByteBlock block(byteCount);
@ -2884,23 +2884,27 @@ Integer::Integer(BufferedTransformation &encodedInteger, size_t byteCount, Signe
Decode(block.begin(), block.size(), s); Decode(block.begin(), block.size(), s);
return; return;
} }
Decode(encodedInteger, byteCount, s); Decode(encodedInteger, byteCount, s);
} }
Integer::Integer(const byte *encodedInteger, size_t byteCount, Signedness s, ByteOrder o) Integer::Integer(const byte *encodedInteger, size_t byteCount, Signedness s, ByteOrder o)
{ {
assert(o == BIG_ENDIAN_ORDER || o == LITTLE_ENDIAN_ORDER); assert(o == BIG_ENDIAN_ORDER || o == LITTLE_ENDIAN_ORDER);
if(o == LITTLE_ENDIAN_ORDER) if(o == LITTLE_ENDIAN_ORDER)
{ {
SecByteBlock block(byteCount); SecByteBlock block(byteCount);
#if (CRYPTOPP_MSC_VERSION >= 1500)
std::reverse_copy(encodedInteger, encodedInteger+byteCount,
stdext::make_checked_array_iterator(block.begin(), block.size()));
#else
std::reverse_copy(encodedInteger, encodedInteger+byteCount, block.begin()); std::reverse_copy(encodedInteger, encodedInteger+byteCount, block.begin());
#endif
Decode(block.begin(), block.size(), s); Decode(block.begin(), block.size(), s);
return; return;
} }
Decode(encodedInteger, byteCount, s); Decode(encodedInteger, byteCount, s);
} }