diff options
author | djm <> | 2012-10-13 21:23:50 +0000 |
---|---|---|
committer | djm <> | 2012-10-13 21:23:50 +0000 |
commit | d56dbc3c72494d4b68c03f5bcc3ae1f9df7b17df (patch) | |
tree | 10ebe51c3542099b0ab8325d8f322372375dc3b4 /src/lib/libcrypto/modes/ofb128.c | |
parent | bc685bd401e5657f7fb51b4e1a62a7a5c5ea4098 (diff) | |
parent | 228cae30b117c2493f69ad3c195341cd6ec8d430 (diff) | |
download | openbsd-d56dbc3c72494d4b68c03f5bcc3ae1f9df7b17df.tar.gz openbsd-d56dbc3c72494d4b68c03f5bcc3ae1f9df7b17df.tar.bz2 openbsd-d56dbc3c72494d4b68c03f5bcc3ae1f9df7b17df.zip |
This commit was generated by cvs2git to track changes on a CVS vendor
branch.
Diffstat (limited to 'src/lib/libcrypto/modes/ofb128.c')
-rw-r--r-- | src/lib/libcrypto/modes/ofb128.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/lib/libcrypto/modes/ofb128.c b/src/lib/libcrypto/modes/ofb128.c index c732e2ec58..01c01702c4 100644 --- a/src/lib/libcrypto/modes/ofb128.c +++ b/src/lib/libcrypto/modes/ofb128.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,14 +59,6 @@ | |||
58 | #endif | 59 | #endif |
59 | #include <assert.h> | 60 | #include <assert.h> |
60 | 61 | ||
61 | #define 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 | #endif | ||
68 | |||
69 | /* The input and output encrypted as though 128bit ofb mode is being | 62 | /* The input and output encrypted as though 128bit ofb mode is being |
70 | * used. The extra state information to record how much of the | 63 | * used. The extra state information to record how much of the |
71 | * 128bit block we have used is contained in *num; | 64 | * 128bit block we have used is contained in *num; |