diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 4 | ||||
| -rw-r--r-- | g10/gpg.c | 10 |
2 files changed, 5 insertions, 9 deletions
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. @@ -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 ()); |