diff options
| author | Werner Koch <[email protected]> | 2017-07-13 15:28:32 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2017-07-13 16:29:01 +0000 |
| commit | fa1155e89ebb4b16ee95549b8ab72672df3a0c54 (patch) | |
| tree | 515f2f5684c032772406b27e4ea94a91c87e766a /doc | |
| parent | doc: Document gnupg version requirement for gpg-preset-passphrase. (diff) | |
| download | gnupg-fa1155e89ebb4b16ee95549b8ab72672df3a0c54.tar.gz gnupg-fa1155e89ebb4b16ee95549b8ab72672df3a0c54.zip | |
gpg: New option --key-origin.
* 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 <[email protected]>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/DETAILS | 11 | ||||
| -rw-r--r-- | doc/gpg.texi | 7 |
2 files changed, 13 insertions, 5 deletions
diff --git a/doc/DETAILS b/doc/DETAILS index b915f0658..cbeead777 100644 --- a/doc/DETAILS +++ b/doc/DETAILS @@ -1347,12 +1347,13 @@ CREATE TABLE signatures ( - 2 :: Key source on a user id (UID) - 1 octet :: Key Source; i.e. the origin of the key: - 0 :: Unknown source. - - 1 :: Direct import from a file. - - 2 :: Public keyserver. - - 3 :: Preferred keysrver. + - 1 :: Public keyserver. + - 2 :: Preferred keysrver. + - 3 :: OpenPGP DANE. - 4 :: Web Key Directory. - - 5 :: Web Key Directory via sub-domain. - - 6 :: OpenPGP DANE. + - 5 :: Import from a trusted URL. + - 6 :: Import from a trusted file. + - 7 :: Self generated. - 4 octets :: Time of last update. This is a a four-octet scalar with the seconds since Epoch. - 1 octet :: Scalar with the length of the following field. diff --git a/doc/gpg.texi b/doc/gpg.texi index bc83eff75..64dd50267 100644 --- a/doc/gpg.texi +++ b/doc/gpg.texi @@ -2254,6 +2254,13 @@ hint to optimize its buffer allocation strategy. It is also used by the @option{--status-fd} line ``PROGRESS'' to provide a value for ``total'' if that is not available by other means. +@item --key-origin @var{string} +@opindex key-origin +gpg can track the origin of a key. Certain origins are implicitly +known (e.g. keyserver, web key directory) and set. For a standard +import the origin of the keys imported can be set with this optionb. +To list the possible values use "help" for @var{string}. + @item --import-options @code{parameters} @opindex import-options This is a space or comma delimited string that gives options for |