summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2024-06-24 16:31:24 +0200
committerWerner Koch <wk@gnupg.org>2024-06-24 16:31:40 +0200
commit1695cf267edf85bc451b59bf012083feb250bf59 (patch)
treecbd9cddb3b17e25106143ec02aaa3bf7ec705ceb /doc
parentgpg: Rename recently added import option no-seckeys to only-pubkeys. (diff)
downloadgnupg2-1695cf267edf85bc451b59bf012083feb250bf59.tar.xz
gnupg2-1695cf267edf85bc451b59bf012083feb250bf59.zip
gpg: New option --show-only-session-key
* g10/options.h (opt): Add show_only_session_key and turn show_session_key into a bit flag. * g10/gpg.c (oShowOnlySessionKey): New. (opts): Add "show-only-session-key". (main): Set flag. * g10/mainproc.c (proc_encrypted): Handle the new option. * g10/decrypt-data.c (decrypt_data): Ditto. Add compliance error flag to the DECRYPTION_INFO status line. -- This new option is somehow related to GnuPG-bug-id: 1825
Diffstat (limited to 'doc')
-rw-r--r--doc/DETAILS8
-rw-r--r--doc/gpg.texi4
2 files changed, 9 insertions, 3 deletions
diff --git a/doc/DETAILS b/doc/DETAILS
index a8c0edf9d..d50de6d60 100644
--- a/doc/DETAILS
+++ b/doc/DETAILS
@@ -569,11 +569,13 @@ pkd:0:1024:B665B1435F4C2 .... FF26ABB:
actual key used for decryption. <fpr2> is the fingerprint of the
primary key. <otrust> is the letter with the ownertrust; this is
in general a 'u' which stands for ultimately trusted.
-*** DECRYPTION_INFO <mdc_method> <sym_algo> [<aead_algo>]
+*** DECRYPTION_INFO <mdc_method> <sym_algo> [<aead_algo> <complerr>]
Print information about the symmetric encryption algorithm and the
MDC method. This will be emitted even if the decryption fails.
- For an AEAD algorithm AEAD_ALGO is not 0. GPGSM currently does
- not print such a status.
+ For an AEAD algorithm AEAD_ALGO is not 0. COMPLERR is set to a
+ non-zero integer if a compliance check for the cipher failed.
+ GPGSM currently prints only the first two items and thus they are
+ marked as optional
*** DECRYPTION_FAILED
The symmetric decryption failed - one reason could be a wrong
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 3eecc7d64..a65039c1a 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -3794,9 +3794,13 @@ This is not for normal use. Use the source to see for what it might be useful.
This is not for normal use. Use the source to see for what it might be useful.
@item --show-session-key
+@itemx --show-only-session-key
@opindex show-session-key
+@opindex show-only-session-key
Display the session key used for one message. See
@option{--override-session-key} for the counterpart of this option.
+The variant @option{--show-only-session-key} does not actually use the
+session key but stops processing after having printed the session key.
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