security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

* passphrase.c (passphrase_to_dek): Add tryagain_text arg to be

Browse source 
used with the agent.  Changed all callers.
(agent_get_passphrase): Likewise and send it to the agent
* seckey-cert.c (do_check): New arg tryagain_text.
(check_secret_key): Pass the string to do_check.
* keygen.c (ask_passphrase): Set the error text is required.
* keyedit.c (change_passphrase): Ditto.
* passphrase.c (agent_open): Disable opt.use_agent in case of a
problem with the agent.
(agent_get_passphrase): Ditto.
(passphrase_clear_cache): Ditto.
This commit is contained in:
Werner Koch 2002-01-20 18:33:04 +00:00
parent 1e7350da8e
commit 5a92c6052f
10 changed files with 101 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

7
g10/keyedit.c
View file

@ -641,6 +641,7 @@ change_passphrase( KBNODE keyblock )
else {
DEK *dek = NULL;
STRING2KEY *s2k = m_alloc_secure( sizeof *s2k );
const char *errtext = NULL;
tty_printf(_("Enter the new passphrase for this secret key.\n\n") );
@ -648,9 +649,11 @@ change_passphrase( KBNODE keyblock )
for(;;) {
s2k->mode = opt.s2k_mode;
s2k->hash_algo = opt.s2k_digest_algo;
dek = passphrase_to_dek( NULL, 0, opt.s2k_cipher_algo, s2k, 2 );
dek = passphrase_to_dek( NULL, 0, opt.s2k_cipher_algo,
s2k, 2, errtext);
if( !dek ) {
tty_printf(_("passphrase not correctly repeated; try again.\n"));
errtext = _("passphrase not correctly repeated; try again");
tty_printf ("%s.\n", errtext);
}
else if( !dek->keylen ) {
rc = 0;