diff options
| author | Andy Polyakov <appro@openssl.org> | 2010-05-04 21:23:02 +0200 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2010-05-04 21:23:02 +0200 |
| commit | f472ec8c2f354314d278e11be567b43630acf090 (patch) | |
| tree | 24e207ad6d35b9e545289f26053527e2449deadf /crypto/modes/cbc128.c | |
| parent | Add ghash-armv4.pl. (diff) | |
| download | openssl-f472ec8c2f354314d278e11be567b43630acf090.tar.xz openssl-f472ec8c2f354314d278e11be567b43630acf090.zip | |
"Jumbo" update for crypto/modes:
- introduce common modes_lcl.h;
- ctr128.c: implement additional CRYPTO_ctr128_encrypt_ctr32 interface;
- gcm128.c: add omitted ARM initialization, remove ctx.ctr;
Diffstat (limited to 'crypto/modes/cbc128.c')
| -rw-r--r-- | crypto/modes/cbc128.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/crypto/modes/cbc128.c b/crypto/modes/cbc128.c index 8f8bd563b9..dbf5b45a21 100644 --- a/crypto/modes/cbc128.c +++ b/crypto/modes/cbc128.c @@ -48,7 +48,7 @@ * */ -#include "modes.h" +#include "modes_lcl.h" #include <string.h> #ifndef MODES_DEBUG @@ -58,12 +58,7 @@ #endif #include <assert.h> -#define STRICT_ALIGNMENT 1 -#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 +#ifndef STRICT_ALIGNMENT # define STRICT_ALIGNMENT 0 #endif |