Remove Camellia restriction.

4 files changed, 11 insertions, 21 deletions

diff --git a/ChangeLog b/ChangeLog
index b5ae69e52..6db7d83f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-05  David Shaw  <[email protected]>
+
+	* configure.ac: Remove Camellia restriction.
+
 2008-10-03  David Shaw  <[email protected]>
 
 	* configure.ac, acinclude.m4: Remove GNUPG_CHECK_DOCBOOK_TO_TEXI
diff --git a/configure.ac b/configure.ac
index 0470a35a8..b017040fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 # configure.ac script for GnuPG
 # Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-#               2008 Free Software Foundation, Inc.
+#               2008, 2009 Free Software Foundation, Inc.
 #
 # This file is part of GnuPG.
 # 
@@ -139,7 +139,7 @@ use_cast5=yes
 use_blowfish=yes
 use_aes=yes
 use_twofish=yes
-use_camellia=no
+use_camellia=yes
 use_sha256=yes
 use_sha512=yes
 use_bzip2=yes
@@ -263,10 +263,6 @@ AC_ARG_ENABLE(camellia,
 AC_MSG_RESULT($use_camellia)
 if test x"$use_camellia" = xyes ; then
    AC_DEFINE(USE_CAMELLIA,1,[Define to include the CAMELLIA cipher])
-   AC_MSG_WARN([[
-***
-*** The Camellia cipher is for testing only and is NOT for production use!
-***]])
 fi
 
 AC_MSG_CHECKING([whether to enable the SHA-224 and SHA-256 digests])
@@ -1452,9 +1448,3 @@ if test -n "$show_extraasm"; then
   echo "  Extra cpu specific functions:$show_extraasm"
 fi
 echo
-
-if test  x"$use_camellia" = xyes ; then
-  echo "WARNING: The Camellia cipher is for testing only and is NOT for production use!"
-  echo
-fi
-
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 2dc594b87..fd5b3c367 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-05  David Shaw  <[email protected]>
+
+	* gpg.c (main): Remove Camellia restriction.
+
 2009-06-02  Werner Koch  <[email protected]>
 
 	* gpgv.c (tty_cleanup_after_signal): Add new stub.
diff --git a/g10/gpg.c b/g10/gpg.c
index 81a737002..302b0681a 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -1,6 +1,6 @@
 /* gpg.c - The GnuPG utility (main for gpg)
  * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- *               2007, 2008 Free Software Foundation, Inc.
+ *               2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -2933,14 +2933,6 @@ main (int argc, char **argv )
 	  log_info("%s\n",s);
       }
 #endif
-#ifdef USE_CAMELLIA    
-    /* We better also print a runtime warning if people build it with
-       support for Camellia (which is not yet defiend by OpenPGP). */
-    log_info ("WARNING: This version has been built with support for the "
-              "Camellia cipher.\n");
-    log_info ("         It is for testing only and is NOT for production "
-              "use!\n");
-#endif
 
     if (opt.verbose > 2)
         log_info ("using character set `%s'\n", get_native_charset ());