diff options
| author | Werner Koch <wk@gnupg.org> | 2019-09-27 15:44:23 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2019-09-27 15:44:23 +0200 |
| commit | 9698761933f7ade732178b45df2a8763e5801763 (patch) | |
| tree | 5454a013e219a64dfd0feaf701285a65b7cfa431 /doc | |
| parent | build: Build gpg-pair-tool only when there is newer libgcrypt. (diff) | |
| parent | kbx: Fix error code return in keyboxd. (diff) | |
| download | gnupg2-9698761933f7ade732178b45df2a8763e5801763.tar.xz gnupg2-9698761933f7ade732178b45df2a8763e5801763.zip | |
Merge branch 'switch-to-gpgk' into master
--
Resolved Conflicts:
* common/asshelp.c: Keep the new code in master for spawing under
Windows.
* g10/Makefile.am: Keep all new file.
* g10/photoid.c: Pass CTRL to pct_expando.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/DETAILS | 12 | ||||
| -rw-r--r-- | doc/tools.texi | 11 |
2 files changed, 23 insertions, 0 deletions
diff --git a/doc/DETAILS b/doc/DETAILS index f1abda930..315f56e31 100644 --- a/doc/DETAILS +++ b/doc/DETAILS @@ -1138,6 +1138,18 @@ pkd:0:1024:B665B1435F4C2 .... FF26ABB: *** BEGIN_STREAM, END_STREAM Used to issued by the experimental pipemode. +** Inter-component codes + Status codes are also used between the components of the GnuPG + system via the Assuan S lines. Some of them are documented here: + +*** PUBKEY_INFO <n> <ubid> + The type of the public key in the following D-lines or + communicated via a pipe. <n> is the value of =enum pubkey_types= + and <ubid> the Unique Blob ID (UBID) which is a SHA-1 digest the + entire blob here formatted in hex. The consumer of this status + line should be prepared to see a <ubid> of up to 64 characters. + Note that the keyboxd SEARCH command can be used to lookup the + public key using the <ubid> prefixed with a caret (^). * Format of the --attribute-fd output diff --git a/doc/tools.texi b/doc/tools.texi index 460030038..0893c65a5 100644 --- a/doc/tools.texi +++ b/doc/tools.texi @@ -1328,11 +1328,22 @@ Specify the directory manager (keyserver client) program to be started if none is running. This has only an effect if used together with the option @option{--dirmngr}. +@item --keyboxd-program @var{file} +@opindex keyboxd-program +Specify the keybox daemon program to be started if none is running. +This has only an effect if used together with the option +@option{--keyboxd}. + @item --dirmngr @opindex dirmngr Connect to a running directory manager (keyserver client) instead of to the gpg-agent. If a dirmngr is not running, start it. +@item --keyboxd +@opindex keyboxd +Connect to a running keybox daemon instead of +to the gpg-agent. If a keyboxd is not running, start it. + @item -S @itemx --raw-socket @var{name} @opindex raw-socket |