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

Switch to static local/accessor pattern to avoid initialization order issues amoung translation units

pull/35/head
Jeffrey Walton 2015-07-31 03:40:43 -04:00
parent b27ca38ad7
commit 3caada0a9e
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test.cpp
View File

@ -149,9 +149,9 @@ static const DebugTrapHandler g_dummyHandler;
#endif // __GNUC__ #endif // __GNUC__
#endif // CRYPTOPP_UNIX_AVAILABLE and not NDEBUG #endif // CRYPTOPP_UNIX_AVAILABLE and not NDEBUG
static OFB_Mode<AES>::Encryption s_globalRNG;
RandomNumberGenerator & GlobalRNG() RandomNumberGenerator & GlobalRNG()
{ {
static OFB_Mode<AES>::Encryption s_globalRNG;
return s_globalRNG; return s_globalRNG;
} }
@ -178,7 +178,9 @@ int CRYPTOPP_API main(int argc, char *argv[])
std::string seed = IntToString(time(NULL)); std::string seed = IntToString(time(NULL));
seed.resize(16); seed.resize(16);
s_globalRNG.SetKeyWithIV((byte *)seed.data(), 16, (byte *)seed.data());
OFB_Mode<AES>::Encryption& prng = static_cast<OFB_Mode<AES>::Encryption&>(GlobalRNG());
prng.SetKeyWithIV((byte *)seed.data(), 16, (byte *)seed.data());
std::string command, executableName, macFilename; std::string command, executableName, macFilename;
@ -828,7 +830,9 @@ bool Validate(int alg, bool thorough, const char *seedInput)
seed.resize(16); seed.resize(16);
std::cout << "Using seed: " << seed << std::endl; std::cout << "Using seed: " << seed << std::endl;
s_globalRNG.SetKeyWithIV((byte *)seed.data(), 16, (byte *)seed.data());
OFB_Mode<AES>::Encryption& prng = static_cast<OFB_Mode<AES>::Encryption&>(GlobalRNG());
prng.SetKeyWithIV((byte *)seed.data(), 16, (byte *)seed.data());
#ifdef _OPENMP #ifdef _OPENMP
int tc = 0; int tc = 0;