summaryrefslogtreecommitdiffstats
path: root/crypto/modes
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2014-07-08 22:24:44 +0200
committerAndy Polyakov <appro@openssl.org>2014-07-09 22:45:38 +0200
commit2064e2db08eb90da711999445680d45c44483e82 (patch)
treeff1c8a72aa142e58a73b0380e16e03c2324250b7 /crypto/modes
parentde222838fe17a04b9694ad0e9c4604193c976fa7 (diff)
Please Clang's sanitizer.
PR: #3424,#3423,#3422 (cherry picked from commit 021e5043e524b1cb28a929ef902548a987c16e65)
Diffstat (limited to 'crypto/modes')
-rw-r--r--crypto/modes/cbc128.c2
-rw-r--r--crypto/modes/modes_lcl.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/crypto/modes/cbc128.c b/crypto/modes/cbc128.c
index 0e54f75470..8c9bdea4aa 100644
--- a/crypto/modes/cbc128.c
+++ b/crypto/modes/cbc128.c
@@ -59,7 +59,7 @@
#endif
#include <assert.h>
-#ifndef STRICT_ALIGNMENT
+#if !defined(STRICT_ALIGNMENT) && !defined(PEDANTIC)
# define STRICT_ALIGNMENT 0
#endif
diff --git a/crypto/modes/modes_lcl.h b/crypto/modes/modes_lcl.h
index 35d4d9fa53..2d7015aea6 100644
--- a/crypto/modes/modes_lcl.h
+++ b/crypto/modes/modes_lcl.h
@@ -26,6 +26,7 @@ typedef unsigned int u32;
typedef unsigned char u8;
#define STRICT_ALIGNMENT 1
+#ifndef PEDANTIC
#if defined(__i386) || defined(__i386__) || \
defined(__x86_64) || defined(__x86_64__) || \
defined(_M_IX86) || defined(_M_AMD64) || defined(_M_X64) || \
@@ -33,6 +34,7 @@ typedef unsigned char u8;
defined(__s390__) || defined(__s390x__)
# undef STRICT_ALIGNMENT
#endif
+#endif
#if !defined(PEDANTIC) && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
#if defined(__GNUC__) && __GNUC__>=2