[svn] gcry - r1241 - in trunk: cipher tests

[svn author wk]

Author: wk
Date: 2007-05-01 14:01:47 +0200 (Tue, 01 May 2007)
New Revision: 1241

Modified:
   trunk/cipher/ChangeLog
   trunk/cipher/cipher.c
   trunk/tests/ChangeLog
   trunk/tests/basic.c
Log:
USE_cipher related fixed (#if instead of #ifdef) by David.


Modified: trunk/cipher/ChangeLog
===================================================================
--- trunk/cipher/ChangeLog	2007-04-30 17:00:21 UTC (rev 1240)
+++ trunk/cipher/ChangeLog	2007-05-01 12:01:47 UTC (rev 1241)
@@ -1,3 +1,8 @@
+2007-04-30  David Shaw  <dshaw at jabberwocky.com>
+
+	* cipher.c: Use #if instead of #ifdef as configure defines the
+	USE_cipher defines as 0 for disabled.
+
 2007-04-30  Werner Koch  <wk at g10code.com>
 
 	* rndegd.c (_gcry_rndegd_set_socket_name): New.

Modified: trunk/cipher/cipher.c
===================================================================
--- trunk/cipher/cipher.c	2007-04-30 17:00:21 UTC (rev 1240)
+++ trunk/cipher/cipher.c	2007-05-01 12:01:47 UTC (rev 1241)
@@ -69,10 +69,10 @@
     { &_gcry_cipher_spec_serpent192, GCRY_CIPHER_SERPENT192 },
     { &_gcry_cipher_spec_serpent256, GCRY_CIPHER_SERPENT256 },
 #endif
-#ifdef USE_RFC2268
+#if USE_RFC2268
     { &_gcry_cipher_spec_rfc2268_40, GCRY_CIPHER_RFC2268_40 },
 #endif
-#ifdef USE_SEED
+#if USE_SEED
     { &_gcry_cipher_spec_seed,       GCRY_CIPHER_SEED },
 #endif
     { NULL                    }

Modified: trunk/tests/ChangeLog
===================================================================
--- trunk/tests/ChangeLog	2007-04-30 17:00:21 UTC (rev 1240)
+++ trunk/tests/ChangeLog	2007-05-01 12:01:47 UTC (rev 1241)
@@ -1,3 +1,8 @@
+2007-04-30  David Shaw  <dshaw at jabberwocky.com>
+
+	* basic.c (check_ciphers): #if out ciphers we don't have.  Add
+	test for GCRY_CIPHER_RFC2268_40.
+
 2007-04-30  Werner Koch  <wk at g10code.com>
 
 	* version.c: New.

Modified: trunk/tests/basic.c
===================================================================
--- trunk/tests/basic.c	2007-04-30 17:00:21 UTC (rev 1240)
+++ trunk/tests/basic.c	2007-05-01 12:01:47 UTC (rev 1241)
@@ -956,23 +956,42 @@
 check_ciphers (void)
 {
   static int algos[] = {
+#if USE_BLOWFISH
+    GCRY_CIPHER_BLOWFISH,
+#endif
+#if USE_DES
+    GCRY_CIPHER_DES,
     GCRY_CIPHER_3DES,
+#endif
+#if USE_CAST5
     GCRY_CIPHER_CAST5,
-    GCRY_CIPHER_BLOWFISH,
+#endif
+#if USE_AES
     GCRY_CIPHER_AES,
     GCRY_CIPHER_AES192,
     GCRY_CIPHER_AES256,
+#endif
+#if USE_TWOFISH
     GCRY_CIPHER_TWOFISH,
     GCRY_CIPHER_TWOFISH128,
-    GCRY_CIPHER_DES,
+#endif
+#if USE_SERPENT
     GCRY_CIPHER_SERPENT128,
     GCRY_CIPHER_SERPENT192,
     GCRY_CIPHER_SERPENT256,
+#endif
+#if USE_RFC2268
+    GCRY_CIPHER_RFC2268_40,
+#endif
+#if USE_SEED
     GCRY_CIPHER_SEED,
+#endif
     0
   };
   static int algos2[] = {
+#if USE_ARCFOUR
     GCRY_CIPHER_ARCFOUR,
+#endif
     0
   };
   int i;