diff options
| author | Justus Winter <[email protected]> | 2016-10-27 16:48:51 +0000 |
|---|---|---|
| committer | Justus Winter <[email protected]> | 2016-11-03 14:04:18 +0000 |
| commit | ab89164be02012f1bf159c971853b8610e966301 (patch) | |
| tree | 98026764c92c0b2d34134a327738b65f0c896386 /g10/keydb.h | |
| parent | gpgscm,tests: Add new functions to the test environment. (diff) | |
| download | gnupg-ab89164be02012f1bf159c971853b8610e966301.tar.gz gnupg-ab89164be02012f1bf159c971853b8610e966301.zip | |
g10: Improve and unify key selection for -r and --locate-keys.
* g10/getkey.c (struct pubkey_cmp_cookie): New type.
(key_is_ok, uid_is_ok, subkey_is_ok): New functions.
(pubkey_cmp): Likewise.
(get_best_pubkey_byname): Likewise.
* g10/keydb.h (get_best_pubkey_byname): New prototype.
* g10/keylist.c (locate_one): Use the new function.
* g10/pkclist.c (find_and_check_key): Likewise.
* tests/openpgp/Makefile.am (XTESTS): Add new test.
(TEST_FILES): Add new files.
* tests/openpgp/key-selection.scm: New file.
* tests/openpgp/key-selection/0.asc: Likewise.
* tests/openpgp/key-selection/1.asc: Likewise.
* tests/openpgp/key-selection/2.asc: Likewise.
* tests/openpgp/key-selection/3.asc: Likewise.
* tests/openpgp/key-selection/4.asc: Likewise.
--
When a name resembling a mail address is given to either --locate-keys
or --recipient, rank the search results and use only the most relevant
key.
This also lets us query which key will be used for encryption using
--locate-keys. However, note that --locate-keys may also return keys
incapable of encryption, though it will prefer keys that have an
encryption subkey.
GnuPG-bug-id: 2359
Signed-off-by: Justus Winter <[email protected]>
Diffstat (limited to 'g10/keydb.h')
| -rw-r--r-- | g10/keydb.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/g10/keydb.h b/g10/keydb.h index 35512bb07..6133202e6 100644 --- a/g10/keydb.h +++ b/g10/keydb.h @@ -324,6 +324,13 @@ int get_pubkey_byname (ctrl_t ctrl, KBNODE *ret_keyblock, KEYDB_HANDLE *ret_kdbhd, int include_unusable, int no_akl ); +/* Likewise, but only return the best match if NAME resembles a mail + * address. */ +int get_best_pubkey_byname (ctrl_t ctrl, + GETKEY_CTX *retctx, PKT_public_key *pk, + const char *name, KBNODE *ret_keyblock, + int include_unusable, int no_akl); + /* Get a public key directly from file FNAME. */ gpg_error_t get_pubkey_fromfile (ctrl_t ctrl, PKT_public_key *pk, const char *fname); |