diff options
| author | Werner Koch <[email protected]> | 2017-03-29 08:02:40 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2017-03-29 08:06:29 +0000 |
| commit | 0526c99164d3531b5ec763ffc672407eb24b2296 (patch) | |
| tree | 0deb94a79a1cb2b916548e5d5cbb58114402dc2e /g10/import.c | |
| parent | gpg: Export ring trust packets in backup mode. (diff) | |
| download | gnupg-0526c99164d3531b5ec763ffc672407eb24b2296.tar.gz gnupg-0526c99164d3531b5ec763ffc672407eb24b2296.zip | |
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 <[email protected]>
Diffstat (limited to '')
| -rw-r--r-- | g10/import.c | 4 |
1 files changed, 3 insertions, 1 deletions
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 |