gnupg/g10 (6 files)
cvs user wk
cvs at cvs.gnupg.org
Sat Jun 18 13:27:10 CEST 2005
Date: Saturday, June 18, 2005 @ 13:49:50
Author: wk
Path: /cvs/gnupg/gnupg/g10
Modified: ChangeLog app-openpgp.c cardglue.c parse-packet.c status.c
status.h
(parse_signature): Use log_info for messages
about missing timestamp or keyid. In case we don't use that key
there won't be no further error and thus gpg does not need to
return with an error.
----------------+
ChangeLog | 18 ++++++++++++++++++
app-openpgp.c | 4 ++--
cardglue.c | 1 +
parse-packet.c | 4 ++--
status.c | 1 -
status.h | 1 -
6 files changed, 23 insertions(+), 6 deletions(-)
Index: gnupg/g10/ChangeLog
diff -u gnupg/g10/ChangeLog:1.758 gnupg/g10/ChangeLog:1.759
--- gnupg/g10/ChangeLog:1.758 Tue Jun 14 05:55:19 2005
+++ gnupg/g10/ChangeLog Sat Jun 18 13:49:50 2005
@@ -1,3 +1,10 @@
+2005-06-18 Werner Koch <wk at g10code.com>
+
+ * parse-packet.c (parse_signature): Use log_info for messages
+ about missing timestamp or keyid. In case we don't use that key
+ there won't be no further error and thus gpg does not need to
+ return with an error.
+
2005-06-13 David Shaw <dshaw at jabberwocky.com>
* keygen.c (save_unprotected_key_to_card): Fix gcc4 warning.
@@ -61,6 +68,17 @@
all of the above. Export-minimal is the same except it also
removes all non-selfsigs. export-unusable-sigs is now a noop.
+2005-06-06 Werner Koch <wk at g10code.com>
+
+ * cardglue.c (open_card): Emit new CARDCTRL status 5 for no reader
+ available.
+
+2005-06-02 Werner Koch <wk at g10code.com>
+
+ * app-openpgp.c (do_writekey): Typo fix.
+
+ * status.c, status.h: Removed STATUS_BAD_PASSPHRASE_PIN.
+
2005-06-01 David Shaw <dshaw at jabberwocky.com>
* signal.c [HAVE_DOSISH_SYSTEM]: Fix unused function warnings on
Index: gnupg/g10/app-openpgp.c
diff -u gnupg/g10/app-openpgp.c:1.30 gnupg/g10/app-openpgp.c:1.31
--- gnupg/g10/app-openpgp.c:1.30 Tue May 31 10:39:17 2005
+++ gnupg/g10/app-openpgp.c Sat Jun 18 13:49:50 2005
@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA.
*
- * $Id: app-openpgp.c,v 1.30 2005/05/31 08:39:17 wk Exp $
+ * $Id: app-openpgp.c,v 1.31 2005/06/18 11:49:50 wk Exp $
*/
#include <config.h>
@@ -1746,7 +1746,7 @@
nbits = rsa_e? count_bits (rsa_e, rsa_e_len) : 0;
if (nbits < 2 || nbits > 32)
{
- log_error (_("RSA public exponent missing or largerr than %d bits\n"),
+ log_error (_("RSA public exponent missing or larger than %d bits\n"),
32);
err = gpg_error (GPG_ERR_BAD_SECKEY);
goto leave;
Index: gnupg/g10/cardglue.c
diff -u gnupg/g10/cardglue.c:1.33 gnupg/g10/cardglue.c:1.34
--- gnupg/g10/cardglue.c:1.33 Tue May 31 12:11:01 2005
+++ gnupg/g10/cardglue.c Sat Jun 18 13:49:50 2005
@@ -412,6 +412,7 @@
slot = apdu_open_reader (default_reader_port);
if (slot == -1)
{
+ write_status_text (STATUS_CARDCTRL, "5");
log_error ("card reader not available\n");
return NULL;
}
Index: gnupg/g10/parse-packet.c
diff -u gnupg/g10/parse-packet.c:1.117 gnupg/g10/parse-packet.c:1.118
--- gnupg/g10/parse-packet.c:1.117 Tue May 31 10:39:16 2005
+++ gnupg/g10/parse-packet.c Sat Jun 18 13:49:50 2005
@@ -1337,7 +1337,7 @@
if(p)
sig->timestamp = buffer_to_u32(p);
else if(!(sig->pubkey_algo>=100 && sig->pubkey_algo<=110))
- log_error("signature packet without timestamp\n");
+ log_info ("signature packet without timestamp\n");
p = parse_sig_subpkt2( sig, SIGSUBPKT_ISSUER, NULL );
if(p)
@@ -1346,7 +1346,7 @@
sig->keyid[1] = buffer_to_u32(p+4);
}
else if(!(sig->pubkey_algo>=100 && sig->pubkey_algo<=110))
- log_error("signature packet without keyid\n");
+ log_info ("signature packet without keyid\n");
p=parse_sig_subpkt(sig->hashed,SIGSUBPKT_SIG_EXPIRE,NULL);
if(p)
Index: gnupg/g10/status.c
diff -u gnupg/g10/status.c:1.51 gnupg/g10/status.c:1.52
--- gnupg/g10/status.c:1.51 Tue May 31 10:39:15 2005
+++ gnupg/g10/status.c Sat Jun 18 13:49:50 2005
@@ -113,7 +113,6 @@
case STATUS_ENC_TO : s = "ENC_TO"; break;
case STATUS_NODATA : s = "NODATA"; break;
case STATUS_BAD_PASSPHRASE : s = "BAD_PASSPHRASE"; break;
- case STATUS_BAD_PASSPHRASE_PIN: s = "BAD_PASSPHRASE_PIN"; break;
case STATUS_NO_PUBKEY : s = "NO_PUBKEY"; break;
case STATUS_NO_SECKEY : s = "NO_SECKEY"; break;
case STATUS_NEED_PASSPHRASE_SYM: s = "NEED_PASSPHRASE_SYM"; break;
Index: gnupg/g10/status.h
diff -u gnupg/g10/status.h:1.34 gnupg/g10/status.h:1.35
--- gnupg/g10/status.h:1.34 Tue May 31 10:39:15 2005
+++ gnupg/g10/status.h Sat Jun 18 13:49:50 2005
@@ -110,7 +110,6 @@
/* Extra status codes for certain smartcard operations. Primary
useful to double check that change PIN worked as expected. */
-#define STATUS_BAD_PASSPHRASE_PIN 78
#define STATUS_SC_OP_FAILURE 79
#define STATUS_SC_OP_SUCCESS 80
More information about the Gnupg-commits
mailing list