diff options
author | Jeffrey Walton <noloader@gmail.com> | 2017-03-01 06:10:06 -0500 |
---|---|---|
committer | Jeffrey Walton <noloader@gmail.com> | 2017-03-01 06:10:06 -0500 |
commit | 5efb019d8bdc593b3c1a0b57d615b170c7dab02a (patch) | |
tree | e2c10e737542fd13ea50b58480e0791bbc455e47 /osrng.h | |
parent | 5fb2f5d45b9bb2cd86db5d01f4b30d606a2a4c80 (diff) | |
download | cryptopp-git-5efb019d8bdc593b3c1a0b57d615b170c7dab02a.tar.gz |
Add C++ nullptr support (Issue 383)
Diffstat (limited to 'osrng.h')
-rw-r--r-- | osrng.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -194,7 +194,7 @@ public: //! \details Internally, the generator uses SHA256 to extract the entropy from
//! from the seed and then stretch the material for the block cipher's key
//! and initialization vector.
- void Reseed(bool blocking = false, const byte *additionalEntropy = NULL, size_t length = 0);
+ void Reseed(bool blocking = false, const byte *additionalEntropy = NULLPTR, size_t length = 0);
//! \brief Deterministically reseed an AutoSeededX917RNG for testing
//! \param key the key to use for the deterministic reseeding
@@ -239,7 +239,7 @@ void AutoSeededX917RNG<BLOCK_CIPHER>::Reseed(bool blocking, const byte *input, s } // 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, NULL);
+ Reseed(key, BLOCK_CIPHER::DEFAULT_KEYLENGTH, seed, NULLPTR);
}
CRYPTOPP_DLL_TEMPLATE_CLASS AutoSeededX917RNG<AES>;
|