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

Remove old comments from chacha.cpp 

This should have been done at 916c4484a2
pull/730/head
Jeffrey Walton 2018-10-23 08:12:02 -04:00
parent 4ad8fa9efe
commit 028a9f0494
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
chacha.cpp
View File

@ -12,9 +12,8 @@
NAMESPACE_BEGIN(CryptoPP) NAMESPACE_BEGIN(CryptoPP)
#if defined(CRYPTOPP_SSE2_INTRIN_AVAILABLE) #if defined(CRYPTOPP_SSE2_INTRIN_AVAILABLE)
extern extern void ChaCha_OperateKeystream_SSE2(KeystreamOperation operation, byte *output,
void ChaCha_OperateKeystream_SSE2(KeystreamOperation operation, byte *output, const word32 *state, size_t iterationCount, unsigned int rounds);
const word32 *state, size_t iterationCount, unsigned int rounds);
#endif #endif
#define CHACHA_QUARTER_ROUND(a,b,c,d) \ #define CHACHA_QUARTER_ROUND(a,b,c,d) \
@ -73,12 +72,6 @@ void ChaCha_Policy::CipherResynchronize(byte *keystreamBuffer, const byte *IV, s
void ChaCha_Policy::SeekToIteration(lword iterationCount) void ChaCha_Policy::SeekToIteration(lword iterationCount)
{ {
// TODO: these were Salsa20, and Wei re-arranged the state array for SSE2 operations.
// If we can generate some out-of-band test vectors, then test and implement. Also
// see the test vectors in salsa.txt and the use of Seek test argument.
// m_state[8] = (word32)iterationCount;
// m_state[5] = (word32)SafeRightShift<32>(iterationCount);
m_state[13] = (word32)iterationCount; m_state[13] = (word32)iterationCount;
m_state[12] = (word32)SafeRightShift<32>(iterationCount); m_state[12] = (word32)SafeRightShift<32>(iterationCount);
} }