[svn] GnuPG - r5407 - in branches/STABLE-BRANCH-1-4: . cipher g10

[svn author wk]

Author: wk
Date: 2010-08-31 10:42:38 +0200 (Tue, 31 Aug 2010)
New Revision: 5407

Modified:
   branches/STABLE-BRANCH-1-4/NEWS
   branches/STABLE-BRANCH-1-4/README
   branches/STABLE-BRANCH-1-4/cipher/rndw32.c
   branches/STABLE-BRANCH-1-4/g10/ChangeLog
   branches/STABLE-BRANCH-1-4/g10/mainproc.c
Log:
Minor fixes


Modified: branches/STABLE-BRANCH-1-4/g10/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/ChangeLog	2010-08-26 09:28:11 UTC (rev 5406)
+++ branches/STABLE-BRANCH-1-4/g10/ChangeLog	2010-08-31 08:42:38 UTC (rev 5407)
@@ -1,3 +1,8 @@
+2010-08-31  Werner Koch  <wk at g10code.com>
+
+	* mainproc.c (print_pkenc_list): Print a STATUS_ERROR.  Fixes
+	bug#1255.
+
 2010-07-24  Werner Koch  <wk at g10code.com>
 
 	* cardglue.c (agent_scd_pksign): Allow more hash algorithms when

Modified: branches/STABLE-BRANCH-1-4/NEWS
===================================================================
--- branches/STABLE-BRANCH-1-4/NEWS	2010-08-26 09:28:11 UTC (rev 5406)
+++ branches/STABLE-BRANCH-1-4/NEWS	2010-08-31 08:42:38 UTC (rev 5407)
@@ -2,6 +2,8 @@
 -------------------------------------------------
 
     * Bug fixes.
+    
+    * Ignore some GnuPG-2 options.
 
 
 Noteworthy changes in version 1.4.10 (2009-09-02)

Modified: branches/STABLE-BRANCH-1-4/README
===================================================================
--- branches/STABLE-BRANCH-1-4/README	2010-08-26 09:28:11 UTC (rev 5406)
+++ branches/STABLE-BRANCH-1-4/README	2010-08-31 08:42:38 UTC (rev 5407)
@@ -23,7 +23,7 @@
     GnuPG is GNU's tool for secure communication and data storage.
     It can be used to encrypt data and to create digital signatures.
     It includes an advanced key management facility and is compliant
-    with the proposed OpenPGP Internet standard as described in RFC2440.
+    with the proposed OpenPGP Internet standard as described in RFC4880.
 
     GnuPG works best on GNU/Linux or *BSD systems.  Most other Unices
     are also supported but are not as well tested as the Free Unices.

Modified: branches/STABLE-BRANCH-1-4/cipher/rndw32.c
===================================================================
--- branches/STABLE-BRANCH-1-4/cipher/rndw32.c	2010-08-26 09:28:11 UTC (rev 5406)
+++ branches/STABLE-BRANCH-1-4/cipher/rndw32.c	2010-08-31 08:42:38 UTC (rev 5407)
@@ -477,6 +477,10 @@
      * worst-case estimate which is usually nowhere near the actual amount
      * required.  For example it may report that 128K of memory is required,
      * but only return 64K of data */
+#warning How shall we disable get performacne data 
+    if (0) 
+      log_debug ("Warning: get performance data disabled\n");
+    else
     {	pPerfData =  xmalloc (cbPerfData);
 	for (;;) {
 	    dwSize = cbPerfData;

Modified: branches/STABLE-BRANCH-1-4/g10/mainproc.c
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/mainproc.c	2010-08-26 09:28:11 UTC (rev 5406)
+++ branches/STABLE-BRANCH-1-4/g10/mainproc.c	2010-08-31 08:42:38 UTC (rev 5407)
@@ -501,8 +501,16 @@
 	    }
 	}
 	else if (list->reason)
+          {
 	    log_info(_("public key decryption failed: %s\n"),
 						g10_errstr(list->reason));
+	    if (is_status_enabled ())
+              {
+		char buf[20+30];
+		snprintf (buf, sizeof buf, "pkdecrypt_failed %d", list->reason);
+		write_status_text (STATUS_ERROR, buf);
+              }
+          }
     }
 }