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

Fixed ChaCha

pull/157/head
DevJPM 2016-04-26 21:57:00 +02:00
parent 7ae41dd708 040347968b
commit 9796e7a903
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
chacha.cpp
View File

@ -33,8 +33,11 @@ void ChaCha_Policy::CipherSetKey(const NameValuePairs &params, const byte *key,
if (!(m_rounds == 8 || m_rounds == 12 || m_rounds == 20)) if (!(m_rounds == 8 || m_rounds == 12 || m_rounds == 20))
throw InvalidRounds(ChaCha::StaticAlgorithmName(), m_rounds); throw InvalidRounds(ChaCha::StaticAlgorithmName(), m_rounds);
<<<<<<< HEAD
assert(length == 16 || length == 32); assert(length == 16 || length == 32);
=======
>>>>>>> origin/ChaCha-VarRounds
// "expand 16-byte k" or "expand 32-byte k" // "expand 16-byte k" or "expand 32-byte k"
m_state[0] = 0x61707865; m_state[0] = 0x61707865;