diff options
| author | Neal H. Walfield <[email protected]> | 2015-09-01 12:53:47 +0000 |
|---|---|---|
| committer | Neal H. Walfield <[email protected]> | 2015-09-02 13:08:58 +0000 |
| commit | bd0c902f1de46eda03a065da41487e7e01ab4c50 (patch) | |
| tree | 534617661384c5f6168e29498a4f9cdf5692a000 | |
| parent | g10: Use a symbolic constant instead of a literal. (diff) | |
| download | gnupg-bd0c902f1de46eda03a065da41487e7e01ab4c50.tar.gz gnupg-bd0c902f1de46eda03a065da41487e7e01ab4c50.zip | |
g10: Remove unused field req_algo.
* g10/packet.h (PKT_public_key): Remove unused field req_algo. Remove
users.
* g10/getkey.c (struct getkey_ctx_s): Remove unused field req_algo.
Remove users.
--
Signed-off-by: Neal H. Walfield <[email protected]>.
| -rw-r--r-- | g10/getkey.c | 4 | ||||
| -rw-r--r-- | g10/packet.h | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/g10/getkey.c b/g10/getkey.c index 6e8583496..7aeaebc3f 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -55,7 +55,6 @@ struct getkey_ctx_s KBNODE found_key; /* Pointer into some keyblock. */ strlist_t extra_list; /* Will be freed when releasing the context. */ int req_usage; - int req_algo; KEYDB_HANDLE kr_handle; int not_allocated; int nitems; @@ -392,7 +391,6 @@ get_pubkey (PKT_public_key * pk, u32 * keyid) ctx.items[0].mode = KEYDB_SEARCH_MODE_LONG_KID; ctx.items[0].u.kid[0] = keyid[0]; ctx.items[0].u.kid[1] = keyid[1]; - ctx.req_algo = pk->req_algo; ctx.req_usage = pk->req_usage; rc = lookup (&ctx, &kb, 0); if (!rc) @@ -524,7 +522,6 @@ get_seckey (PKT_public_key *pk, u32 *keyid) ctx.items[0].mode = KEYDB_SEARCH_MODE_LONG_KID; ctx.items[0].u.kid[0] = keyid[0]; ctx.items[0].u.kid[1] = keyid[1]; - ctx.req_algo = pk->req_algo; ctx.req_usage = pk->req_usage; err = lookup (&ctx, &keyblock, 1); if (!err) @@ -661,7 +658,6 @@ key_byname (GETKEY_CTX *retctx, strlist_t namelist, if (pk) { - ctx->req_algo = pk->req_algo; ctx->req_usage = pk->req_usage; } diff --git a/g10/packet.h b/g10/packet.h index 826963e40..1906ec590 100644 --- a/g10/packet.h +++ b/g10/packet.h @@ -273,7 +273,6 @@ typedef struct byte pubkey_algo; /* algorithm used for public key scheme */ byte pubkey_usage; /* for now only used to pass it to getkey() */ byte req_usage; /* hack to pass a request to getkey() */ - byte req_algo; /* Ditto */ u32 has_expired; /* set to the expiration date if expired */ u32 main_keyid[2]; /* keyid of the primary key */ u32 keyid[2]; /* calculated by keyid_from_pk() */ |