security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

Remove Camellia restriction.

Browse Source
This commit is contained in:
David Shaw 2009-06-05 16:54:47 +00:00
parent 58a0c9ee49
commit 4843e6c8f2
4 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2009-06-05 David Shaw <dshaw@jabberwocky.com>
* configure.ac: Remove Camellia restriction.
2008-10-03 David Shaw <dshaw@jabberwocky.com> 2008-10-03 David Shaw <dshaw@jabberwocky.com>
* configure.ac, acinclude.m4: Remove GNUPG_CHECK_DOCBOOK_TO_TEXI * configure.ac, acinclude.m4: Remove GNUPG_CHECK_DOCBOOK_TO_TEXI

14
configure.ac
View File

@ -1,6 +1,6 @@
# configure.ac script for GnuPG # configure.ac script for GnuPG
# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, # 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. # This file is part of GnuPG.
# #
@ -139,7 +139,7 @@ use_cast5=yes
use_blowfish=yes use_blowfish=yes
use_aes=yes use_aes=yes
use_twofish=yes use_twofish=yes
use_camellia=no use_camellia=yes
use_sha256=yes use_sha256=yes
use_sha512=yes use_sha512=yes
use_bzip2=yes use_bzip2=yes
@ -263,10 +263,6 @@ AC_ARG_ENABLE(camellia,
AC_MSG_RESULT($use_camellia) AC_MSG_RESULT($use_camellia)
if test x"$use_camellia" = xyes ; then if test x"$use_camellia" = xyes ; then
AC_DEFINE(USE_CAMELLIA,1,[Define to include the CAMELLIA cipher]) 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 fi
AC_MSG_CHECKING([whether to enable the SHA-224 and SHA-256 digests]) 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" echo " Extra cpu specific functions:$show_extraasm"
fi fi
echo 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

4
g10/ChangeLog
View File

@ -1,3 +1,7 @@
2009-06-05 David Shaw <dshaw@jabberwocky.com>
* gpg.c (main): Remove Camellia restriction.
2009-06-02 Werner Koch <wk@g10code.com> 2009-06-02 Werner Koch <wk@g10code.com>
* gpgv.c (tty_cleanup_after_signal): Add new stub. * gpgv.c (tty_cleanup_after_signal): Add new stub.

10
g10/gpg.c
View File

@ -1,6 +1,6 @@
/* gpg.c - The GnuPG utility (main for gpg) /* gpg.c - The GnuPG utility (main for gpg)
* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, * 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. * This file is part of GnuPG.
* *
@ -2933,14 +2933,6 @@ main (int argc, char **argv )
log_info("%s\n",s); log_info("%s\n",s);
} }
#endif #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) if (opt.verbose > 2)
log_info ("using character set `%s'\n", get_native_charset ()); log_info ("using character set `%s'\n", get_native_charset ());