mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
Cleanups, fixes and PC/SC support
This commit is contained in:
parent
9ca4830a5b
commit
1bcf8ef9de
24 changed files with 601 additions and 520 deletions
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue