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

gpg: Pass CTRL also to getkey_end.

Browse Source 
* g10/getkey.c (getkey_end): Add arg CTRL.  Change all callers.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2017-03-31 20:35:28 +02:00
parent 3a10de3bfd
commit aca5f494a8
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
4 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
g10/export.c
View File

@ -2155,7 +2155,7 @@ export_ssh_key (ctrl_t ctrl, const char *userid)
else if (gpg_err_code (err) == GPG_ERR_NO_PUBKEY) else if (gpg_err_code (err) == GPG_ERR_NO_PUBKEY)
err = 0; err = 0;
} }
getkey_end (getkeyctx); getkey_end (ctrl, getkeyctx);
} }
if (err) if (err)
{ {

36
g10/getkey.c
View File

@ -558,7 +558,7 @@ get_pubkeys (ctrl_t ctrl,
results = r; results = r;
} }
while (ctx); while (ctx);
getkey_end (ctx); getkey_end (ctrl, ctx);
if (DBG_LOOKUP) if (DBG_LOOKUP)
{ {
@ -752,7 +752,7 @@ get_pubkey (ctrl_t ctrl, PKT_public_key * pk, u32 * keyid)
{ {
pk_from_block (pk, kb, found_key); pk_from_block (pk, kb, found_key);
} }
getkey_end (&ctx); getkey_end (ctrl, &ctx);
release_kbnode (kb); release_kbnode (kb);
} }
if (!rc) if (!rc)
@ -868,7 +868,7 @@ get_pubkeyblock (ctrl_t ctrl, u32 * keyid)
ctx.items[0].u.kid[0] = keyid[0]; ctx.items[0].u.kid[0] = keyid[0];
ctx.items[0].u.kid[1] = keyid[1]; ctx.items[0].u.kid[1] = keyid[1];
rc = lookup (ctrl, &ctx, 0, &keyblock, NULL); rc = lookup (ctrl, &ctx, 0, &keyblock, NULL);
getkey_end (&ctx); getkey_end (ctrl, &ctx);
return rc ? NULL : keyblock; return rc ? NULL : keyblock;
} }
@ -915,7 +915,7 @@ get_seckey (ctrl_t ctrl, PKT_public_key *pk, u32 *keyid)
{ {
pk_from_block (pk, keyblock, found_key); pk_from_block (pk, keyblock, found_key);
} }
getkey_end (&ctx); getkey_end (ctrl, &ctx);
release_kbnode (keyblock); release_kbnode (keyblock);
if (!err) if (!err)
@ -1109,7 +1109,7 @@ key_byname (ctrl_t ctrl, GETKEY_CTX *retctx, strlist_t namelist,
if (!ctx->kr_handle) if (!ctx->kr_handle)
{ {
rc = gpg_error_from_syserror (); rc = gpg_error_from_syserror ();
getkey_end (ctx); getkey_end (ctrl, ctx);
return rc; return rc;
} }
@ -1138,7 +1138,7 @@ key_byname (ctrl_t ctrl, GETKEY_CTX *retctx, strlist_t namelist,
*ret_kdbhd = ctx->kr_handle; *ret_kdbhd = ctx->kr_handle;
ctx->kr_handle = NULL; ctx->kr_handle = NULL;
} }
getkey_end (ctx); getkey_end (ctrl, ctx);
} }
return rc; return rc;
@ -1310,7 +1310,7 @@ get_pubkey_byname (ctrl_t ctrl, GETKEY_CTX * retctx, PKT_public_key * pk,
did_akl_local = 1; did_akl_local = 1;
if (retctx) if (retctx)
{ {
getkey_end (*retctx); getkey_end (ctrl, *retctx);
*retctx = NULL; *retctx = NULL;
} }
add_to_strlist (&namelist, name); add_to_strlist (&namelist, name);
@ -1428,7 +1428,7 @@ get_pubkey_byname (ctrl_t ctrl, GETKEY_CTX * retctx, PKT_public_key * pk,
* keyring. */ * keyring. */
if (retctx) if (retctx)
{ {
getkey_end (*retctx); getkey_end (ctrl, *retctx);
*retctx = NULL; *retctx = NULL;
} }
rc = key_byname (ctrl, anylocalfirst ? retctx : NULL, rc = key_byname (ctrl, anylocalfirst ? retctx : NULL,
@ -1453,7 +1453,7 @@ get_pubkey_byname (ctrl_t ctrl, GETKEY_CTX * retctx, PKT_public_key * pk,
if (rc && retctx) if (rc && retctx)
{ {
getkey_end (*retctx); getkey_end (ctrl, *retctx);
*retctx = NULL; *retctx = NULL;
} }
@ -1589,7 +1589,7 @@ get_best_pubkey_byname (ctrl_t ctrl, GETKEY_CTX *retctx, PKT_public_key *pk,
if (rc) if (rc)
{ {
if (ctx) if (ctx)
getkey_end (ctx); getkey_end (ctrl, ctx);
return rc; return rc;
} }
@ -1626,7 +1626,7 @@ get_best_pubkey_byname (ctrl_t ctrl, GETKEY_CTX *retctx, PKT_public_key *pk,
new.uid = NULL; new.uid = NULL;
} }
} }
getkey_end (ctx); getkey_end (ctrl, ctx);
ctx = NULL; ctx = NULL;
free_user_id (best.uid); free_user_id (best.uid);
best.uid = NULL; best.uid = NULL;
@ -1675,14 +1675,14 @@ get_best_pubkey_byname (ctrl_t ctrl, GETKEY_CTX *retctx, PKT_public_key *pk,
if (rc && ctx) if (rc && ctx)
{ {
getkey_end (ctx); getkey_end (ctrl, ctx);
ctx = NULL; ctx = NULL;
} }
if (retctx && ctx) if (retctx && ctx)
*retctx = ctx; *retctx = ctx;
else else
getkey_end (ctx); getkey_end (ctrl, ctx);
return rc; return rc;
} }
@ -1799,7 +1799,7 @@ get_pubkey_byfprint (ctrl_t ctrl, PKT_public_key *pk, kbnode_t *r_keyblock,
kb = NULL; kb = NULL;
} }
release_kbnode (kb); release_kbnode (kb);
getkey_end (&ctx); getkey_end (ctrl, &ctx);
} }
else else
rc = GPG_ERR_GENERAL; /* Oops */ rc = GPG_ERR_GENERAL; /* Oops */
@ -2204,7 +2204,7 @@ getkey_next (ctrl_t ctrl, getkey_ctx_t ctx,
/* Release any resources used by a key listing context. This must be /* Release any resources used by a key listing context. This must be
* called on the context returned by, e.g., getkey_byname. */ * called on the context returned by, e.g., getkey_byname. */
void void
getkey_end (getkey_ctx_t ctx) getkey_end (ctrl_t ctrl, getkey_ctx_t ctx)
{ {
if (ctx) if (ctx)
{ {
@ -3833,7 +3833,7 @@ enum_secret_keys (ctrl_t ctrl, void **context, PKT_public_key *sk)
{ {
/* Free the context. */ /* Free the context. */
release_kbnode (c->keyblock); release_kbnode (c->keyblock);
getkey_end (c->ctx); getkey_end (ctrl, c->ctx);
xfree (c); xfree (c);
*context = NULL; *context = NULL;
return 0; return 0;
@ -3881,7 +3881,7 @@ enum_secret_keys (ctrl_t ctrl, void **context, PKT_public_key *sk)
{ {
release_kbnode (keyblock); release_kbnode (keyblock);
keyblock = NULL; keyblock = NULL;
getkey_end (c->ctx); getkey_end (ctrl, c->ctx);
c->ctx = NULL; c->ctx = NULL;
} }
c->state++; c->state++;
@ -3895,7 +3895,7 @@ enum_secret_keys (ctrl_t ctrl, void **context, PKT_public_key *sk)
{ {
release_kbnode (keyblock); release_kbnode (keyblock);
keyblock = NULL; keyblock = NULL;
getkey_end (c->ctx); getkey_end (ctrl, c->ctx);
c->ctx = NULL; c->ctx = NULL;
} }
} }

2
g10/keydb.h
View File

@ -372,7 +372,7 @@ gpg_error_t getkey_next (ctrl_t ctrl, getkey_ctx_t ctx,
PKT_public_key *pk, kbnode_t *ret_keyblock); PKT_public_key *pk, kbnode_t *ret_keyblock);
/* Release any resources used by a key listing context. */ /* Release any resources used by a key listing context. */
void getkey_end (getkey_ctx_t ctx); void getkey_end (ctrl_t ctrl, getkey_ctx_t ctx);
/* Return the database handle used by this context. The context still /* Return the database handle used by this context. The context still
owns the handle. */ owns the handle. */

6
g10/keylist.c
View File

@ -608,7 +608,7 @@ list_one (ctrl_t ctrl, strlist_t names, int secret, int mark_secret)
if (rc) if (rc)
{ {
log_error ("error reading key: %s\n", gpg_strerror (rc)); log_error ("error reading key: %s\n", gpg_strerror (rc));
getkey_end (ctx); getkey_end (ctrl, ctx);
return; return;
} }
@ -627,7 +627,7 @@ list_one (ctrl_t ctrl, strlist_t names, int secret, int mark_secret)
release_kbnode (keyblock); release_kbnode (keyblock);
} }
while (!getkey_next (ctrl, ctx, NULL, &keyblock)); while (!getkey_next (ctrl, ctx, NULL, &keyblock));
getkey_end (ctx); getkey_end (ctrl, ctx);
if (opt.check_sigs && !opt.with_colons) if (opt.check_sigs && !opt.with_colons)
print_signature_stats (&listctx); print_signature_stats (&listctx);
@ -668,7 +668,7 @@ locate_one (ctrl_t ctrl, strlist_t names)
release_kbnode (keyblock); release_kbnode (keyblock);
} }
while (ctx && !getkey_next (ctrl, ctx, NULL, &keyblock)); while (ctx && !getkey_next (ctrl, ctx, NULL, &keyblock));
getkey_end (ctx); getkey_end (ctrl, ctx);
ctx = NULL; ctx = NULL;
} }
} }