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

* revoke.c (export_minimal_pk), export.c (do_export_stream), passphrase.c

Browse source 
(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.
This commit is contained in:
David Shaw 2004-03-05 00:01:25 +00:00
parent 6d4cc84f3c
commit 1e01514529
7 changed files with 67 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

18
g10/passphrase.c
View file

@ -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");
}