diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2018-08-18 04:44:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-18 04:44:53 -0400 |
| commit | 4282f94712ee7b86c36fc656f377d2ce78532f0c (patch) | |
| tree | 6057c2539f6c7b3fd9daa6a83d1a6de5e8018392 /sosemanuk.h | |
| parent | 06cf2ede9e043b4c25eb3521cf67fcebb41b7629 (diff) | |
| download | cryptopp-git-4282f94712ee7b86c36fc656f377d2ce78532f0c.tar.gz | |
Disable X32 inline assembly (GH #686, PR #704)
Also use CRYPTOPP_DISABLE_XXX_ASM consistently. The pattern is needed for Clang which still can't compile Intel assembly language. Also see http://llvm.org/bugs/show_bug.cgi?id=24232.
Diffstat (limited to 'sosemanuk.h')
| -rw-r--r-- | sosemanuk.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sosemanuk.h b/sosemanuk.h index c9373b64..4261f5d6 100644 --- a/sosemanuk.h +++ b/sosemanuk.h @@ -10,16 +10,16 @@ #include "strciphr.h"
#include "secblock.h"
-// Clang due to "Inline assembly operands don't work with .intel_syntax"
-// https://llvm.org/bugs/show_bug.cgi?id=24232
+// Clang 3.3 integrated assembler crash on Linux. Clang 3.4 due to compiler
+// error with .intel_syntax, http://llvm.org/bugs/show_bug.cgi?id=24232
#if CRYPTOPP_BOOL_X32 || defined(CRYPTOPP_DISABLE_INTEL_ASM)
-# define CRYPTOPP_DISABLE_SOSEMANUK_ASM
+# define CRYPTOPP_DISABLE_SOSEMANUK_ASM 1
#endif
NAMESPACE_BEGIN(CryptoPP)
/// \brief Sosemanuk stream cipher information
- /// \since Crypto++ 5.5
+/// \since Crypto++ 5.5
struct SosemanukInfo : public VariableKeyLength<16, 1, 32, 1, SimpleKeyingInterface::UNIQUE_IV, 16>
{
CRYPTOPP_STATIC_CONSTEXPR const char* StaticAlgorithmName() {return "Sosemanuk";}
|