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 (read_passphrase_from_fd): Do a dummy read if the

Browse source 
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.
This commit is contained in:
Werner Koch 2003-04-10 09:56:47 +00:00
parent 3cf45b304e
commit 6b55878912
11 changed files with 178 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

20
g10/decrypt.c
View file

@ -1,5 +1,5 @@
/* decrypt.c - verify signed data
* Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
* Copyright (C) 1998,1999,2000,2001,2002,2003 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
@ -99,12 +99,12 @@ decrypt_messages(int nfiles, char **files)
print_file_status(STATUS_FILE_START, *files, 3);
output = make_outfile_name(*files);
if (!output)
continue;
goto next_file;
fp = iobuf_open(*files);
if (!fp)
{
log_error(_("can't open `%s'\n"), print_fname_stdin(*files));
continue;
goto next_file;
}
if (!opt.no_armor)
{
@ -122,17 +122,13 @@ decrypt_messages(int nfiles, char **files)
p = get_last_passphrase();
set_next_passphrase(p);
m_free (p);
files++;
m_free(output);
next_file:
/* Note that we emit file_done even after an error. */
write_status( STATUS_FILE_DONE );
m_free(output);
files++;
}
set_next_passphrase(NULL);
}