mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
* passphrase .c (agent_get_passphrase): New arg CANCELED.
(passphrase_to_dek): Ditto. Passed to above. Changed all callers to pass NULL. * seckey-cert.c (do_check): New arg CANCELED. (check_secret_key): Terminate loop when canceled. * keyedit.c (change_passphrase): Pass ERRTEXT untranslated to passphrase_to_dek and translate where appropriate. * seckey-cert.c (check_secret_key): Ditto. * keygen.c (ask_passphrase): Ditto. * passphrase.c (agent_get_passphrase): Translate the TRYAGAIN_TEXT. Switch the codeset to utf-8.
This commit is contained in:
parent
5a9e7663c1
commit
3ff3ac5ba4
11 changed files with 126 additions and 38 deletions
|
@ -323,9 +323,11 @@ check_secret_key( PKT_secret_key *sk, int n )
|
|||
DEK *
|
||||
passphrase_to_dek( u32 *keyid, int pubkey_algo,
|
||||
int cipher_algo, STRING2KEY *s2k, int mode,
|
||||
const char *tmp)
|
||||
const char *tmp, int *canceled)
|
||||
{
|
||||
return NULL;
|
||||
if (canceled)
|
||||
*canceled = 0;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* Stubs to avoid linking to photoid.c */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue