From a766a37290cf334d5eead1041ea271a5d714d66f Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 13 May 2009 11:42:34 +0000 Subject: Print keyid in gpg --list-packets. Add some not yet code to app-nks.c Changed batch mode expiration time computation --- g10/parse-packet.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'g10/parse-packet.c') diff --git a/g10/parse-packet.c b/g10/parse-packet.c index 57f94cd85..fd01e7635 100644 --- a/g10/parse-packet.c +++ b/g10/parse-packet.c @@ -1672,6 +1672,7 @@ parse_key (IOBUF inp, int pkttype, unsigned long pktlen, int npkey, nskey; int is_v4=0; int rc=0; + u32 keyid[2]; (void)hdr; @@ -1997,6 +1998,9 @@ parse_key (IOBUF inp, int pkttype, unsigned long pktlen, fprintf (listfp, "\tchecksum: %04hx\n", sk->csum); } } + + if (list_mode) + keyid_from_sk (sk, keyid); } else { PKT_public_key *pk = pkt->pkt.public_key; @@ -2021,8 +2025,14 @@ parse_key (IOBUF inp, int pkttype, unsigned long pktlen, } if (rc) goto leave; + if (list_mode) + keyid_from_pk (pk, keyid); } + if (list_mode) + fprintf (listfp, "\tkeyid: %08lX%08lX\n", + (ulong)keyid[0], (ulong)keyid[1]); + leave: iobuf_skip_rest(inp, pktlen, 0); return rc; -- cgit