Clear clang-tidy warnings

This commit is contained in:
Jeffrey Walton 2018-01-02 00:15:34 -05:00
parent 5f083d652e
commit 58726498f1
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
4 changed files with 8 additions and 10 deletions

View File

@ -100,9 +100,8 @@ template<> struct EcRecommendedParameters<EC2N>
};
OID oid;
unsigned int t0, t1, t2, t3, t4;
const char *a, *b, *g, *n;
unsigned int h;
unsigned int h, t0, t1, t2, t3, t4;
};
template<> struct EcRecommendedParameters<ECP>
@ -118,8 +117,7 @@ template<> struct EcRecommendedParameters<ECP>
};
OID oid;
const char *p;
const char *a, *b, *g, *n;
const char *p, *a, *b, *g, *n;
unsigned int h;
};

View File

@ -87,7 +87,6 @@ void RC6::Dec::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byt
a = rotrMod(a-sptr[0], u) ^ t;
}
sptr -= 2;
d -= sTable[1];
b -= sTable[0];

View File

@ -85,7 +85,9 @@ X917RNG::X917RNG(BlockTransformation *c, const byte *seed, const byte *determini
}
// for FIPS 140-2
GenerateBlock(m_lastBlock, m_size);
// GenerateBlock(m_lastBlock, m_size);
ArraySink target(m_lastBlock, m_size);
GenerateIntoBufferedTransformation(target, DEFAULT_CHANNEL, m_size);
}
void X917RNG::GenerateIntoBufferedTransformation(BufferedTransformation &target, const std::string &channel, lword size)

View File

@ -2782,10 +2782,9 @@ bool ValidateSerpent()
std::cout << (pass1 && pass2 ? "passed:" : "FAILED:") << " Algorithm key lengths\n";
FileSource valdata(CRYPTOPP_DATA_DIR "TestData/serpentv.dat", true, new HexDecoder);
bool pass = true;
pass = BlockTransformationTest(FixedRoundsCipherFactory<SerpentEncryption, SerpentDecryption>(16), valdata, 5) && pass;
pass = BlockTransformationTest(FixedRoundsCipherFactory<SerpentEncryption, SerpentDecryption>(24), valdata, 4) && pass;
pass = BlockTransformationTest(FixedRoundsCipherFactory<SerpentEncryption, SerpentDecryption>(32), valdata, 3) && pass;
pass3 = BlockTransformationTest(FixedRoundsCipherFactory<SerpentEncryption, SerpentDecryption>(16), valdata, 5) && pass3;
pass3 = BlockTransformationTest(FixedRoundsCipherFactory<SerpentEncryption, SerpentDecryption>(24), valdata, 4) && pass3;
pass3 = BlockTransformationTest(FixedRoundsCipherFactory<SerpentEncryption, SerpentDecryption>(32), valdata, 3) && pass3;
return pass1 && pass2 && pass3;
}