[svn] GnuPG - r5037 - in branches/STABLE-BRANCH-1-4: . g10

[svn author dshaw]

Author: dshaw
Date: 2009-06-05 18:54:47 +0200 (Fri, 05 Jun 2009)
New Revision: 5037

Modified:
   branches/STABLE-BRANCH-1-4/ChangeLog
   branches/STABLE-BRANCH-1-4/configure.ac
   branches/STABLE-BRANCH-1-4/g10/ChangeLog
   branches/STABLE-BRANCH-1-4/g10/gpg.c
Log:
Remove Camellia restriction.


Modified: branches/STABLE-BRANCH-1-4/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/ChangeLog	2009-06-05 14:11:03 UTC (rev 5036)
+++ branches/STABLE-BRANCH-1-4/ChangeLog	2009-06-05 16:54:47 UTC (rev 5037)
@@ -1,3 +1,7 @@
+2009-06-05  David Shaw  <dshaw at jabberwocky.com>
+
+	* configure.ac: Remove Camellia restriction.
+
 2008-10-03  David Shaw  <dshaw at jabberwocky.com>
 
 	* configure.ac, acinclude.m4: Remove GNUPG_CHECK_DOCBOOK_TO_TEXI

Modified: branches/STABLE-BRANCH-1-4/g10/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/ChangeLog	2009-06-05 14:11:03 UTC (rev 5036)
+++ branches/STABLE-BRANCH-1-4/g10/ChangeLog	2009-06-05 16:54:47 UTC (rev 5037)
@@ -1,3 +1,7 @@
+2009-06-05  David Shaw  <dshaw at jabberwocky.com>
+
+	* gpg.c (main): Remove Camellia restriction.
+
 2009-06-02  Werner Koch  <wk at g10code.com>
 
 	* gpgv.c (tty_cleanup_after_signal): Add new stub.

Modified: branches/STABLE-BRANCH-1-4/configure.ac
===================================================================
--- branches/STABLE-BRANCH-1-4/configure.ac	2009-06-05 14:11:03 UTC (rev 5036)
+++ branches/STABLE-BRANCH-1-4/configure.ac	2009-06-05 16:54:47 UTC (rev 5037)
@@ -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_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_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 @@
   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
-

Modified: branches/STABLE-BRANCH-1-4/g10/gpg.c
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/gpg.c	2009-06-05 14:11:03 UTC (rev 5036)
+++ branches/STABLE-BRANCH-1-4/g10/gpg.c	2009-06-05 16:54:47 UTC (rev 5037)
@@ -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 @@
 	  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 ());