diff options
Diffstat (limited to '')
| -rw-r--r-- | g10/ChangeLog | 12 | ||||
| -rw-r--r-- | g10/call-agent.c | 1 | ||||
| -rw-r--r-- | g10/card-util.c | 4 | ||||
| -rw-r--r-- | g10/keyedit.c | 4 | ||||
| -rw-r--r-- | g10/keyring.c | 2 | ||||
| -rw-r--r-- | g10/parse-packet.c | 2 | ||||
| -rw-r--r-- | g10/passphrase.c | 2 | ||||
| -rw-r--r-- | g10/revoke.c | 2 |
8 files changed, 18 insertions, 11 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index e961921a1..fcf759041 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,15 @@ +2009-06-24 Werner Koch <[email protected]> + + * keyedit.c (menu_select_key): Renmove dead assign to I. + (menu_select_uid): Ditto. + * keyring.c (keyring_search): Remove dead assign to NAME. + * card-util.c (card_edit): Remove useless DID_CHECKPIN. + * call-agent.c (unhexify_fpr): Remove dead op on N. + * passphrase.c (passphrase_to_dek_ext): Do not deref a NULL PW. + * revoke.c (gen_revoke): Remove unused malloc of PK. + * parse-packet.c (mpi_read): Init NREAD. + Reported by Fabian Keil. + 2009-06-17 Werner Koch <[email protected]> * parse-packet.c (parse): Use a casted -1 instead of a 32 bit diff --git a/g10/call-agent.c b/g10/call-agent.c index cd58b90b3..0590514df 100644 --- a/g10/call-agent.c +++ b/g10/call-agent.c @@ -132,7 +132,6 @@ unhexify_fpr (const char *hexstr, unsigned char *fpr) ; if (*s || (n != 40)) return 0; /* no fingerprint (invalid or wrong length). */ - n /= 2; for (s=hexstr, n=0; *s; s += 2, n++) fpr[n] = xtoi_2 (s); return 1; /* okay */ diff --git a/g10/card-util.c b/g10/card-util.c index 9295a1724..26349d653 100644 --- a/g10/card-util.c +++ b/g10/card-util.c @@ -1600,7 +1600,7 @@ card_edit (strlist_t commands) int have_commands = !!commands; int redisplay = 1; char *answer = NULL; - int did_checkpin = 0, allow_admin=0; + int allow_admin=0; char serialnobuf[50]; @@ -1812,12 +1812,10 @@ card_edit (strlist_t commands) case cmdPASSWD: change_pin (0, allow_admin); - did_checkpin = 0; /* Need to reset it of course. */ break; case cmdUNBLOCK: change_pin (1, allow_admin); - did_checkpin = 0; /* Need to reset it of course. */ break; case cmdQUIT: diff --git a/g10/keyedit.c b/g10/keyedit.c index b0d59f66a..69429b5ce 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -4458,7 +4458,7 @@ menu_select_uid( KBNODE keyblock, int idx ) } } else { /* reset all */ - for( i=0, node = keyblock; node; node = node->next ) { + for (node = keyblock; node; node = node->next) { if( node->pkt->pkttype == PKT_USER_ID ) node->flag &= ~NODFLG_SELUID; } @@ -4543,7 +4543,7 @@ menu_select_key( KBNODE keyblock, int idx ) } } else { /* reset all */ - for( i=0, node = keyblock; node; node = node->next ) { + for ( node = keyblock; node; node = node->next ) { if( node->pkt->pkttype == PKT_PUBLIC_SUBKEY || node->pkt->pkttype == PKT_SECRET_SUBKEY ) node->flag &= ~NODFLG_SELKEY; diff --git a/g10/keyring.c b/g10/keyring.c index 2c894312d..6b3c48987 100644 --- a/g10/keyring.c +++ b/g10/keyring.c @@ -997,7 +997,7 @@ keyring_search (KEYRING_HANDLE hd, KEYDB_SEARCH_DESC *desc, hd->word_match.name = xstrdup (name); hd->word_match.pattern = prepare_word_match (name); } - name = hd->word_match.pattern; + /* name = hd->word_match.pattern; */ } init_packet(&pkt); diff --git a/g10/parse-packet.c b/g10/parse-packet.c index a86e54981..16ca7514f 100644 --- a/g10/parse-packet.c +++ b/g10/parse-packet.c @@ -112,7 +112,7 @@ mpi_read (iobuf_t inp, unsigned int *ret_nread, int secure) int c, c1, c2, i; unsigned int nbits, nbytes; - size_t nread; + size_t nread = 0; gcry_mpi_t a = NULL; byte *buf = NULL; byte *p; diff --git a/g10/passphrase.c b/g10/passphrase.c index 3742738e9..d34f5fa92 100644 --- a/g10/passphrase.c +++ b/g10/passphrase.c @@ -600,7 +600,7 @@ passphrase_to_dek_ext (u32 *keyid, int pubkey_algo, get_last_passphrase(). */ dek = xmalloc_secure_clear ( sizeof *dek ); dek->algo = cipher_algo; - if ( !*pw && (mode == 2 || mode == 4)) + if ( (!pw || !*pw) && (mode == 2 || mode == 4)) dek->keylen = 0; else hash_passphrase (dek, pw, s2k); diff --git a/g10/revoke.c b/g10/revoke.c index cc66dfced..cce6d69f6 100644 --- a/g10/revoke.c +++ b/g10/revoke.c @@ -489,8 +489,6 @@ gen_revoke( const char *uname ) keyid_from_sk( sk, sk_keyid ); print_seckey_info (sk); - pk = xmalloc_clear( sizeof *pk ); - /* FIXME: We should get the public key direct from the secret one */ pub_keyblock=get_pubkeyblock(sk_keyid); |