diff options
author | weidai <weidai11@users.noreply.github.com> | 2005-01-20 04:19:35 +0000 |
---|---|---|
committer | weidai <weidai11@users.noreply.github.com> | 2005-01-20 04:19:35 +0000 |
commit | b3924f2108c0b0825060e91f6fde8202ce35624d (patch) | |
tree | 1f61e8bf59450a028415e5a3f08565a6ceb86afe /osrng.h | |
parent | 79e29d0de49969af44474cc890cffd7b1d6b1a4b (diff) | |
download | cryptopp-git-b3924f2108c0b0825060e91f6fde8202ce35624d.tar.gz |
changes done for FIPS-140 lab code drop
Diffstat (limited to 'osrng.h')
-rw-r--r-- | osrng.h | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -78,7 +78,7 @@ protected: #endif -CRYPTOPP_DLL void OS_GenerateRandomBlock(bool blocking, byte *output, unsigned int size); +CRYPTOPP_DLL void CRYPTOPP_API OS_GenerateRandomBlock(bool blocking, byte *output, unsigned int size); //! Automaticly Seeded Randomness Pool /*! This class seeds itself using an operating system provided RNG. */ @@ -101,7 +101,7 @@ public: {Reseed(blocking);} void Reseed(bool blocking = false); // exposed for testing - void Reseed(const byte *key, unsigned int keylength, const byte *seed, unsigned long timeVector); + void Reseed(const byte *key, unsigned int keylength, const byte *seed, const byte *timeVector); byte GenerateByte(); @@ -115,7 +115,7 @@ private: CRYPTOPP_DLL_TEMPLATE_CLASS AutoSeededX917RNG<DES_EDE3>; template <class BLOCK_CIPHER> -void AutoSeededX917RNG<BLOCK_CIPHER>::Reseed(const byte *key, unsigned int keylength, const byte *seed, unsigned long timeVector) +void AutoSeededX917RNG<BLOCK_CIPHER>::Reseed(const byte *key, unsigned int keylength, const byte *seed, const byte *timeVector) { m_rng.reset(new X917RNG(new typename BLOCK_CIPHER::Encryption(key, keylength), seed, timeVector)); @@ -138,7 +138,7 @@ void AutoSeededX917RNG<BLOCK_CIPHER>::Reseed(bool blocking) } // check that seed and key don't have same value while (memcmp(key, seed, STDMIN((unsigned int)BLOCK_CIPHER::BLOCKSIZE, (unsigned int)BLOCK_CIPHER::DEFAULT_KEYLENGTH)) == 0); - Reseed(key, BLOCK_CIPHER::DEFAULT_KEYLENGTH, seed, 0); + Reseed(key, BLOCK_CIPHER::DEFAULT_KEYLENGTH, seed, NULL); } template <class BLOCK_CIPHER> |