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 /panama.cpp | |
parent | 5fb2f5d45b9bb2cd86db5d01f4b30d606a2a4c80 (diff) | |
download | cryptopp-git-5efb019d8bdc593b3c1a0b57d615b170c7dab02a.tar.gz |
Add C++ nullptr support (Issue 383)
Diffstat (limited to 'panama.cpp')
-rw-r--r-- | panama.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -440,7 +440,7 @@ void PanamaHash<B>::TruncatedFinal(byte *hash, size_t size) this->Iterate(32); // pull
FixedSizeSecBlock<word32, 8> buf;
- this->Iterate(1, NULL, buf.BytePtr(), NULL);
+ this->Iterate(1, NULLPTR, buf.BytePtr(), NULLPTR);
memcpy(hash, buf, size);
@@ -479,7 +479,7 @@ void PanamaCipherPolicy<B>::CipherResynchronize(byte *keystreamBuffer, const byt #if (CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE)) && !defined(CRYPTOPP_DISABLE_PANAMA_ASM)
if (B::ToEnum() == LITTLE_ENDIAN_ORDER && HasSSE2() && !IsP4()) // SSE2 code is slower on P4 Prescott
- Panama_SSE2_Pull(32, this->m_state, NULL, NULL);
+ Panama_SSE2_Pull(32, this->m_state, NULLPTR, NULLPTR);
else
#endif
this->Iterate(32);
@@ -504,7 +504,7 @@ void PanamaCipherPolicy<B>::OperateKeystream(KeystreamOperation operation, byte Panama_SSE2_Pull(iterationCount, this->m_state, (word32 *)(void *)output, (const word32 *)(void *)input);
else
#endif
- this->Iterate(iterationCount, NULL, output, input, operation);
+ this->Iterate(iterationCount, NULLPTR, output, input, operation);
}
template class Panama<BigEndian>;
|