Cleared issues 11,12,13 (Clang integrated assembler), 58 (RC rollup), 66 (Coverity rollup)

1 files changed, 24 insertions, 5 deletions

diff --git a/salsa.h b/salsa.h
index c2ab7059..df3ab32b 100644
--- a/salsa.h
+++ b/salsa.h
@@ -1,14 +1,26 @@
 // salsa.h - written and placed in the public domain by Wei Dai

 

+//! \file

+//! \headerfile salsa.h

+//! \brief Classes for Salsa encryption scheme

+

 #ifndef CRYPTOPP_SALSA_H

 #define CRYPTOPP_SALSA_H

 

 #include "strciphr.h"

 #include "secblock.h"

 

+// TODO: work around GCC 4.8+ issue with SSE2 ASM until the exact details are known

+//   and fix is released. Duplicate with "valgrind ./cryptest.exe tv salsa"

+// "Inline assembly operands don't work with .intel_syntax", http://llvm.org/bugs/show_bug.cgi?id=24232

+#if CRYPTOPP_BOOL_X32 || defined(CRYPTOPP_DISABLE_INTEL_ASM) || (CRYPTOPP_GCC_VERSION >= 40800)

+# define CRYPTOPP_DISABLE_SALSA_ASM

+#endif

+

 NAMESPACE_BEGIN(CryptoPP)

 

-//! _

+//! \class Salsa20_Info

+//! \brief Salsa block cipher information

 struct Salsa20_Info : public VariableKeyLength<32, 16, 32, 16, SimpleKeyingInterface::UNIQUE_IV, 8>

 {

 	static const char *StaticAlgorithmName() {return "Salsa20";}

@@ -22,7 +34,7 @@ protected:
 	void CipherResynchronize(byte *keystreamBuffer, const byte *IV, size_t length);

 	bool CipherIsRandomAccess() const {return true;}

 	void SeekToIteration(lword iterationCount);

-#if CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X64

+#if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64) && !defined(CRYPTOPP_DISABLE_SALSA_ASM)

 	unsigned int GetAlignment() const;

 	unsigned int GetOptimalBlockSize() const;

 #endif

@@ -31,14 +43,18 @@ protected:
 	int m_rounds;

 };

 

-/// <a href="http://www.cryptolounge.org/wiki/Salsa20">Salsa20</a>, variable rounds: 8, 12 or 20 (default 20)

+// <a href="http://www.cryptolounge.org/wiki/Salsa20">Salsa20</a>, variable rounds: 8, 12 or 20 (default 20)

+//! \class Salsa20

+//! \brief Salsa20 block cipher information

+//! \details Salsa20 provides a variable number of rounds: 8, 12 or 20. The default number of rounds is 20.

 struct Salsa20 : public Salsa20_Info, public SymmetricCipherDocumentation

 {

 	typedef SymmetricCipherFinal<ConcretePolicyHolder<Salsa20_Policy, AdditiveCipherTemplate<> >, Salsa20_Info> Encryption;

 	typedef Encryption Decryption;

 };

 

-//! _

+//! \class XSalsa20_Info

+//! \brief XSalsa20 block cipher information

 struct XSalsa20_Info : public FixedKeyLength<32, SimpleKeyingInterface::UNIQUE_IV, 24>

 {

 	static const char *StaticAlgorithmName() {return "XSalsa20";}

@@ -54,7 +70,10 @@ protected:
 	FixedSizeSecBlock<word32, 8> m_key;

 };

 

-/// <a href="http://www.cryptolounge.org/wiki/XSalsa20">XSalsa20</a>, variable rounds: 8, 12 or 20 (default 20)

+// <a href="http://www.cryptolounge.org/wiki/XSalsa20">XSalsa20</a>, variable rounds: 8, 12 or 20 (default 20)

+//! \class XSalsa20

+//! \brief XSalsa20 block cipher information

+//! \details XSalsa20 provides a variable number of rounds: 8, 12 or 20. The default number of rounds is 20.

 struct XSalsa20 : public XSalsa20_Info, public SymmetricCipherDocumentation

 {

 	typedef SymmetricCipherFinal<ConcretePolicyHolder<XSalsa20_Policy, AdditiveCipherTemplate<> >, XSalsa20_Info> Encryption;