* passphrase.c (read_passphrase_from_fd): Do a dummy read if the

agent is to be used.  Noted by Ingo Kl�cker.
(agent_get_passphrase): Inhibit caching when we have no
fingerprint.  This is required for key generation as well as for
symmetric only encryption.

* 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.

1 files changed, 2 insertions, 2 deletions

diff --git a/g10/mainproc.c b/g10/mainproc.c
index 97af59591..1911d0076 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -292,7 +292,7 @@ proc_symkey_enc( CTX c, PACKET *pkt )
 	c->last_was_session_key = 2;
 	if ( opt.list_only )
     	    goto leave;
-	c->dek = passphrase_to_dek( NULL, 0, algo, &enc->s2k, 0, NULL );
+	c->dek = passphrase_to_dek( NULL, 0, algo, &enc->s2k, 0, NULL, NULL );
         if (c->dek)
             c->dek->algo_info_printed = 1;
         if ( c->dek && enc->seskeylen )
@@ -486,7 +486,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, NULL );
+	c->dek = passphrase_to_dek ( NULL, 0, algo, s2k, 0, NULL, NULL );
         if (c->dek)
             c->dek->algo_info_printed = 1;
     }