[svn] gcry - r1246 - trunk

[svn author wk]

Author: wk
Date: 2007-05-02 19:18:57 +0200 (Wed, 02 May 2007)
New Revision: 1246

Modified:
   trunk/ChangeLog
   trunk/configure.ac
Log:
Do not make Camellia a default cipher


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-05-02 10:18:46 UTC (rev 1245)
+++ trunk/ChangeLog	2007-05-02 17:18:57 UTC (rev 1246)
@@ -2,6 +2,7 @@
 
 	* configure.ac (LIBGCRYPT_DIGESTS, LIBGCRYPT_CIPHERS) 
 	(LIBGCRYPT_PUBKEY_CIPHERS): Ac_define lists of algorithms.
+	(default_ciphers): Don't make camellia a default.
 
 2007-05-02  David Shaw  <dshaw at jabberwocky.com>
 

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2007-05-02 10:18:46 UTC (rev 1245)
+++ trunk/configure.ac	2007-05-02 17:18:57 UTC (rev 1246)
@@ -300,8 +300,8 @@
 fi
 
 # If not specified otherwise, all available algorithms will be
-# included.
-default_ciphers="$available_ciphers"
+# included.  Except for Camellia which is GPLed.
+default_ciphers=`echo "$available_ciphers" | sed 's/ camellia//'`
 default_pubkey_ciphers="$available_pubkey_ciphers"
 default_digests="$available_digests"