diff options
| author | Werner Koch <[email protected]> | 2003-08-05 17:11:04 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2003-08-05 17:11:04 +0000 |
| commit | 1bcf8ef9dea1a9b171c27ef48cadb79df6201e33 (patch) | |
| tree | 2ad720429f4b04941ebf0fcbe005e63c89fe69c6 /g10/seckey-cert.c | |
| parent | This commit was manufactured by cvs2svn to create branch (diff) | |
| download | gnupg-1bcf8ef9dea1a9b171c27ef48cadb79df6201e33.tar.gz gnupg-1bcf8ef9dea1a9b171c27ef48cadb79df6201e33.zip | |
Cleanups, fixes and PC/SC support
Diffstat (limited to 'g10/seckey-cert.c')
| -rw-r--r-- | g10/seckey-cert.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/g10/seckey-cert.c b/g10/seckey-cert.c index 5a7db4c97..5b0238240 100644 --- a/g10/seckey-cert.c +++ b/g10/seckey-cert.c @@ -215,14 +215,13 @@ do_check( PKT_secret_key *sk, const char *tryagain_text, int mode, return gpg_error (GPG_ERR_BAD_PASSPHRASE); } /* the checksum may fail, so we also check the key itself */ -#warning fixme - we need to reenable this -/* 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 ); */ -/* free_secret_key( save_sk ); */ -/* return gpg_error (GPG_ERR_BAD_PASSPHRASE); */ -/* } */ + res = pk_check_secret_key (sk->pubkey_algo, sk->skey); + if (res) { + copy_secret_key( sk, save_sk ); + passphrase_clear_cache ( keyid, sk->pubkey_algo ); + free_secret_key( save_sk ); + return gpg_error (GPG_ERR_BAD_PASSPHRASE); + } free_secret_key( save_sk ); sk->is_protected = 0; } |