diff options
| -rw-r--r-- | g10/getkey.c | 17 | ||||
| -rw-r--r-- | g10/keydb.h | 2 |
2 files changed, 1 insertions, 18 deletions
diff --git a/g10/getkey.c b/g10/getkey.c index 04022e47e..6fb3d867f 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -51,7 +51,6 @@ struct getkey_ctx_s { int exact; int want_secret; /* The caller requested only secret keys. */ - strlist_t extra_list; /* Will be freed when releasing the context. */ int req_usage; KEYDB_HANDLE kr_handle; int not_allocated; @@ -911,25 +910,12 @@ get_pubkey_byname (ctrl_t ctrl, GETKEY_CTX * retctx, PKT_public_key * pk, *retctx = NULL; } - if (retctx && *retctx) - { - assert (!(*retctx)->extra_list); - (*retctx)->extra_list = namelist; - } - else - free_strlist (namelist); + free_strlist (namelist); return rc; } int -get_pubkey_bynames (GETKEY_CTX * retctx, PKT_public_key * pk, - strlist_t names, KBNODE * ret_keyblock) -{ - return key_byname (retctx, names, pk, 0, 1, ret_keyblock, NULL); -} - -int get_pubkey_next (GETKEY_CTX ctx, PKT_public_key * pk, KBNODE * ret_keyblock) { return gpg_err_code (getkey_next (ctx, pk, ret_keyblock)); @@ -1277,7 +1263,6 @@ getkey_end (getkey_ctx_t ctx) if (ctx) { keydb_release (ctx->kr_handle); - free_strlist (ctx->extra_list); if (!ctx->not_allocated) xfree (ctx); } diff --git a/g10/keydb.h b/g10/keydb.h index a943ded88..2eeb91052 100644 --- a/g10/keydb.h +++ b/g10/keydb.h @@ -407,8 +407,6 @@ int get_pubkey_byname (ctrl_t ctrl, GETKEY_CTX *rx, PKT_public_key *pk, const char *name, KBNODE *ret_keyblock, KEYDB_HANDLE *ret_kdbhd, int include_unusable, int no_akl ); -int get_pubkey_bynames( GETKEY_CTX *rx, PKT_public_key *pk, - strlist_t names, KBNODE *ret_keyblock ); int get_pubkey_next( GETKEY_CTX ctx, PKT_public_key *pk, KBNODE *ret_keyblock ); void get_pubkey_end( GETKEY_CTX ctx ); gpg_error_t get_seckey (PKT_public_key *pk, u32 *keyid); |