security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +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

4
g10/mainproc.c
View file

@ -257,7 +257,7 @@ proc_symkey_enc( CTX c, PACKET *pkt )
log_info(_("encrypted with unknown algorithm %d\n"), algo );
c->last_was_session_key = 2;
c->dek = passphrase_to_dek( NULL, 0, algo, &enc->s2k, 0 );
c->dek = passphrase_to_dek( NULL, 0, algo, &enc->s2k, 0, NULL );
if (c->dek)
c->dek->algo_info_printed = 1;
}
@ -448,7 +448,7 @@ proc_encrypted( CTX c, PACKET *pkt )
log_info (_("assuming %s encrypted data\n"), "IDEA");
}
c->dek = passphrase_to_dek ( NULL, 0, algo, s2k, 0 );
c->dek = passphrase_to_dek ( NULL, 0, algo, s2k, 0, NULL );
if (c->dek)
c->dek->algo_info_printed = 1;
}