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

Cleanup datatest.cpp 

Switch to non-blocking rngs for Linux and Windows
pull/687/head
Jeffrey Walton 2018-07-10 17:34:55 -04:00
parent 004d213e29
commit 1836a7feb4
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
2 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
datatest.cpp
View File

@ -94,19 +94,6 @@ void RandomizedTransfer(BufferedTransformation &source, BufferedTransformation &
} }
} }
void RandomizedTransfer(std::string &source, BufferedTransformation &target, bool finish, const std::string &channel=DEFAULT_CHANNEL)
{
StringStore store(source);
while (store.MaxRetrievable() > (finish ? 0 : 4096))
{
byte buf[4096+64];
size_t start = Test::GlobalRNG().GenerateWord32(0, 63);
size_t len = Test::GlobalRNG().GenerateWord32(1, UnsignedMin(4096U, 3*store.MaxRetrievable()/2));
len = store.Get(buf+start, len);
target.ChannelPut(channel, buf+start, len);
}
}
void PutDecodedDatumInto(const TestData &data, const char *name, BufferedTransformation &target) void PutDecodedDatumInto(const TestData &data, const char *name, BufferedTransformation &target)
{ {
std::string s1 = GetRequiredDatum(data, name), s2; std::string s1 = GetRequiredDatum(data, name), s2;
@ -502,6 +489,7 @@ void TestSymmetricCipher(TestData &v, const NameValuePairs &overrideParameters)
xorbuf(reinterpret_cast<byte*>(&keybuf[0]), reinterpret_cast<const byte*>(&encrypted[0]), keybuf.size()); xorbuf(reinterpret_cast<byte*>(&keybuf[0]), reinterpret_cast<const byte*>(&encrypted[0]), keybuf.size());
cipher->SetKey(reinterpret_cast<const byte*>(&keybuf[0]), keybuf.size()); cipher->SetKey(reinterpret_cast<const byte*>(&keybuf[0]), keybuf.size());
} }
encrypted.assign(buf.begin(), buf.end()); encrypted.assign(buf.begin(), buf.end());
ciphertext = GetDecodedDatum(v, test == "EncryptionMCT" ? "Ciphertext" : "Plaintext"); ciphertext = GetDecodedDatum(v, test == "EncryptionMCT" ? "Ciphertext" : "Plaintext");
if (encrypted != ciphertext) if (encrypted != ciphertext)
@ -518,12 +506,14 @@ void TestSymmetricCipher(TestData &v, const NameValuePairs &overrideParameters)
StreamTransformationFilter encFilter(*encryptor, new StringSink(encrypted), StreamTransformationFilter encFilter(*encryptor, new StringSink(encrypted),
static_cast<BlockPaddingSchemeDef::BlockPaddingScheme>(paddingScheme)); static_cast<BlockPaddingSchemeDef::BlockPaddingScheme>(paddingScheme));
// StringStore pstore(plaintext); StringStore pstore(plaintext);
RandomizedTransfer(plaintext, encFilter, true); RandomizedTransfer(pstore, encFilter, true);
encFilter.MessageEnd(); encFilter.MessageEnd();
if (test != "EncryptXorDigest") if (test != "EncryptXorDigest")
{
ciphertext = GetDecodedDatum(v, "Ciphertext"); ciphertext = GetDecodedDatum(v, "Ciphertext");
}
else else
{ {
ciphertextXorDigest = GetDecodedDatum(v, "CiphertextXorDigest"); ciphertextXorDigest = GetDecodedDatum(v, "CiphertextXorDigest");
@ -544,8 +534,8 @@ void TestSymmetricCipher(TestData &v, const NameValuePairs &overrideParameters)
StreamTransformationFilter decFilter(*decryptor, new StringSink(decrypted), StreamTransformationFilter decFilter(*decryptor, new StringSink(decrypted),
static_cast<BlockPaddingSchemeDef::BlockPaddingScheme>(paddingScheme)); static_cast<BlockPaddingSchemeDef::BlockPaddingScheme>(paddingScheme));
// StringStore cstore(encrypted); StringStore cstore(encrypted);
RandomizedTransfer(encrypted, decFilter, true); RandomizedTransfer(cstore, decFilter, true);
decFilter.MessageEnd(); decFilter.MessageEnd();
if (decrypted != plaintext) if (decrypted != plaintext)
@ -556,8 +546,6 @@ void TestSymmetricCipher(TestData &v, const NameValuePairs &overrideParameters)
std::cout << "\n"; std::cout << "\n";
SignalTestFailure(); SignalTestFailure();
} }
encrypted.clear(); decrypted.clear();
} }
else else
{ {

4
test.cpp
View File

@ -125,11 +125,7 @@ ANONYMOUS_NAMESPACE_BEGIN
#if (CRYPTOPP_USE_AES_GENERATOR) #if (CRYPTOPP_USE_AES_GENERATOR)
OFB_Mode<AES>::Encryption s_globalRNG; OFB_Mode<AES>::Encryption s_globalRNG;
#else #else
# if defined(CRYPTOPP_WIN32_AVAILABLE)
NonblockingRng s_globalRNG; NonblockingRng s_globalRNG;
# else
BlockingRng s_globalRNG;
# endif
#endif #endif
NAMESPACE_END NAMESPACE_END