aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2014-06-03 19:35:59 +0000
committerWerner Koch <[email protected]>2014-06-03 19:35:59 +0000
commitbe07ed65e169a7ec3fbecdb1abf988fc0245d9ff (patch)
tree020a3cbfbe5db314cce07681591f14201a086b65 /doc
parentartwork: Add 128x128 variant of the logo. (diff)
downloadgnupg-be07ed65e169a7ec3fbecdb1abf988fc0245d9ff.tar.gz
gnupg-be07ed65e169a7ec3fbecdb1abf988fc0245d9ff.zip
Add new option --with-secret.
* g10/gpg.c: Add option --with-secret. * g10/options.h (struct opt): Add field with_secret. * g10/keylist.c (public_key_list): Pass opt.with_secret to list_all and list_one. (list_all, list_one): Add arg mark_secret. (list_keyblock_colon): Add arg has_secret. * sm/gpgsm.c: Add option --with-secret. * sm/server.c (option_handler): Add option "with-secret". * sm/gpgsm.h (server_control_s): Add field with_secret. * sm/keylist.c (list_cert_colon): Take care of with_secret. Also move the token string from the wrong field 14 to 15. -- This option is useful for key managers which need to know whether a key has a secret key. This change allows to collect this information in one pass.
Diffstat (limited to 'doc')
-rw-r--r--doc/DETAILS3
-rw-r--r--doc/gpg.texi6
-rw-r--r--doc/gpgsm.texi7
3 files changed, 15 insertions, 1 deletions
diff --git a/doc/DETAILS b/doc/DETAILS
index 03c200e71..17c417e18 100644
--- a/doc/DETAILS
+++ b/doc/DETAILS
@@ -194,7 +194,8 @@ described here.
Used in sec/sbb to print the serial number of a token (internal
protect mode 1002) or a '#' if that key is a simple stub (internal
- protect mode 1001)
+ protect mode 1001). If the option --with-secret is used and a
+ secret key is available for the public key, a '+' indicates this.
*** Field 16 - Hash algorithm
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 9463bb5eb..71a3107d8 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -2127,6 +2127,12 @@ of the output and may be used together with another command.
@item --with-keygrip
@opindex with-keygrip
Include the keygrip in the key listings.
+
+@item --with-secret
+@opindex with-secret
+Include info about the presence of a secret key in public key listings
+done with @code{--with-colons}.
+
@end ifset
@end table
diff --git a/doc/gpgsm.texi b/doc/gpgsm.texi
index b38ad4d72..078d2ad6a 100644
--- a/doc/gpgsm.texi
+++ b/doc/gpgsm.texi
@@ -581,6 +581,13 @@ certificate.
Include the keygrip in standard key listings. Note that the keygrip is
always listed in --with-colons mode.
+@ifset gpgtwoone
+@item --with-secret
+@opindex with-secret
+Include info about the presence of a secret key in public key listings
+done with @code{--with-colons}.
+@end ifset
+
@end table
@c *******************************************