diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 5 | ||||
| -rw-r--r-- | g10/keylist.c | 10 |
2 files changed, 12 insertions, 3 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 9e3e460bd..f76baf987 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +Wed Mar 10 11:26:18 CET 1999 Werner Koch <wk@isil.d.shuttle.de> + + * keylist.c (list_keyblock): Fixed segv in uid. Print 'u' as + validity of sks. + Mon Mar 8 20:47:17 CET 1999 Werner Koch <wk@isil.d.shuttle.de> * getkey.c (classify_user_id): Add new mode 12 (#<lid>). diff --git a/g10/keylist.c b/g10/keylist.c index 1462dbb2f..25b8196bd 100644 --- a/g10/keylist.c +++ b/g10/keylist.c @@ -178,7 +178,7 @@ list_keyblock( KBNODE keyblock, int secret ) sk = node->pkt->pkt.secret_key; keyid_from_sk( sk, keyid ); if( opt.with_colons ) - printf("sec::%u:%d:%08lX%08lX:%s:%s:::", + printf("sec:u:%u:%d:%08lX%08lX:%s:%s:::", nbits_from_sk( sk ), sk->pubkey_algo, (ulong)keyid[0],(ulong)keyid[1], @@ -225,10 +225,14 @@ list_keyblock( KBNODE keyblock, int secret ) if( opt.with_colons ) { byte namehash[20]; - rmd160_hash_buffer( namehash, + if( pk ) { + rmd160_hash_buffer( namehash, node->pkt->pkt.user_id->name, node->pkt->pkt.user_id->len ); - trustletter = query_trust_info( pk, namehash ); + trustletter = query_trust_info( pk, namehash ); + } + else + trustletter = 'u'; printf("uid:%c::::::::", trustletter); } else |