Latch previous ROUNDS in Salsa and ChaCha ciphers (GH #800, PR #804)

1 files changed, 2 insertions, 0 deletions

diff --git a/salsa.h b/salsa.h
index a42d684b..31bb9a67 100644
--- a/salsa.h
+++ b/salsa.h
@@ -36,6 +36,7 @@ struct Salsa20_Info : public VariableKeyLength<32, 16, 32, 16, SimpleKeyingInter
 class CRYPTOPP_NO_VTABLE Salsa20_Policy : public AdditiveCipherConcretePolicy<word32, 16>

 {

 protected:

+	Salsa20_Policy() : m_rounds(ROUNDS) {}

 	void CipherSetKey(const NameValuePairs &params, const byte *key, size_t length);

 	void OperateKeystream(KeystreamOperation operation, byte *output, const byte *input, size_t iterationCount);

 	void CipherResynchronize(byte *keystreamBuffer, const byte *IV, size_t length);

@@ -49,6 +50,7 @@ protected:
 

 	std::string AlgorithmProvider() const;

 

+	CRYPTOPP_CONSTANT(ROUNDS = 20)  // Default rounds

 	FixedSizeAlignedSecBlock<word32, 16> m_state;

 	int m_rounds;

 };