summaryrefslogtreecommitdiffstats
path: root/g10/keylist.c
diff options
context:
space:
mode:
authorDavid Shaw <dshaw@jabberwocky.com>2002-10-03 00:01:29 +0200
committerDavid Shaw <dshaw@jabberwocky.com>2002-10-03 00:01:29 +0200
commit58972f24c406ab1619efac2b3ff91e13923efe5f (patch)
treea7d38634c3621ec7b8412eda3f3641d5be8fbd73 /g10/keylist.c
parent* longlong.h: Some whitespace changes in HPPA to fix assembler problems on (diff)
downloadgnupg2-58972f24c406ab1619efac2b3ff91e13923efe5f.tar.xz
gnupg2-58972f24c406ab1619efac2b3ff91e13923efe5f.zip
* import.c (import_secret_one): Check for an illegal (>110) protection
cipher when importing a secret key. * keylist.c (list_keyblock_print): Show a '#' for a secret-parts-missing key. * parse_packet.c (parse_key): Some comments. * revoke.c (gen_revoke): Remove some debugging code. * trustdb.c (verify_own_keys): Make trusted-key a non-deprecated option again. * seckey-cert.c (do_check): Don't give the IDEA warning unless the cipher in question is in fact IDEA.
Diffstat (limited to 'g10/keylist.c')
-rw-r--r--g10/keylist.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/g10/keylist.c b/g10/keylist.c
index 829b81249..1cea96a7a 100644
--- a/g10/keylist.c
+++ b/g10/keylist.c
@@ -409,10 +409,11 @@ list_keyblock_print ( KBNODE keyblock, int secret, int fpr, void *opaque )
pk = NULL;
sk = node->pkt->pkt.secret_key;
keyid_from_sk( sk, keyid );
- printf("sec %4u%c/%08lX %s ", nbits_from_sk( sk ),
- pubkey_letter( sk->pubkey_algo ),
- (ulong)keyid[1],
- datestr_from_sk( sk ) );
+ printf("sec%c %4u%c/%08lX %s ", (sk->protect.s2k.mode==1001)?'#':' ',
+ nbits_from_sk( sk ),
+ pubkey_letter( sk->pubkey_algo ),
+ (ulong)keyid[1],
+ datestr_from_sk( sk ) );
}
else {
pk = node->pkt->pkt.public_key;