[or-cvs] Possible fix to make aes build on woody

[Nick Mathewson]

Update of /home/or/cvsroot/tor/src/common
In directory moria:/tmp/cvs-serv8252/src/common

Modified Files:
	aes.c 
Log Message:
Possible fix to make aes build on woody

Index: aes.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/common/aes.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- aes.c	23 Sep 2005 18:50:50 -0000	1.22
+++ aes.c	24 Sep 2005 16:37:24 -0000	1.23
@@ -26,10 +26,14 @@
 #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 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 */