aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/DETAILS7
-rw-r--r--doc/gpg.sgml23
2 files changed, 29 insertions, 1 deletions
diff --git a/doc/DETAILS b/doc/DETAILS
index 14715a827..b641dd7f9 100644
--- a/doc/DETAILS
+++ b/doc/DETAILS
@@ -214,7 +214,7 @@ more arguments in future versions.
"char" is the character displayed with no --status-fd enabled, with
the linefeed replaced by an 'X'. "cur" is the current amount
done and "total" is amount to be done; a "total" of 0 indicates that
- the total amount is not known. 100/100 may be used to detect the
+ the total amount is not known. 100/100 may be used to detect the
end of operation.
SIG_CREATED <type> <pubkey algo> <hash algo> <class> <timestamp> <key fpr>
@@ -225,6 +225,11 @@ more arguments in future versions.
(only the first character should be checked)
class: 2 hex digits with the signature class
+ SESSION_KEY <algo>:<hexdigits>
+ The session key used to decrypt the message. This message will
+ only be emmited when the special option --show-session-key
+ is used. The format is suitable to be passed to the option
+ --override-session-key
Key generation
diff --git a/doc/gpg.sgml b/doc/gpg.sgml
index b57c9ab48..465d6d559 100644
--- a/doc/gpg.sgml
+++ b/doc/gpg.sgml
@@ -1338,6 +1338,29 @@ the encoding used in old versions. This may only happen for ElGamal signatures
which are not widely used.
</para></listitem></varlistentry>
+<varlistentry>
+<term>--show-session-key</term>
+<listitem><para>
+Display the session key used for one message. See --override-session-key
+for the counterpart of this option.
+</para>
+<para>
+We think that Key-Escrow is a Bad Thing; however the user should
+have the freedom to decide whether to go to prison or to reveal the content of
+one specific message without compromising all messages ever encrypted for one
+secret key. DON'T USE IT UNLESS YOU ARE REALLY FORCED TO DO SO.
+</para></listitem></varlistentry>
+
+<varlistentry>
+<term>--override-session-key &ParmString; </term>
+<listitem><para>
+Don't use the public key but the session key &ParmString;. The format of this
+string is the same as the one printed by --show-session-key. This option
+is normally not used but comes handy in case someone forces you to reveal the
+content of an encrypted message; using this option you can do this without
+handing out the secret key.
+</para></listitem></varlistentry>
+
</variablelist>
</refsect1>