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

Remove code to accomodate variable block size (GH #535) 

This should have occured when we yanked the variable block size experiment
pull/681/head
Jeffrey Walton 2018-07-01 22:20:45 -04:00
parent 3b92255b8b
commit 904e8ce283
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bench1.cpp
View File

@ -296,18 +296,17 @@ void BenchMarkByName2(const char *factoryName, size_t keyLength = 0, const char
std::string name(factoryName ? factoryName : ""); std::string name(factoryName ? factoryName : "");
member_ptr<T_FactoryOutput> obj(ObjectFactoryRegistry<T_FactoryOutput>::Registry().CreateObject(name.c_str())); member_ptr<T_FactoryOutput> obj(ObjectFactoryRegistry<T_FactoryOutput>::Registry().CreateObject(name.c_str()));
if (!keyLength) if (keyLength == 0)
keyLength = obj->DefaultKeyLength(); keyLength = obj->DefaultKeyLength();
if (displayName) if (displayName != NULLPTR)
name = displayName; name = displayName;
else if (keyLength) else if (keyLength != 0)
name += " (" + IntToString(keyLength * 8) + "-bit key)"; 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, obj->IVSize()), false)));
obj->SetKey(defaultKey, keyLength, CombinedNameValuePairs(params, MakeParameters(Name::IV(), ConstByteArrayParameter(defaultKey, blockSize ? blockSize : obj->IVSize()), false)));
BenchMark(name.c_str(), *static_cast<T_Interface *>(obj.get()), g_allocatedTime); 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> template <class T_FactoryOutput>