[gs-cvs] rev 8869 - trunk/gs/src

[giles at ghostscript.com]

Author: giles
Date: 2008-07-23 17:42:01 -0700 (Wed, 23 Jul 2008)
New Revision: 8869

Modified:
   trunk/gs/src/aes.c
   trunk/gs/src/aes.h
Log:
Fix some compile problems in Brian Gladman's AES implementation
and disable 'on the fly keying' routines we don't need.


Modified: trunk/gs/src/aes.c
===================================================================
--- trunk/gs/src/aes.c	2008-07-23 23:29:39 UTC (rev 8868)
+++ trunk/gs/src/aes.c	2008-07-24 00:42:01 UTC (rev 8869)
@@ -228,10 +228,10 @@
 #endif
 }
 
-static void copy_block( void * d, void *s, uint_8t nn )
+static void copy_block( uint_8t * d, uint_8t *s, uint_8t nn )
 {
     while( nn-- )
-        *((uint_8t*)d)++ = *((uint_8t*)s)++;
+        *d++ = *s++;
 }
 
 static void xor_block( void *d, const void *s )

Modified: trunk/gs/src/aes.h
===================================================================
--- trunk/gs/src/aes.h	2008-07-23 23:29:39 UTC (rev 8868)
+++ trunk/gs/src/aes.h	2008-07-24 00:42:01 UTC (rev 8869)
@@ -50,16 +50,16 @@
 #if 1
 #  define AES_DEC_PREKEYED  /* AES decryption with a precomputed key schedule  */
 #endif
-#if 1
+#if 0
 #  define AES_ENC_128_OTFK  /* AES encryption with 'on the fly' 128 bit keying */
 #endif
-#if 1
+#if 0
 #  define AES_DEC_128_OTFK  /* AES decryption with 'on the fly' 128 bit keying */
 #endif
-#if 1
+#if 0
 #  define AES_ENC_256_OTFK  /* AES encryption with 'on the fly' 256 bit keying */
 #endif
-#if 1
+#if 0
 #  define AES_DEC_256_OTFK  /* AES decryption with 'on the fly' 256 bit keying */
 #endif
 
@@ -74,8 +74,6 @@
 typedef uint_8t length_type;
 typedef uint_8t uint_type;
 
-typedef unsigned char uint_8t;
-
 typedef struct
 {   uint_8t ksch[(N_MAX_ROUNDS + 1) * N_BLOCK];
     uint_8t rnd;