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/keydb.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 'g10/keydb.c')
| -rw-r--r-- | g10/keydb.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/g10/keydb.c b/g10/keydb.c index 27dacf2d5..c0bc9f521 100644 --- a/g10/keydb.c +++ b/g10/keydb.c @@ -1156,6 +1156,7 @@ parse_keyblock_image (iobuf_t iobuf, int pk_no, int uid_no, const u32 *sigstatus, kbnode_t *r_keyblock) { gpg_error_t err; + struct parse_packet_ctx_s parsectx; PACKET *pkt; kbnode_t keyblock = NULL; kbnode_t node, *tail; @@ -1169,12 +1170,13 @@ parse_keyblock_image (iobuf_t iobuf, int pk_no, int uid_no, if (!pkt) return gpg_error_from_syserror (); init_packet (pkt); + init_parse_packet (&parsectx, iobuf); save_mode = set_packet_list_mode (0); in_cert = 0; n_sigs = 0; tail = NULL; pk_count = uid_count = 0; - while ((err = parse_packet (iobuf, pkt)) != -1) + while ((err = parse_packet (&parsectx, pkt)) != -1) { if (gpg_err_code (err) == GPG_ERR_UNKNOWN_PACKET) { |