diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2007-06-14 23:21:32 +1000 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2007-06-14 23:21:32 +1000 |
| commit | cb52017ad9024e4d72766a19f286addcdafc2374 (patch) | |
| tree | 739207c3be6c98d5efab88fbfdd93a403c1b568c /cipher-ctr.c | |
| parent | bed63112f5a1f52b255f03bc2f457eaab5001e0c (diff) | |
- (dtucker) [cipher-ctr.c umac.c openbsd-compat/openssl-compat.h] Move the
USE_BUILTIN_RIJNDAEL compat goop to openssl-compat.h so it can be
shared with umac.c. Allows building with OpenSSL 0.9.5 again including
umac support. With tim@ djm@, ok djm.
Diffstat (limited to 'cipher-ctr.c')
| -rw-r--r-- | cipher-ctr.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/cipher-ctr.c b/cipher-ctr.c index b24f3a42..3b86cc10 100644 --- a/cipher-ctr.c +++ b/cipher-ctr.c @@ -29,13 +29,7 @@ /* compatibility with old or broken OpenSSL versions */ #include "openbsd-compat/openssl-compat.h" -#ifdef USE_BUILTIN_RIJNDAEL -#include "rijndael.h" -#define AES_KEY rijndael_ctx -#define AES_BLOCK_SIZE 16 -#define AES_encrypt(a, b, c) rijndael_encrypt(c, a, b) -#define AES_set_encrypt_key(a, b, c) rijndael_set_key(c, (char *)a, b, 1) -#else +#ifndef USE_BUILTIN_RIJNDAEL #include <openssl/aes.h> #endif |