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

[giles at ghostscript.com]

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

Modified:
   trunk/gs/src/aes.c
Log:
Change the XYSSL AES implementation to build in isolation.


Modified: trunk/gs/src/aes.c
===================================================================
--- trunk/gs/src/aes.c	2008-07-24 00:42:02 UTC (rev 8870)
+++ trunk/gs/src/aes.c	2008-07-24 00:42:04 UTC (rev 8871)
@@ -6,7 +6,7 @@
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions
  *  are met:
- *  
+ *
  *    * Redistributions of source code _must_ retain the above copyright
  *      notice, this list of conditions and the following disclaimer.
  *    * Redistributions in binary form may or may not reproduce the above
@@ -16,7 +16,7 @@
  *    * Neither the name of XySSL nor the names of its contributors may be
  *      used to endorse or promote products derived from this software
  *      without specific prior written permission.
- *  
+ *
  *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -36,13 +36,8 @@
  *  http://csrc.nist.gov/publications/fips/fips197/fips-197.pdf
  */
 
-#include "xyssl/config.h"
+#include "aes.h"
 
-#if defined(XYSSL_AES_C)
-
-#include "xyssl/aes.h"
-#include "xyssl/padlock.h"
-
 #include <string.h>
 
 /*
@@ -1094,6 +1089,9 @@
     return( 0 );
 }
 
-#endif
+int main(int argc, char *argv[])
+{
+    return aes_self_test(1);
+}
 
-#endif
+#endif /* defined(XYSSL_SELF_TEST) */