[svn] GnuPG - r5475 - branches/STABLE-BRANCH-1-4/g10

[svn author dshaw]

Author: dshaw
Date: 2010-10-29 21:16:27 +0200 (Fri, 29 Oct 2010)
New Revision: 5475

Modified:
   branches/STABLE-BRANCH-1-4/g10/ChangeLog
   branches/STABLE-BRANCH-1-4/g10/gpg.c
Log:
* 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.


Modified: branches/STABLE-BRANCH-1-4/g10/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/ChangeLog	2010-10-29 19:14:28 UTC (rev 5474)
+++ branches/STABLE-BRANCH-1-4/g10/ChangeLog	2010-10-29 19:16:27 UTC (rev 5475)
@@ -1,5 +1,9 @@
 2010-10-29  David Shaw  <dshaw at 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

Modified: branches/STABLE-BRANCH-1-4/g10/gpg.c
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/gpg.c	2010-10-29 19:14:28 UTC (rev 5474)
+++ branches/STABLE-BRANCH-1-4/g10/gpg.c	2010-10-29 19:16:27 UTC (rev 5475)
@@ -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 @@
 	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"));