diff options
| author | David Shaw <[email protected]> | 2004-10-06 21:50:23 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-10-06 21:50:23 +0000 |
| commit | b1e2c5398fb7467d3a72072a0da65424b30de937 (patch) | |
| tree | fc435c0cba7819ff6d8e555c9f01fd05738a3257 /g10/passphrase.c | |
| parent | * keyedit.c (sign_uids, ask_revoke_sig): Improve translatability of user (diff) | |
| download | gnupg-b1e2c5398fb7467d3a72072a0da65424b30de937.tar.gz gnupg-b1e2c5398fb7467d3a72072a0da65424b30de937.zip | |
* helptext.c, pkclist.c (do_we_trust): It is not possible to get here with
a revoked or expired key, so BUG() that case. Remove question about
overriding revoked/expired. Also --keyid-format-ify. (do_we_trust_pre):
Use print_pubkey_info() instead of printing the info ourselves.
* passphrase.c (passphrase_to_dek): Improve translatability of user ID
prompts.
* keylist.c (print_pubkey_info): Use the user ID the pk was selected by,
if any.
Diffstat (limited to '')
| -rw-r--r-- | g10/passphrase.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/g10/passphrase.c b/g10/passphrase.c index 4302075b7..37977fcf3 100644 --- a/g10/passphrase.c +++ b/g10/passphrase.c @@ -1133,15 +1133,13 @@ passphrase_to_dek( u32 *keyid, int pubkey_algo, information on that key. */ if( keyid && !opt.batch && !next_pw && mode!=1 ) { PKT_public_key *pk = m_alloc_clear( sizeof *pk ); - size_t n; char *p; - tty_printf(_("\nYou need a passphrase to unlock the secret key for\n" - "user: \"") ); - p = get_user_id( keyid, &n ); - tty_print_utf8_string( p, n ); + p=get_user_id_native(keyid); + tty_printf("\n"); + tty_printf(_("You need a passphrase to unlock the secret key for\n" + "user: \"%s\"\n"),p); m_free(p); - tty_printf("\"\n"); if( !get_pubkey( pk, keyid ) ) { const char *s = pubkey_algo_to_string( pk->pubkey_algo ); |