diff options
Diffstat (limited to '')
| -rw-r--r-- | g10/ChangeLog | 18 | ||||
| -rw-r--r-- | g10/app-openpgp.c | 2 | ||||
| -rw-r--r-- | g10/cardglue.c | 1 | ||||
| -rw-r--r-- | g10/parse-packet.c | 4 | ||||
| -rw-r--r-- | g10/status.c | 1 | ||||
| -rw-r--r-- | g10/status.h | 1 |
6 files changed, 22 insertions, 5 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index fe586345d..3259effe8 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,10 @@ +2005-06-18 Werner Koch <[email protected]> + + * 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 <[email protected]> * 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 <[email protected]> + + * cardglue.c (open_card): Emit new CARDCTRL status 5 for no reader + available. + +2005-06-02 Werner Koch <[email protected]> + + * app-openpgp.c (do_writekey): Typo fix. + + * status.c, status.h: Removed STATUS_BAD_PASSPHRASE_PIN. + 2005-06-01 David Shaw <[email protected]> * signal.c [HAVE_DOSISH_SYSTEM]: Fix unused function warnings on diff --git a/g10/app-openpgp.c b/g10/app-openpgp.c index f129b16a8..910dde4d5 100644 --- a/g10/app-openpgp.c +++ b/g10/app-openpgp.c @@ -1746,7 +1746,7 @@ do_writekey (app_t app, ctrl_t ctrl, 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; diff --git a/g10/cardglue.c b/g10/cardglue.c index 6ab241dc2..f9fba6806 100644 --- a/g10/cardglue.c +++ b/g10/cardglue.c @@ -412,6 +412,7 @@ open_card (void) 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; } diff --git a/g10/parse-packet.c b/g10/parse-packet.c index 8cc979e77..aa349a220 100644 --- a/g10/parse-packet.c +++ b/g10/parse-packet.c @@ -1337,7 +1337,7 @@ parse_signature( IOBUF inp, int pkttype, unsigned long pktlen, 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 @@ parse_signature( IOBUF inp, int pkttype, unsigned long pktlen, 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) diff --git a/g10/status.c b/g10/status.c index e5eebd255..b14d605da 100644 --- a/g10/status.c +++ b/g10/status.c @@ -113,7 +113,6 @@ get_status_string ( int no ) 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; diff --git a/g10/status.h b/g10/status.h index afcfdbc95..bf23b34a2 100644 --- a/g10/status.h +++ b/g10/status.h @@ -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 |