security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

g10: Fix --list-packets.

Browse source 
* g10/gpg.c (main): Call set_packet_list_mode after assignment of
opt.list_packets.
* g10/mainproc.c (do_proc_packets): Don't stop processing with
--list-packets as the comment says.
* g10/options.h (list_packets): Fix the comment.
* g10/parse-packet.c: Fix the condition for opt.list_packets.

--

(backport from 2.0 commit 4f336ed780
which is backport of master
commit 52f65281f9)

Debian-bug-id: 828109
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2016-06-28 15:56:48 +09:00
parent db246f8b18
commit 39e32d375e
4 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
g10/mainproc.c
View file

@ -1264,7 +1264,7 @@ do_proc_packets( CTX c, IOBUF a )
free_packet(pkt);
/* stop processing when an invalid packet has been encountered
* but don't do so when we are doing a --list-packets. */
if( rc == G10ERR_INVALID_PACKET && opt.list_packets != 2 )
if( rc == G10ERR_INVALID_PACKET && opt.list_packets == 0 )
break;
continue;
}