mirror of
git://git.gnupg.org/gnupg.git
synced 2025-01-22 14:57:02 +01:00
* gpg.c (main): Do not provide a default for
--personal-digest-preferences. This allows the usual digest selection algorithm to pick a digest based on recipient keys.
This commit is contained in:
parent
79019ee776
commit
933adc0850
@ -1,5 +1,9 @@
|
||||
2010-10-29 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* gpg.c (main): Do not provide a default for
|
||||
--personal-digest-preferences. This allows the usual digest
|
||||
selection algorithm to pick a digest based on recipient keys.
|
||||
|
||||
* pkclist.c (select_algo_from_prefs): Make sure the scores can't
|
||||
overflow when picking an algorithm (not a security issue since we
|
||||
can't pick something not present in all preference lists, but we
|
||||
|
@ -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, 2009 Free Software Foundation, Inc.
|
||||
* 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
|
||||
*
|
||||
* This file is part of GnuPG.
|
||||
*
|
||||
@ -3148,11 +3148,6 @@ main (int argc, char **argv )
|
||||
keygen_set_std_prefs(opt.def_preference_list,0))
|
||||
log_error(_("invalid default preferences\n"));
|
||||
|
||||
/* We provide defaults for the personal digest list. This is
|
||||
SHA-1. */
|
||||
if(!pers_digest_list)
|
||||
pers_digest_list="h2";
|
||||
|
||||
if(pers_cipher_list &&
|
||||
keygen_set_std_prefs(pers_cipher_list,PREFTYPE_SYM))
|
||||
log_error(_("invalid personal cipher preferences\n"));
|
||||
|
Loading…
x
Reference in New Issue
Block a user