aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/DETAILS13
-rw-r--r--doc/gpg-agent.texi14
-rw-r--r--doc/tools.texi11
3 files changed, 36 insertions, 2 deletions
diff --git a/doc/DETAILS b/doc/DETAILS
index 93dedbea0..dd3e357ec 100644
--- a/doc/DETAILS
+++ b/doc/DETAILS
@@ -826,6 +826,19 @@ The format of this file is as follows:
entry code. This is a global option.
%no-ask-passphrase
Disable the ask-passphrase mode.
+ %no-protection
+ With GnuPG 2.1 it is not anymore possible to specify a
+ passphrase for unattended key generation. The passphrase
+ command is simply ignored and %ask-passpharse is thus
+ implicitly enabled. Using this option allows to the creation
+ of keys without any passphrases. This option is mainly
+ intended for regression tests.
+ %transient-key
+ If given the keys are created using a faster and a somewhat
+ less secure random number generator. This option may be used
+ for keys which are only used for a short time and do not
+ require full cryptographic strength. It takes only effect if
+ used together with the option no-protection.
o The order of the parameters does not matter except for "Key-Type"
which must be the first parameter. The parameters are only for the
diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index d504d2a99..02a2c28a9 100644
--- a/doc/gpg-agent.texi
+++ b/doc/gpg-agent.texi
@@ -485,7 +485,7 @@ pinentry to pop up at the @code{tty} or display you started the agent.
@item --enable-ssh-support
@opindex enable-ssh-support
-Enable emulation of the OpenSSH Agent protocol.
+Enable the OpenSSH Agent protocol.
In this mode of operation, the agent does not only implement the
gpg-agent protocol, but also the agent protocol used by OpenSSH
@@ -512,10 +512,20 @@ has been started. To switch this display to the current one, the
following command may be used:
@smallexample
-echo UPDATESTARTUPTTY | gpg-connect-agent
+gpg-connect-agent updatestartuptty /bye
@end smallexample
+Although all GnuPG components try to start the gpg-agent as needed, this
+is not possible for the ssh support because ssh does not know about it.
+Thus if no GnuPG tool which accesses the agent has been run, there is no
+guarantee that ssh is abale to use gpg-agent for authentication. To fix
+this you may start gpg-agent if needed using this simple command:
+@smallexample
+gpg-connect-agent /bye
+@end smallexample
+
+Adding the @option{--verbose} shows the progress of starting the agent.
@end table
diff --git a/doc/tools.texi b/doc/tools.texi
index efb37e699..ce7d2b3be 100644
--- a/doc/tools.texi
+++ b/doc/tools.texi
@@ -296,6 +296,12 @@ List the global configuration file in a colon separated format. If
Run a syntax check on the global configuration file. If @var{filename}
is given, check that file instead.
+@item --reload [@var{component}]
+@opindex reload
+Reload all or the given component. This is basically the sam as sending
+a SIGHUP to the component. Components which don't support reloading are
+ignored.
+
@end table
@@ -1170,6 +1176,11 @@ Try to be as quiet as possible.
@include opt-homedir.texi
+@item --agent-program @var{file}
+@opindex agent-program
+Specify the agent program to be started if none is running.
+
+
@item -S
@itemx --raw-socket @var{name}
@opindex S