diff options
Diffstat (limited to 'lib/libcrypto/modes/cfb128.c')
| -rw-r--r-- | lib/libcrypto/modes/cfb128.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/lib/libcrypto/modes/cfb128.c b/lib/libcrypto/modes/cfb128.c index e5938c6137c..731cb2864aa 100644 --- a/lib/libcrypto/modes/cfb128.c +++ b/lib/libcrypto/modes/cfb128.c @@ -48,7 +48,8 @@ * */ -#include "modes.h" +#include <openssl/crypto.h> +#include "modes_lcl.h" #include <string.h> #ifndef MODES_DEBUG @@ -58,14 +59,6 @@ #endif #include <assert.h> -#define STRICT_ALIGNMENT -#if defined(__i386) || defined(__i386__) || \ - defined(__x86_64) || defined(__x86_64__) || \ - defined(_M_IX86) || defined(_M_AMD64) || defined(_M_X64) || \ - defined(__s390__) || defined(__s390x__) -# undef STRICT_ALIGNMENT -#endif - /* The input and output encrypted as though 128bit cfb mode is being * used. The extra state information to record how much of the * 128bit block we have used is contained in *num; @@ -90,7 +83,7 @@ void CRYPTO_cfb128_encrypt(const unsigned char *in, unsigned char *out, --len; n = (n+1) % 16; } -#if defined(STRICT_ALIGNMENT) +#ifdef __STRICT_ALIGNMENT if (((size_t)in|(size_t)out|(size_t)ivec)%sizeof(size_t) != 0) break; #endif @@ -135,7 +128,7 @@ void CRYPTO_cfb128_encrypt(const unsigned char *in, unsigned char *out, --len; n = (n+1) % 16; } -#if defined(STRICT_ALIGNMENT) +#ifdef __STRICT_ALIGNMENT if (((size_t)in|(size_t)out|(size_t)ivec)%sizeof(size_t) != 0) break; #endif |