summaryrefslogtreecommitdiff
path: root/src/common/aes.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2005-09-24 16:37:24 +0000
committerNick Mathewson <nickm@torproject.org>2005-09-24 16:37:24 +0000
commitd661fde08265d017ab50a19cad34d48c208861c9 (patch)
tree4022067154701f8750ed311006e6a5238689031e /src/common/aes.c
parent225510f58ac44097fa59de183e477f44152696b2 (diff)
downloadtor-d661fde08265d017ab50a19cad34d48c208861c9.tar.gz
tor-d661fde08265d017ab50a19cad34d48c208861c9.zip
Possible fix to make aes build on woody
svn:r5139
Diffstat (limited to 'src/common/aes.c')
-rw-r--r--src/common/aes.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/common/aes.c b/src/common/aes.c
index 176e94a8a6..2dabdb18e4 100644
--- a/src/common/aes.c
+++ b/src/common/aes.c
@@ -26,10 +26,14 @@ const char aes_c_id[] = "$Id$";
#include <openssl/aes.h>
#endif
-#ifndef USE_OPENSSL_AES
/*======================================================================*/
/* From rijndael-alg-fst.h */
+typedef uint64_t u64;
+typedef uint32_t u32;
+typedef uint8_t u8;
+
+#ifndef USE_OPENSSL_AES
#define MAXKC (256/32)
#define MAXKB (256/8)
#define MAXNR 14
@@ -38,10 +42,6 @@ static int rijndaelKeySetupEnc(u32 rk[/*4*(Nr + 1)*/], const u8 cipherKey[], int
static void rijndaelEncrypt(const u32 rk[/*4*(Nr + 1)*/], int Nr, const u8 pt[16], u8 ct[16]);
#endif
-typedef uint64_t u64;
-typedef uint32_t u32;
-typedef uint8_t u8;
-
/*======================================================================*/
/* Interface to AES code, and counter implementation */