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

Remove variable block size in datatest.cpp (GH #535)

pull/589/head
Jeffrey Walton 2018-02-18 11:57:26 -05:00
parent 3efef479d1
commit 8c4300a36c
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
datatest.cpp
View File

@ -401,9 +401,6 @@ void TestSymmetricCipher(TestData &v, const NameValuePairs &overrideParameters)
lastName = name; lastName = name;
} }
// Most block ciphers don't specify BlockSize. Kalyna and Threefish use it.
int blockSize = pairs.GetIntValueWithDefault(Name::BlockSize(), 0);
// Most block ciphers don't specify BlockPaddingScheme. Kalyna uses it in test vectors. // Most block ciphers don't specify BlockPaddingScheme. Kalyna uses it in test vectors.
// 0 is NoPadding, 1 is ZerosPadding, 2 is PkcsPadding, 3 is OneAndZerosPadding, etc // 0 is NoPadding, 1 is ZerosPadding, 2 is PkcsPadding, 3 is OneAndZerosPadding, etc
// Note: The machinery is wired such that paddingScheme is effectively latched. An // Note: The machinery is wired such that paddingScheme is effectively latched. An
@ -411,7 +408,7 @@ void TestSymmetricCipher(TestData &v, const NameValuePairs &overrideParameters)
int paddingScheme = pairs.GetIntValueWithDefault(Name::BlockPaddingScheme(), 0); int paddingScheme = pairs.GetIntValueWithDefault(Name::BlockPaddingScheme(), 0);
ConstByteArrayParameter iv; ConstByteArrayParameter iv;
if (pairs.GetValue(Name::IV(), iv) && iv.size() != encryptor->IVSize() && (int)iv.size() != blockSize) if (pairs.GetValue(Name::IV(), iv) && iv.size() != encryptor->IVSize())
SignalTestFailure(); SignalTestFailure();
if (test == "Resync") if (test == "Resync")