diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2018-07-01 22:20:45 -0400 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2018-07-01 22:20:45 -0400 |
| commit | 904e8ce2839b2effce4ad66b0da0bf4b468584af (patch) | |
| tree | 6d48ddefd3b5b4276f59609296d316895b2619f3 /bench1.cpp | |
| parent | 3b92255b8b599f753edcf6dbf9d7a177f5adf2a8 (diff) | |
| download | cryptopp-git-904e8ce2839b2effce4ad66b0da0bf4b468584af.tar.gz | |
Remove code to accomodate variable block size (GH #535)
This should have occured when we yanked the variable block size experiment
Diffstat (limited to 'bench1.cpp')
| -rw-r--r-- | bench1.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -296,18 +296,17 @@ void BenchMarkByName2(const char *factoryName, size_t keyLength = 0, const char std::string name(factoryName ? factoryName : "");
member_ptr<T_FactoryOutput> obj(ObjectFactoryRegistry<T_FactoryOutput>::Registry().CreateObject(name.c_str()));
- if (!keyLength)
+ if (keyLength == 0)
keyLength = obj->DefaultKeyLength();
- if (displayName)
+ if (displayName != NULLPTR)
name = displayName;
- else if (keyLength)
+ else if (keyLength != 0)
name += " (" + IntToString(keyLength * 8) + "-bit key)";
- const int blockSize = params.GetIntValueWithDefault(Name::BlockSize(), 0);
- obj->SetKey(defaultKey, keyLength, CombinedNameValuePairs(params, MakeParameters(Name::IV(), ConstByteArrayParameter(defaultKey, blockSize ? blockSize : obj->IVSize()), false)));
+ obj->SetKey(defaultKey, keyLength, CombinedNameValuePairs(params, MakeParameters(Name::IV(), ConstByteArrayParameter(defaultKey, obj->IVSize()), false)));
BenchMark(name.c_str(), *static_cast<T_Interface *>(obj.get()), g_allocatedTime);
- BenchMarkKeying(*obj, keyLength, CombinedNameValuePairs(params, MakeParameters(Name::IV(), ConstByteArrayParameter(defaultKey, blockSize ? blockSize : obj->IVSize()), false)));
+ BenchMarkKeying(*obj, keyLength, CombinedNameValuePairs(params, MakeParameters(Name::IV(), ConstByteArrayParameter(defaultKey, obj->IVSize()), false)));
}
template <class T_FactoryOutput>
|