From 0526c99164d3531b5ec763ffc672407eb24b2296 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 29 Mar 2017 10:02:40 +0200 Subject: gpg: Change parse_packet to take a context. * g10/packet.h (struct parse_packet_ctx_s): New. (parse_packet_ctx_t): New type. (init_parse_packet): New macro. * g10/parse-packet.c (parse_packet, dbg_parse_packet): Change to take a parse context. Change all callers to provide a context instead of directly supplying the input stream. (search_packet, dbg_search_packet): Ditto. (copy_all_packets, dbg_copy_all_packets): Init an use a parse context. (copy_some_packets, dbg_copy_some_packets): Ditto. (skip_some_packets, dbg_skip_some_packets): Ditto. -- We will need this change to handle ring packets inside the parser. Signed-off-by: Werner Koch --- g10/import.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'g10/import.c') diff --git a/g10/import.c b/g10/import.c index ea7a92f58..9aa6c8b66 100644 --- a/g10/import.c +++ b/g10/import.c @@ -762,6 +762,7 @@ static int read_block( IOBUF a, PACKET **pending_pkt, kbnode_t *ret_root, int *r_v3keys) { int rc; + struct parse_packet_ctx_s parsectx; PACKET *pkt; kbnode_t root = NULL; int in_cert, in_v3key; @@ -779,8 +780,9 @@ read_block( IOBUF a, PACKET **pending_pkt, kbnode_t *ret_root, int *r_v3keys) pkt = xmalloc (sizeof *pkt); init_packet (pkt); + init_parse_packet (&parsectx, a); in_v3key = 0; - while ((rc=parse_packet(a, pkt)) != -1) + while ((rc=parse_packet (&parsectx, pkt)) != -1) { if (rc && (gpg_err_code (rc) == GPG_ERR_LEGACY_KEY && (pkt->pkttype == PKT_PUBLIC_KEY -- cgit v1.2.3