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

Remove EncryptBlockCipher 

The test mode EncryptBlockCipher is not needed. datatest.cpp is versatile enough to handle variable block sizes under test mode Encrypt
pull/416/head
Jeffrey Walton 2017-05-10 13:50:36 -04:00
parent 3bee1f57cf
commit 0de44edde1
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
TestVectors/Readme.txt
View File

@ -82,6 +82,5 @@ NotVerify - signature/digest/MAC verification should not pass
DeterministicSign - sign message using given seed, and the resulting DeterministicSign - sign message using given seed, and the resulting
signature should equal the given signature signature should equal the given signature
Encrypt - plaintext encrypts to ciphertext Encrypt - plaintext encrypts to ciphertext
EncryptBlockSize - plaintext encrypts to ciphertext under a key and blocksize
DecryptMatch - ciphertext decrypts to plaintext DecryptMatch - ciphertext decrypts to plaintext
(more to come here) (more to come here)

7
datatest.cpp
View File

@ -363,7 +363,7 @@ void TestSymmetricCipher(TestData &v, const NameValuePairs &overrideParameters)
TestDataNameValuePairs testDataPairs(v); TestDataNameValuePairs testDataPairs(v);
CombinedNameValuePairs pairs(overrideParameters, testDataPairs); CombinedNameValuePairs pairs(overrideParameters, testDataPairs);
if (test == "Encrypt" || test == "EncryptBlockSize" || test == "EncryptXorDigest" || test == "Resync" || test == "EncryptionMCT" || test == "DecryptionMCT") if (test == "Encrypt" || test == "EncryptXorDigest" || test == "Resync" || test == "EncryptionMCT" || test == "DecryptionMCT")
{ {
static member_ptr<SymmetricCipher> encryptor, decryptor; static member_ptr<SymmetricCipher> encryptor, decryptor;
static std::string lastName; static std::string lastName;
@ -375,9 +375,8 @@ void TestSymmetricCipher(TestData &v, const NameValuePairs &overrideParameters)
lastName = name; lastName = name;
} }
int blockSize = 0; // Most block ciphers don't specify this. Kalyna and Threefish use it.
if (test == "EncryptBlockSize" && !pairs.GetValue(Name::BlockSize(), blockSize)) int blockSize = pairs.GetIntValueWithDefault(Name::BlockSize(), 0);
SignalTestFailure();
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() && (int)iv.size() != blockSize)

1
regtest2.cpp
View File

@ -135,6 +135,7 @@ void RegisterFactories2()
RegisterSymmetricCipherDefaultFactories<ECB_Mode<SEED> >(); RegisterSymmetricCipherDefaultFactories<ECB_Mode<SEED> >();
RegisterSymmetricCipherDefaultFactories<CTR_Mode<SEED> >(); RegisterSymmetricCipherDefaultFactories<CTR_Mode<SEED> >();
RegisterSymmetricCipherDefaultFactories<ECB_Mode<Kalyna> >(); // Test Vectors RegisterSymmetricCipherDefaultFactories<ECB_Mode<Kalyna> >(); // Test Vectors
RegisterSymmetricCipherDefaultFactories<CBC_Mode<Kalyna> >(); // Test Vectors
RegisterSymmetricCipherDefaultFactories<CTR_Mode<Kalyna> >(); // Benchmarks RegisterSymmetricCipherDefaultFactories<CTR_Mode<Kalyna> >(); // Benchmarks
RegisterDefaultFactoryFor<KeyDerivationFunction, HKDF<SHA1> >(); RegisterDefaultFactoryFor<KeyDerivationFunction, HKDF<SHA1> >();