diff options
| author | David Shaw <[email protected]> | 2004-03-05 00:01:25 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-03-05 00:01:25 +0000 |
| commit | 1e0151452986e42dd201b2b574b5f2d4a001812c (patch) | |
| tree | ff031151969f6a5cb096db1e9b39bd20cd298133 /g10/passphrase.c | |
| parent | * iobuf.c (block_filter): Remove the old gpg indeterminate length mode. (diff) | |
| download | gnupg-1e0151452986e42dd201b2b574b5f2d4a001812c.tar.gz gnupg-1e0151452986e42dd201b2b574b5f2d4a001812c.zip | |
* revoke.c (export_minimal_pk), export.c (do_export_stream), passphrase.c
(passphrase_to_dek), keyserver.c (print_keyrec): A few more places to use
--keyid-format.
* options.h, g10.c (main), export.c (parse_export_options,
do_export_stream): Remove --export-all and the "include-non-rfc"
export-option as they are no longer meaningful with the removal of v3
Elgamal keys.
Diffstat (limited to '')
| -rw-r--r-- | g10/passphrase.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/g10/passphrase.c b/g10/passphrase.c index d3989bbe0..870ad9770 100644 --- a/g10/passphrase.c +++ b/g10/passphrase.c @@ -1,5 +1,6 @@ /* passphrase.c - Get a passphrase - * Copyright (C) 1998,1999,2000,2001,2002,2003 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, + * 2004 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -1124,12 +1125,21 @@ passphrase_to_dek( u32 *keyid, int pubkey_algo, if( !get_pubkey( pk, keyid ) ) { const char *s = pubkey_algo_to_string( pk->pubkey_algo ); - tty_printf( _("%u-bit %s key, ID %08lX, created %s"), - nbits_from_pk( pk ), s?s:"?", (ulong)keyid[1], + tty_printf( _("%u-bit %s key, ID %s, created %s"), + nbits_from_pk( pk ), s?s:"?", keystr(keyid), strtimestamp(pk->timestamp) ); if( keyid[2] && keyid[3] && keyid[0] != keyid[2] && keyid[1] != keyid[3] ) - tty_printf( _(" (main key ID %08lX)"), (ulong)keyid[3] ); + { + if(keystrlen()>10) + { + tty_printf("\n"); + tty_printf(_(" (main key ID %s)"), + keystr(&keyid[2]) ); + } + else + tty_printf( _(" (main key ID %s)"), keystr(&keyid[2]) ); + } tty_printf("\n"); } |