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

Increase m_buf size (GH #862)

pull/867/head
Jeffrey Walton 2019-07-10 15:54:48 -04:00
parent 6d69043403
commit 8260dd1e81
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cryptlib.cpp
View File

@ -764,22 +764,15 @@ size_t BufferedTransformation::PutWord64(word64 value, ByteOrder order, bool blo
return ChannelPutWord64(DEFAULT_CHANNEL, value, order, blocking); return ChannelPutWord64(DEFAULT_CHANNEL, value, order, blocking);
} }
// Issue 340
#if CRYPTOPP_GCC_DIAGNOSTIC_AVAILABLE
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wconversion"
# pragma GCC diagnostic ignored "-Wsign-conversion"
#endif
size_t BufferedTransformation::PeekWord16(word16 &value, ByteOrder order) const size_t BufferedTransformation::PeekWord16(word16 &value, ByteOrder order) const
{ {
byte buf[2] = {0, 0}; byte buf[2] = {0, 0};
size_t len = Peek(buf, 2); size_t len = Peek(buf, 2);
if (order == BIG_ENDIAN_ORDER) if (order == BIG_ENDIAN_ORDER)
value = (buf[0] << 8) | buf[1]; value = ((word16)buf[0] << 8) | (word16)buf[1];
else else
value = (buf[1] << 8) | buf[0]; value = ((word16)buf[1] << 8) | (word16)buf[0];
return len; return len;
} }
@ -790,9 +783,11 @@ size_t BufferedTransformation::PeekWord32(word32 &value, ByteOrder order) const
size_t len = Peek(buf, 4); size_t len = Peek(buf, 4);
if (order == BIG_ENDIAN_ORDER) if (order == BIG_ENDIAN_ORDER)
value = (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf [3]; value = ((word32)buf[0] << 24) | ((word32)buf[1] << 16) |
((word32)buf[2] << 8) | (word32)buf[3];
else else
value = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf [0]; value = ((word32)buf[3] << 24) | ((word32)buf[2] << 16) |
((word32)buf[1] << 8) | (word32)buf[0];
return len; return len;
} }
@ -814,11 +809,6 @@ size_t BufferedTransformation::PeekWord64(word64 &value, ByteOrder order) const
return len; return len;
} }
// Issue 340
#if CRYPTOPP_GCC_DIAGNOSTIC_AVAILABLE
# pragma GCC diagnostic pop
#endif
size_t BufferedTransformation::GetWord16(word16 &value, ByteOrder order) size_t BufferedTransformation::GetWord16(word16 &value, ByteOrder order)
{ {
return (size_t)Skip(PeekWord16(value, order)); return (size_t)Skip(PeekWord16(value, order));

5
cryptlib.h
View File

@ -2306,7 +2306,10 @@ protected:
{return propagation != 0 ? propagation - 1 : 0;} {return propagation != 0 ? propagation - 1 : 0;}
private: private:
byte m_buf[4]; // for ChannelPutWord16 and ChannelPutWord32, to ensure buffer isn't deallocated before non-blocking operation completes // for ChannelPutWord16, ChannelPutWord32 and ChannelPutWord64,
// to ensure the buffer isn't deallocated before non-blocking
// operation completes
byte m_buf[8];
}; };
/// \brief An input discarding BufferedTransformation /// \brief An input discarding BufferedTransformation