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

* skclist.c (build_sk_list): Don't need to warn about PGP-generated

Browse source 
Elgamal signing keys since we no longer support any Elgamal signing keys.

* sign.c (sign_file, clearsign_file): Use "writing to" instead of "writing
to file" to match other strings.

* pkclist.c (check_signatures_trust): Fix typo.  Noted by Moray Allan.
This is Debian bug #278708.

* passphrase.c (ask_passphrase, passphrase_to_dek): "password" ->
"passphrase".

* keyedit.c (show_key_with_all_names): Show designated revoker as part of
translatable string.
This commit is contained in:
David Shaw 2004-10-28 22:09:09 +00:00
parent 0934d10e0f
commit 6ab8378c00
6 changed files with 77 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

9
g10/passphrase.c
View file

@ -1050,7 +1050,7 @@ ask_passphrase (const char *description,
}
else if (opt.batch)
{
log_error(_("can't query password in batch mode\n"));
log_error(_("can't query passphrase in batch mode\n"));
pw = NULL;
}
else {
@ -1207,10 +1207,11 @@ passphrase_to_dek( u32 *keyid, int pubkey_algo,
pw = m_alloc_secure( strlen(fd_passwd)+1 );
strcpy( pw, fd_passwd );
}
else if( opt.batch ) {
log_error(_("can't query password in batch mode\n"));
else if( opt.batch )
{
log_error(_("can't query passphrase in batch mode\n"));
pw = m_strdup( "" ); /* return an empty passphrase */
}
}
else {
/* Read the passphrase from the tty or the command-fd. */
pw = cpr_get_hidden("passphrase.enter", _("Enter passphrase: ") );