diff options
| author | Werner Koch <[email protected]> | 2003-04-10 09:56:47 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2003-04-10 09:56:47 +0000 |
| commit | 6b5587891221213706b131e262f95072b5ff6a63 (patch) | |
| tree | f7ad6f0ea7eb77469d8e79cfc79e934087009bcd /g10/encode.c | |
| parent | * main.h, g10.c (main), import.c (parse_import_options, (diff) | |
| download | gnupg-6b5587891221213706b131e262f95072b5ff6a63.tar.gz gnupg-6b5587891221213706b131e262f95072b5ff6a63.zip | |
* 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.
Diffstat (limited to 'g10/encode.c')
| -rw-r--r-- | g10/encode.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/g10/encode.c b/g10/encode.c index e705a6fad..d1b0cdb11 100644 --- a/g10/encode.c +++ b/g10/encode.c @@ -194,7 +194,8 @@ encode_simple( const char *filename, int mode, int compat ) s2k->mode = opt.rfc1991? 0:opt.s2k_mode; s2k->hash_algo = opt.s2k_digest_algo; cfx.dek = passphrase_to_dek( NULL, 0, - default_cipher_algo(), s2k, 2, NULL ); + default_cipher_algo(), s2k, 2, + NULL, NULL); if( !cfx.dek || !cfx.dek->keylen ) { rc = G10ERR_PASSPHRASE; m_free(cfx.dek); |