diff options
| author | Richard Levitte <levitte@openssl.org> | 2002-02-16 12:20:34 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2002-02-16 12:20:34 +0000 |
| commit | 97879bcd57aa72555c624ae04b91159212c125d7 (patch) | |
| tree | b9b8747c4cce372db4cea3a2db03f0059714274e /crypto/aes/aes_core.c | |
| parent | ab1dee1efc39f7e18487323663d073e7a48ebeaf (diff) | |
| download | openssl-97879bcd57aa72555c624ae04b91159212c125d7.tar.gz | |
Add the modes OFB128, CFB128 and CTR128 to AES.
Submitted by Stephen Sprunk <stephen@sprunk.org>
Diffstat (limited to 'crypto/aes/aes_core.c')
| -rw-r--r-- | crypto/aes/aes_core.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/crypto/aes/aes_core.c b/crypto/aes/aes_core.c index a9bc1c0de4..937988dd8c 100644 --- a/crypto/aes/aes_core.c +++ b/crypto/aes/aes_core.c @@ -715,16 +715,6 @@ static const u32 rcon[] = { 0x1B000000, 0x36000000, /* for 128-bit blocks, Rijndael never uses more than 10 rcon values */ }; -#define SWAP(x) (_lrotl(x, 8) & 0x00ff00ff | _lrotr(x, 8) & 0xff00ff00) - -#ifdef _MSC_VER -#define GETU32(p) SWAP(*((u32 *)(p))) -#define PUTU32(ct, st) { *((u32 *)(ct)) = SWAP((st)); } -#else -#define GETU32(pt) (((u32)(pt)[0] << 24) ^ ((u32)(pt)[1] << 16) ^ ((u32)(pt)[2] << 8) ^ ((u32)(pt)[3])) -#define PUTU32(ct, st) { (ct)[0] = (u8)((st) >> 24); (ct)[1] = (u8)((st) >> 16); (ct)[2] = (u8)((st) >> 8); (ct)[3] = (u8)(st); } -#endif - /** * Expand the cipher key into the encryption key schedule. */ |