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

Remove rounds from ChaChaTLS 

Rounds are alwys 20 in the IETF implementation.
pull/795/head
Jeffrey Walton 2019-01-24 22:26:15 -05:00
parent 099f870c55
commit f23b58b73c
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
chacha.cpp
View File

@ -332,12 +332,12 @@ void ChaCha_Policy::OperateKeystream(KeystreamOperation operation,
std::string ChaChaTLS_Policy::AlgorithmName() const std::string ChaChaTLS_Policy::AlgorithmName() const
{ {
return std::string("ChaChaTLS")+IntToString(static_cast<unsigned int>(m_rounds)); return std::string("ChaChaTLS");
} }
std::string ChaChaTLS_Policy::AlgorithmProvider() const std::string ChaChaTLS_Policy::AlgorithmProvider() const
{ {
// Disable SIMD until we can generate large block test vectors // Disable SIMD until we obtain large block test vectors and handle wrap.
// https://mailarchive.ietf.org/arch/msg/saag/S0_YjVkzEx2s2bHd8KIzjK1CwZ4 // https://mailarchive.ietf.org/arch/msg/saag/S0_YjVkzEx2s2bHd8KIzjK1CwZ4
#if 0 #if 0
#if (CRYPTOPP_AVX2_AVAILABLE) #if (CRYPTOPP_AVX2_AVAILABLE)
@ -418,7 +418,7 @@ void ChaChaTLS_Policy::SeekToIteration(lword iterationCount)
unsigned int ChaChaTLS_Policy::GetAlignment() const unsigned int ChaChaTLS_Policy::GetAlignment() const
{ {
// Disable SIMD until we can generate large block test vectors // Disable SIMD until we obtain large block test vectors and handle wrap.
// https://mailarchive.ietf.org/arch/msg/saag/S0_YjVkzEx2s2bHd8KIzjK1CwZ4 // https://mailarchive.ietf.org/arch/msg/saag/S0_YjVkzEx2s2bHd8KIzjK1CwZ4
#if 0 #if 0
#if (CRYPTOPP_AVX2_AVAILABLE) #if (CRYPTOPP_AVX2_AVAILABLE)
@ -442,7 +442,7 @@ unsigned int ChaChaTLS_Policy::GetAlignment() const
unsigned int ChaChaTLS_Policy::GetOptimalBlockSize() const unsigned int ChaChaTLS_Policy::GetOptimalBlockSize() const
{ {
// Disable SIMD until we can generate large block test vectors // Disable SIMD until we obtain large block test vectors and handle wrap.
// https://mailarchive.ietf.org/arch/msg/saag/S0_YjVkzEx2s2bHd8KIzjK1CwZ4 // https://mailarchive.ietf.org/arch/msg/saag/S0_YjVkzEx2s2bHd8KIzjK1CwZ4
#if 0 #if 0
#if (CRYPTOPP_AVX2_AVAILABLE) #if (CRYPTOPP_AVX2_AVAILABLE)
@ -475,7 +475,7 @@ unsigned int ChaChaTLS_Policy::GetOptimalBlockSize() const
void ChaChaTLS_Policy::OperateKeystream(KeystreamOperation operation, void ChaChaTLS_Policy::OperateKeystream(KeystreamOperation operation,
byte *output, const byte *input, size_t iterationCount) byte *output, const byte *input, size_t iterationCount)
{ {
// Disable SIMD until we can generate large block test vectors // Disable SIMD until we obtain large block test vectors and handle wrap.
// https://mailarchive.ietf.org/arch/msg/saag/S0_YjVkzEx2s2bHd8KIzjK1CwZ4 // https://mailarchive.ietf.org/arch/msg/saag/S0_YjVkzEx2s2bHd8KIzjK1CwZ4
#if 0 #if 0
#if (CRYPTOPP_AVX2_AVAILABLE) #if (CRYPTOPP_AVX2_AVAILABLE)