summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2007-05-02 17:18:57 +0000
committerWerner Koch <wk@gnupg.org>2007-05-02 17:18:57 +0000
commite4d275da014c6e796059346811debc0bcf536d7f (patch)
tree4eb68495f3402bf3418fbc7425f387306ce2a1e4
parente87b11838720a714db2d4933c64dbf6f57bdafe3 (diff)
downloadlibgcrypt-e4d275da014c6e796059346811debc0bcf536d7f.tar.gz
Do not make Camellia a default cipher
-rw-r--r--ChangeLog1
-rw-r--r--configure.ac4
2 files changed, 3 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4231bb19..42b2b704 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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@jabberwocky.com>
diff --git a/configure.ac b/configure.ac
index c595f344..6663705b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -300,8 +300,8 @@ else
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"