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

gpg: New option --key-origin.

Browse source 
* g10/keydb.h (KEYORG_): Rename to KEYORG_.
* g10/packet.h (PKT_user_id): Rename field keysrc to keyorg.  Adjust
users.
(PKT_public_key): Ditto.
(PKT_ring_trust): Ditto.
* g10/options.h (struct opt): Add field key_origin.
* g10/getkey.c (parse_key_origin): New.
* g10/gpg.c (oKeyOrigin): New.
(opts): Add "keys-origin".
(main): Set option.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2017-07-13 17:28:32 +02:00
parent 877a321d01
commit fa1155e89e
No known key found for this signature in database
GPG key ID: E3FDFF218E45B72B
10 changed files with 83 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

16
g10/keydb.h
View file

@ -119,13 +119,14 @@ union pref_hint
/* Constants to describe from where a key was fetched or updated. */
enum
{
KEYSRC_UNKNOWN = 0,
KEYSRC_FILE = 1, /* Direct import from a file. */
KEYSRC_KS = 2, /* Public keyserver. */
KEYSRC_PREF_KS = 3, /* Preferred keysrver. */
KEYSRC_WKD = 4, /* Web Key Directory. */
KEYSRC_WKD_SD = 5, /* Web Key Directory but from a sub domain. */
KEYSRC_DANE = 6 /* OpenPGP DANE. */
KEYORG_UNKNOWN = 0,
KEYORG_KS = 1, /* Public keyserver. */
KEYORG_KS_PREF = 2, /* Preferred keysrver. */
KEYORG_DANE = 3, /* OpenPGP DANE. */
KEYORG_WKD = 4, /* Web Key Directory. */
KEYORG_URL = 5, /* Trusted URL. */
KEYORG_FILE = 6, /* Trusted file. */
KEYORG_SELF = 7, /* We generated it. */
};
@ -396,6 +397,7 @@ char *get_user_id_byfpr_native (ctrl_t ctrl, const byte *fpr);
void release_akl(void);
int parse_auto_key_locate(char *options);
int parse_key_origin (char *string);
/*-- keyid.c --*/
int pubkey_letter( int algo );