[svn] GnuPG - r5431 - branches/STABLE-BRANCH-2-0/g10

[svn author wk]

Author: wk
Date: 2010-09-29 10:43:55 +0200 (Wed, 29 Sep 2010)
New Revision: 5431

Modified:
   branches/STABLE-BRANCH-2-0/g10/ChangeLog
   branches/STABLE-BRANCH-2-0/g10/call-agent.c
   branches/STABLE-BRANCH-2-0/g10/options.skel
Log:
Add missing space to Assuan command


Modified: branches/STABLE-BRANCH-2-0/g10/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-2-0/g10/ChangeLog	2010-09-28 16:17:30 UTC (rev 5430)
+++ branches/STABLE-BRANCH-2-0/g10/ChangeLog	2010-09-29 08:43:55 UTC (rev 5431)
@@ -1,7 +1,16 @@
+2010-09-29  Werner Koch  <wk at g10code.com>
+
+	* call-agent.c (agent_scd_pksign): Add missing space.
+
+2010-09-28  David Shaw  <dshaw at jabberwocky.com>  (wk)
+
+	* options.skel: Make the example for force-v3-sigs match
+	reality (it has defaulted to off since 2007-10-25).
+
 2010-09-28  Werner Koch  <wk at g10code.com>
 
 	* keyedit.c (show_key_with_all_names): Make revocation hint
-	cleared.  Fixes bug#1234.
+	more clear.  Fixes bug#1234.
 
 	* call-agent.c (hash_algo_option): New.
 	(agent_scd_pksign): Use it.

Modified: branches/STABLE-BRANCH-2-0/g10/call-agent.c
===================================================================
--- branches/STABLE-BRANCH-2-0/g10/call-agent.c	2010-09-28 16:17:30 UTC (rev 5430)
+++ branches/STABLE-BRANCH-2-0/g10/call-agent.c	2010-09-29 08:43:55 UTC (rev 5431)
@@ -956,7 +956,7 @@
     snprintf (line, DIM(line)-1, "SCD PKAUTH %s", serialno);
   else
 #endif
-    snprintf (line, DIM(line)-1, "SCD PKSIGN %s%s",
+    snprintf (line, DIM(line)-1, "SCD PKSIGN %s %s",
               hash_algo_option (hashalgo), serialno);
   line[DIM(line)-1] = 0;
   rc = assuan_transact (agent_ctx, line, membuf_data_cb, &data,

Modified: branches/STABLE-BRANCH-2-0/g10/options.skel
===================================================================
--- branches/STABLE-BRANCH-2-0/g10/options.skel	2010-09-28 16:17:30 UTC (rev 5430)
+++ branches/STABLE-BRANCH-2-0/g10/options.skel	2010-09-29 08:43:55 UTC (rev 5431)
@@ -2,7 +2,8 @@
 # the users home directory.
 # $Id$
 # Options for GnuPG
-# Copyright 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright 1998, 1999, 2000, 2001, 2002, 2003,
+#           2010 Free Software Foundation, Inc.
 # 
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -39,12 +40,12 @@
 #default-recipient some-user-id
 #default-recipient-self
 
-# By default GnuPG creates version 3 signatures for data files.  This
-# is not strictly OpenPGP compliant but PGP 6 and most versions of PGP
-# 7 require them.  To disable this behavior, you may use this option
-# or --openpgp.
+# By default GnuPG creates version 4 signatures for data files as
+# specified by OpenPGP.  Some earlier (PGP 6, PGP 7) versions of PGP
+# require the older version 3 signatures.  Setting this option forces
+# GnuPG to create version 3 signatures.
 
-#no-force-v3-sigs
+#force-v3-sigs
 
 # Because some mailers change lines starting with "From " to ">From "
 # it is good to handle such lines in a special way when creating