summaryrefslogtreecommitdiff
path: root/cipher-ctr.c
diff options
context:
space:
mode:
authordtucker <dtucker>2007-06-14 13:21:32 +0000
committerdtucker <dtucker>2007-06-14 13:21:32 +0000
commitd909dec78ffbccff5f2c094544a40fdedf32b0fd (patch)
tree9ea3e99f59a456325369e4a1c81999ac1b7f370d /cipher-ctr.c
parentc03ff01610d787a7f9590095d6553309869bf6bb (diff)
downloadopenssh-d909dec78ffbccff5f2c094544a40fdedf32b0fd.tar.gz
- (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.c8
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