diff options
| author | djm <> | 2012-10-13 21:23:50 +0000 |
|---|---|---|
| committer | djm <> | 2012-10-13 21:23:50 +0000 |
| commit | 228cae30b117c2493f69ad3c195341cd6ec8d430 (patch) | |
| tree | 29ff00b10d52c0978077c4fd83c33b065bade73e /src/lib/libcrypto/modes/cbc128.c | |
| parent | 731838c66b52c0ae5888333005b74115a620aa96 (diff) | |
| download | openbsd-228cae30b117c2493f69ad3c195341cd6ec8d430.tar.gz openbsd-228cae30b117c2493f69ad3c195341cd6ec8d430.tar.bz2 openbsd-228cae30b117c2493f69ad3c195341cd6ec8d430.zip | |
import OpenSSL-1.0.1c
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libcrypto/modes/cbc128.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/lib/libcrypto/modes/cbc128.c b/src/lib/libcrypto/modes/cbc128.c index 8f8bd563b9..3d3782cbe1 100644 --- a/src/lib/libcrypto/modes/cbc128.c +++ b/src/lib/libcrypto/modes/cbc128.c | |||
| @@ -48,7 +48,8 @@ | |||
| 48 | * | 48 | * |
| 49 | */ | 49 | */ |
| 50 | 50 | ||
| 51 | #include "modes.h" | 51 | #include <openssl/crypto.h> |
| 52 | #include "modes_lcl.h" | ||
| 52 | #include <string.h> | 53 | #include <string.h> |
| 53 | 54 | ||
| 54 | #ifndef MODES_DEBUG | 55 | #ifndef MODES_DEBUG |
| @@ -58,12 +59,7 @@ | |||
| 58 | #endif | 59 | #endif |
| 59 | #include <assert.h> | 60 | #include <assert.h> |
| 60 | 61 | ||
| 61 | #define STRICT_ALIGNMENT 1 | 62 | #ifndef STRICT_ALIGNMENT |
| 62 | #if defined(__i386) || defined(__i386__) || \ | ||
| 63 | defined(__x86_64) || defined(__x86_64__) || \ | ||
| 64 | defined(_M_IX86) || defined(_M_AMD64) || defined(_M_X64) || \ | ||
| 65 | defined(__s390__) || defined(__s390x__) | ||
| 66 | # undef STRICT_ALIGNMENT | ||
| 67 | # define STRICT_ALIGNMENT 0 | 63 | # define STRICT_ALIGNMENT 0 |
| 68 | #endif | 64 | #endif |
| 69 | 65 | ||