diff options
| author | Werner Koch <[email protected]> | 2005-05-03 22:27:07 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2005-05-03 22:27:07 +0000 |
| commit | 6639bbf699b7625c3b674f39b30138ef835f00ee (patch) | |
| tree | 361b9c9dab56e9e34628f8afc8989cee64c534d6 /g10/seckey-cert.c | |
| parent | * gpgkeys_hkp.c, gpgkeys_oldhkp.c, ksutil.h: Some minor cleanup and (diff) | |
| download | gnupg-6639bbf699b7625c3b674f39b30138ef835f00ee.tar.gz gnupg-6639bbf699b7625c3b674f39b30138ef835f00ee.zip | |
* passphrase.c (agent_get_passphrase): Add new arg CACHEID.
Changed all callers.
(ask_passphrase): Add new arg CACHEID and use it in agent mode.
Changed all callers.
(passphrase_clear_cache): New arg CACHEID. Changed all callers.
* cardglue.c (format_cacheid): New.
(pin_cb): Compute a cache ID.
(agent_scd_pksign, agent_scd_pkdecrypt): Use it.
(agent_clear_pin_cache): New.
* card-util.c (change_pin): Clear the PIN cache.
(check_pin_for_key_operation): Ditto.
Diffstat (limited to '')
| -rw-r--r-- | g10/seckey-cert.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/seckey-cert.c b/g10/seckey-cert.c index 9153b9508..fc318d0ae 100644 --- a/g10/seckey-cert.c +++ b/g10/seckey-cert.c @@ -203,7 +203,7 @@ do_check( PKT_secret_key *sk, const char *tryagain_text, int mode, /* now let's see whether we have used the right passphrase */ if( csum != sk->csum ) { copy_secret_key( sk, save_sk ); - passphrase_clear_cache ( keyid, sk->pubkey_algo ); + passphrase_clear_cache ( keyid, NULL, sk->pubkey_algo ); free_secret_key( save_sk ); return G10ERR_BAD_PASS; } @@ -211,7 +211,7 @@ do_check( PKT_secret_key *sk, const char *tryagain_text, int mode, res = pubkey_check_secret_key( sk->pubkey_algo, sk->skey ); if( res ) { copy_secret_key( sk, save_sk ); - passphrase_clear_cache ( keyid, sk->pubkey_algo ); + passphrase_clear_cache ( keyid, NULL, sk->pubkey_algo ); free_secret_key( save_sk ); return G10ERR_BAD_PASS; } |