- djm@cvs.openbsd.org 2010/01/30 02:54:53

[openssh.git] / cipher-ctr.c

diff --git a/cipher-ctr.c b/cipher-ctr.c
index 9733b7d5603b91bda1c6f782c3f87010f36fc32b..3b86cc10bc69aae00567b76d5f7b6ed77dff3b06 100644 (file)
--- a/cipher-ctr.c
+++ b/cipher-ctr.c
@@ -18,6 +18,7 @@
 
 #include <sys/types.h>
 
+#include <stdarg.h>
 #include <string.h>
 
 #include <openssl/evp.h>
@@ -28,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