security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-03 12:11:33 +01:00
Code Activity

gpg: Make read_block in import.c more flexible.

Browse Source 
* g10/import.c: Change arg 'with_meta' to 'options'.  Change callers.
--

This chnage allows to pass more options to read_block.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2019-07-01 14:01:08 +02:00
parent 7c877f942a
commit 894b72d796
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
g10/import.c
View File

@ -102,7 +102,7 @@ static int import (ctrl_t ctrl,
unsigned char **fpr, size_t *fpr_len, unsigned int options, unsigned char **fpr, size_t *fpr_len, unsigned int options,
import_screener_t screener, void *screener_arg, import_screener_t screener, void *screener_arg,
int origin, const char *url); int origin, const char *url);
static int read_block (IOBUF a, int with_meta, static int read_block (IOBUF a, unsigned int options,
PACKET **pending_pkt, kbnode_t *ret_root, int *r_v3keys); PACKET **pending_pkt, kbnode_t *ret_root, int *r_v3keys);
static void revocation_present (ctrl_t ctrl, kbnode_t keyblock); static void revocation_present (ctrl_t ctrl, kbnode_t keyblock);
static gpg_error_t import_one (ctrl_t ctrl, static gpg_error_t import_one (ctrl_t ctrl,
@ -589,8 +589,7 @@ import (ctrl_t ctrl, IOBUF inp, const char* fname,struct import_stats_s *stats,
release_armor_context (afx); release_armor_context (afx);
} }
while (!(rc = read_block (inp, !!(options & IMPORT_RESTORE), while (!(rc = read_block (inp, options, &pending_pkt, &keyblock, &v3keys)))
&pending_pkt, &keyblock, &v3keys)))
{ {
stats->v3keys += v3keys; stats->v3keys += v3keys;
if (keyblock->pkt->pkttype == PKT_PUBLIC_KEY) if (keyblock->pkt->pkttype == PKT_PUBLIC_KEY)
@ -845,16 +844,16 @@ valid_keyblock_packet (int pkttype)
} }
/**************** /* Read the next keyblock from stream A. Meta data (ring trust
* Read the next keyblock from stream A. * packets) are only considered if OPTIONS has the IMPORT_RESTORE flag
* Meta data (ring trust packets) are only considered of WITH_META is set. * set. PENDING_PKT should be initialized to NULL and not changed by
* PENDING_PKT should be initialized to NULL and not changed by the caller. * the caller.
* Return: 0 = okay, -1 no more blocks or another errorcode. *
* The int at R_V3KEY counts the number of unsupported v3 * Returns 0 for okay, -1 no more blocks, or any other errorcode. The
* keyblocks. * integer at R_V3KEY counts the number of unsupported v3 keyblocks.
*/ */
static int static int
read_block( IOBUF a, int with_meta, read_block( IOBUF a, unsigned int options,
PACKET **pending_pkt, kbnode_t *ret_root, int *r_v3keys) PACKET **pending_pkt, kbnode_t *ret_root, int *r_v3keys)
{ {
int rc; int rc;
@ -877,7 +876,7 @@ read_block( IOBUF a, int with_meta,
pkt = xmalloc (sizeof *pkt); pkt = xmalloc (sizeof *pkt);
init_packet (pkt); init_packet (pkt);
init_parse_packet (&parsectx, a); init_parse_packet (&parsectx, a);
if (!with_meta) if (!(options & IMPORT_RESTORE))
parsectx.skip_meta = 1; parsectx.skip_meta = 1;
in_v3key = 0; in_v3key = 0;
skip_sigs = 0; skip_sigs = 0;