diff options
| author | Werner Koch <[email protected]> | 2010-08-31 08:42:38 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2010-08-31 08:42:38 +0000 |
| commit | 690dc98c6f8158e710e22414b41ae2ec56716bd5 (patch) | |
| tree | b20c8709bb893fb2abab95a9aad94f3e423837e3 | |
| parent | support more hash algorithms to support the v2 card (diff) | |
| download | gnupg-690dc98c6f8158e710e22414b41ae2ec56716bd5.tar.gz gnupg-690dc98c6f8158e710e22414b41ae2ec56716bd5.zip | |
Minor fixes
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | cipher/rndw32.c | 4 | ||||
| -rw-r--r-- | g10/ChangeLog | 5 | ||||
| -rw-r--r-- | g10/mainproc.c | 8 |
5 files changed, 20 insertions, 1 deletions
@@ -2,6 +2,8 @@ Noteworthy changes in version 1.4.11 ------------------------------------------------- * Bug fixes. + + * Ignore some GnuPG-2 options. Noteworthy changes in version 1.4.10 (2009-09-02) @@ -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. diff --git a/cipher/rndw32.c b/cipher/rndw32.c index 7a81860c3..9954cafd7 100644 --- a/cipher/rndw32.c +++ b/cipher/rndw32.c @@ -477,6 +477,10 @@ slow_gatherer_windowsNT( void (*add)(const void*, size_t, int), int requester ) * 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; diff --git a/g10/ChangeLog b/g10/ChangeLog index 0ba1060be..a9233c1f4 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2010-08-31 Werner Koch <[email protected]> + + * mainproc.c (print_pkenc_list): Print a STATUS_ERROR. Fixes + bug#1255. + 2010-07-24 Werner Koch <[email protected]> * cardglue.c (agent_scd_pksign): Allow more hash algorithms when diff --git a/g10/mainproc.c b/g10/mainproc.c index ec5952ebf..f46895d54 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -501,8 +501,16 @@ print_pkenc_list( struct kidlist_item *list, int failed ) } } 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); + } + } } } |