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

Clear lgtm findings 

The lgtm service asks for scoped calls to IsolatedInitialize. The code is a tad bit more readable, so we will clear the findings.
pull/853/head
Jeffrey Walton 2019-06-04 05:31:46 -04:00
parent 462bcc859d
commit 238578a808
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
2 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
basecode.h
View File

@ -36,7 +36,9 @@ public:
, m_outputBlockSize(0), m_bytePos(0), m_bitPos(0) , m_outputBlockSize(0), m_bytePos(0), m_bitPos(0)
{ {
Detach(attachment); Detach(attachment);
IsolatedInitialize(MakeParameters(Name::EncodingLookupArray(), alphabet) BaseN_Encoder::IsolatedInitialize(
MakeParameters
(Name::EncodingLookupArray(), alphabet)
(Name::Log2Base(), log2base) (Name::Log2Base(), log2base)
(Name::Pad(), padding != -1) (Name::Pad(), padding != -1)
(Name::PaddingByte(), byte(padding))); (Name::PaddingByte(), byte(padding)));
@ -78,7 +80,10 @@ public:
, m_outputBlockSize(0), m_bytePos(0), m_bitPos(0) , m_outputBlockSize(0), m_bytePos(0), m_bitPos(0)
{ {
Detach(attachment); Detach(attachment);
IsolatedInitialize(MakeParameters(Name::DecodingLookupArray(), lookup)(Name::Log2Base(), log2base)); BaseN_Decoder::IsolatedInitialize(
MakeParameters
(Name::DecodingLookupArray(), lookup)
(Name::Log2Base(), log2base));
} }
void IsolatedInitialize(const NameValuePairs &parameters); void IsolatedInitialize(const NameValuePairs &parameters);
@ -121,7 +126,9 @@ public:
: m_groupSize(0), m_counter(0) : m_groupSize(0), m_counter(0)
{ {
Detach(attachment); Detach(attachment);
IsolatedInitialize(MakeParameters(Name::GroupSize(), groupSize) Grouper::IsolatedInitialize(
MakeParameters
(Name::GroupSize(), groupSize)
(Name::Separator(), ConstByteArrayParameter(separator)) (Name::Separator(), ConstByteArrayParameter(separator))
(Name::Terminator(), ConstByteArrayParameter(terminator))); (Name::Terminator(), ConstByteArrayParameter(terminator)));
} }

23
filters.cpp
View File

@ -595,7 +595,9 @@ StreamTransformationFilter::StreamTransformationFilter(StreamTransformation &c,
m_isSpecial = m_cipher.IsLastBlockSpecial() && m_mandatoryBlockSize > 1; m_isSpecial = m_cipher.IsLastBlockSpecial() && m_mandatoryBlockSize > 1;
m_reservedBufferSize = STDMAX(2*m_mandatoryBlockSize, m_optimalBufferSize); m_reservedBufferSize = STDMAX(2*m_mandatoryBlockSize, m_optimalBufferSize);
FilterWithBufferedInput::IsolatedInitialize(MakeParameters(Name::BlockPaddingScheme(), padding)); FilterWithBufferedInput::IsolatedInitialize(
MakeParameters
(Name::BlockPaddingScheme(), padding));
} }
StreamTransformationFilter::StreamTransformationFilter(StreamTransformation &c, BufferedTransformation *attachment, BlockPaddingScheme padding, bool authenticated) StreamTransformationFilter::StreamTransformationFilter(StreamTransformation &c, BufferedTransformation *attachment, BlockPaddingScheme padding, bool authenticated)
@ -616,7 +618,9 @@ StreamTransformationFilter::StreamTransformationFilter(StreamTransformation &c,
m_isSpecial = m_cipher.IsLastBlockSpecial() && m_mandatoryBlockSize > 1; m_isSpecial = m_cipher.IsLastBlockSpecial() && m_mandatoryBlockSize > 1;
m_reservedBufferSize = STDMAX(2*m_mandatoryBlockSize, m_optimalBufferSize); m_reservedBufferSize = STDMAX(2*m_mandatoryBlockSize, m_optimalBufferSize);
IsolatedInitialize(MakeParameters(Name::BlockPaddingScheme(), padding)); FilterWithBufferedInput::IsolatedInitialize(
MakeParameters
(Name::BlockPaddingScheme(), padding));
} }
size_t StreamTransformationFilter::LastBlockSize(StreamTransformation &c, BlockPaddingScheme padding) size_t StreamTransformationFilter::LastBlockSize(StreamTransformation &c, BlockPaddingScheme padding)
@ -889,7 +893,10 @@ HashVerificationFilter::HashVerificationFilter(HashTransformation &hm, BufferedT
: FilterWithBufferedInput(attachment) : FilterWithBufferedInput(attachment)
, m_hashModule(hm), m_flags(0), m_digestSize(0), m_verified(false) , m_hashModule(hm), m_flags(0), m_digestSize(0), m_verified(false)
{ {
IsolatedInitialize(MakeParameters(Name::HashVerificationFilterFlags(), flags)(Name::TruncatedDigestSize(), truncatedDigestSize)); FilterWithBufferedInput::IsolatedInitialize(
MakeParameters
(Name::HashVerificationFilterFlags(), flags)
(Name::TruncatedDigestSize(), truncatedDigestSize));
} }
void HashVerificationFilter::InitializeDerivedAndReturnNewSizes(const NameValuePairs &parameters, size_t &firstSize, size_t &blockSize, size_t &lastSize) void HashVerificationFilter::InitializeDerivedAndReturnNewSizes(const NameValuePairs &parameters, size_t &firstSize, size_t &blockSize, size_t &lastSize)
@ -994,7 +1001,11 @@ AuthenticatedDecryptionFilter::AuthenticatedDecryptionFilter(AuthenticatedSymmet
, m_streamFilter(c, new OutputProxy(*this, false), padding, true) , m_streamFilter(c, new OutputProxy(*this, false), padding, true)
{ {
CRYPTOPP_ASSERT(!c.IsForwardTransformation() || c.IsSelfInverting()); CRYPTOPP_ASSERT(!c.IsForwardTransformation() || c.IsSelfInverting());
IsolatedInitialize(MakeParameters(Name::BlockPaddingScheme(), padding)(Name::AuthenticatedDecryptionFilterFlags(), flags)(Name::TruncatedDigestSize(), truncatedDigestSize)); FilterWithBufferedInput::IsolatedInitialize(
MakeParameters
(Name::BlockPaddingScheme(), padding)
(Name::AuthenticatedDecryptionFilterFlags(), flags)
(Name::TruncatedDigestSize(), truncatedDigestSize));
} }
void AuthenticatedDecryptionFilter::InitializeDerivedAndReturnNewSizes(const NameValuePairs &parameters, size_t &firstSize, size_t &blockSize, size_t &lastSize) void AuthenticatedDecryptionFilter::InitializeDerivedAndReturnNewSizes(const NameValuePairs &parameters, size_t &firstSize, size_t &blockSize, size_t &lastSize)
@ -1079,7 +1090,9 @@ SignatureVerificationFilter::SignatureVerificationFilter(const PK_Verifier &veri
: FilterWithBufferedInput(attachment) : FilterWithBufferedInput(attachment)
, m_verifier(verifier), m_flags(0), m_verified(0) , m_verifier(verifier), m_flags(0), m_verified(0)
{ {
IsolatedInitialize(MakeParameters(Name::SignatureVerificationFilterFlags(), flags)); FilterWithBufferedInput::IsolatedInitialize(
MakeParameters
(Name::SignatureVerificationFilterFlags(), flags));
} }
void SignatureVerificationFilter::InitializeDerivedAndReturnNewSizes(const NameValuePairs &parameters, size_t &firstSize, size_t &blockSize, size_t &lastSize) void SignatureVerificationFilter::InitializeDerivedAndReturnNewSizes(const NameValuePairs &parameters, size_t &firstSize, size_t &blockSize, size_t &lastSize)