diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2015-11-18 15:32:28 -0500 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2015-11-18 15:32:28 -0500 |
| commit | 6ac1e46a1fb01f01705b67dd553d5ba317b1dc3e (patch) | |
| tree | f0d873d0b377a91dce5ee384e60426ef57efc92b /sosemanuk.h | |
| parent | d2fda9bd4231a7dfcb44e59150f11246d992843f (diff) | |
| download | cryptopp-git-6ac1e46a1fb01f01705b67dd553d5ba317b1dc3e.tar.gz | |
Cleared issues 11,12,13 (Clang integrated assembler), 58 (RC rollup), 66 (Coverity rollup)
Diffstat (limited to 'sosemanuk.h')
| -rw-r--r-- | sosemanuk.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sosemanuk.h b/sosemanuk.h index 5ea8c72c..d1025c20 100644 --- a/sosemanuk.h +++ b/sosemanuk.h @@ -4,7 +4,9 @@ #include "strciphr.h"
#include "secblock.h"
-#if CRYPTOPP_BOOL_X32
+// Clang due to "Inline assembly operands don't work with .intel_syntax"
+// https://llvm.org/bugs/show_bug.cgi?id=24232
+#if CRYPTOPP_BOOL_X32 || defined(CRYPTOPP_DISABLE_INTEL_ASM)
# define CRYPTOPP_DISABLE_SOSEMANUK_ASM
#endif
@@ -24,7 +26,7 @@ protected: void OperateKeystream(KeystreamOperation operation, byte *output, const byte *input, size_t iterationCount);
void CipherResynchronize(byte *keystreamBuffer, const byte *iv, size_t length);
bool CipherIsRandomAccess() const {return false;}
-#if CRYPTOPP_BOOL_X86 || (CRYPTOPP_BOOL_X32 && !defined(CRYPTOPP_DISABLE_SOSEMANUK_ASM)) || CRYPTOPP_BOOL_X64
+#if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64) && !defined(CRYPTOPP_DISABLE_SOSEMANUK_ASM)
unsigned int GetAlignment() const;
unsigned int GetOptimalBlockSize() const;
#endif
|