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

Fix unused variable warnings (GH #723)

pull/730/head
orangefour 2018-10-22 13:50:04 +02:00 committed by Jeffrey Walton
parent 8790467fac
commit 253f1ba5da
4 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
basecode.h
View File

@ -61,7 +61,7 @@ public:
/// \details padding is set to -1, which means use default padding. If not /// \details padding is set to -1, which means use default padding. If not
/// required, then the value must be set via IsolatedInitialize(). /// required, then the value must be set via IsolatedInitialize().
BaseN_Decoder(BufferedTransformation *attachment=NULLPTR) BaseN_Decoder(BufferedTransformation *attachment=NULLPTR)
: m_lookup(NULLPTR), m_padding(0), m_bitsPerChar(0) : m_lookup(NULLPTR), m_bitsPerChar(0)
, m_outputBlockSize(0), m_bytePos(0), m_bitPos(0) , m_outputBlockSize(0), m_bytePos(0), m_bitPos(0)
{Detach(attachment);} {Detach(attachment);}
@ -74,7 +74,7 @@ public:
/// \details padding is set to -1, which means use default padding. If not /// \details padding is set to -1, which means use default padding. If not
/// required, then the value must be set via IsolatedInitialize(). /// required, then the value must be set via IsolatedInitialize().
BaseN_Decoder(const int *lookup, int log2base, BufferedTransformation *attachment=NULLPTR) BaseN_Decoder(const int *lookup, int log2base, BufferedTransformation *attachment=NULLPTR)
: m_lookup(NULLPTR), m_padding(0), m_bitsPerChar(0) : m_lookup(NULLPTR), m_bitsPerChar(0)
, m_outputBlockSize(0), m_bytePos(0), m_bitPos(0) , m_outputBlockSize(0), m_bytePos(0), m_bitPos(0)
{ {
Detach(attachment); Detach(attachment);
@ -98,7 +98,7 @@ public:
private: private:
const int *m_lookup; const int *m_lookup;
int m_padding, m_bitsPerChar, m_outputBlockSize; int m_bitsPerChar, m_outputBlockSize;
int m_bytePos, m_bitPos; int m_bytePos, m_bitPos;
SecByteBlock m_outBuf; SecByteBlock m_outBuf;
}; };

1
cmake Submodule

@ -0,0 +1 @@
Subproject commit 2729870f277bd568a8e8183b5ba7799e0c2dbf96

2
fips140.cpp
View File

@ -36,10 +36,12 @@ PowerUpSelfTestStatus CRYPTOPP_API GetPowerUpSelfTestStatus()
return g_powerUpSelfTestStatus; return g_powerUpSelfTestStatus;
} }
#if CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2
// One variable for all threads for compatibility. Previously this // One variable for all threads for compatibility. Previously this
// was a ThreadLocalStorage variable, which is per-thread. Also see // was a ThreadLocalStorage variable, which is per-thread. Also see
// https://github.com/weidai11/cryptopp/issues/208 // https://github.com/weidai11/cryptopp/issues/208
static bool s_inProgress = false; static bool s_inProgress = false;
#endif
bool PowerUpSelfTestInProgressOnThisThread() bool PowerUpSelfTestInProgressOnThisThread()
{ {

9
rijndael.cpp
View File

@ -120,15 +120,6 @@ static volatile bool s_TeFilled = false, s_TdFilled = false;
ANONYMOUS_NAMESPACE_BEGIN ANONYMOUS_NAMESPACE_BEGIN
CRYPTOPP_ALIGN_DATA(16)
const word32 s_one[] = {0, 0, 0, 1<<24};
/* for 128-bit blocks, Rijndael never uses more than 10 rcon values */
CRYPTOPP_ALIGN_DATA(16)
const word32 s_rconLE[] = {
0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1B, 0x36
};
#if CRYPTOPP_BOOL_X64 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X86 #if CRYPTOPP_BOOL_X64 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X86
// Determine whether the range between begin and end overlaps // Determine whether the range between begin and end overlaps