aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2014-06-23 14:09:34 +0000
committerWerner Koch <[email protected]>2014-06-24 09:43:47 +0000
commit2c8e00137a340d04f0836f75e138dd85f8c9eff7 (patch)
tree6e71dd6f473930db05142249cee24eb7fc7aa62a /doc
parentgpg: Make export of ECC keys work again. (diff)
downloadgnupg-2c8e00137a340d04f0836f75e138dd85f8c9eff7.tar.gz
gnupg-2c8e00137a340d04f0836f75e138dd85f8c9eff7.zip
doc: Add conditionals for GnuPG-1
Diffstat (limited to 'doc')
-rw-r--r--doc/gpg.texi11
1 files changed, 7 insertions, 4 deletions
diff --git a/doc/gpg.texi b/doc/gpg.texi
index c8fae3a1b..101f51eac 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -2316,9 +2316,11 @@ available, but the MIT release is a good common baseline.
This option implies @option{--rfc1991 --disable-mdc
--no-force-v4-certs --escape-from-lines --force-v3-sigs
---allow-weak-digest-algos --cipher-algo IDEA --digest-algo
-MD5--compress-algo ZIP}. It also disables @option{--textmode} when
-encrypting.
+@ifclear gpgone
+--allow-weak-digest-algos
+@end ifclear
+--cipher-algo IDEA --digest-algo MD5 --compress-algo ZIP}.
+It also disables @option{--textmode} when encrypting.
@item --pgp6
@opindex pgp6
@@ -2774,12 +2776,13 @@ necessary to get as much data as possible out of the corrupt message.
However, be aware that a MDC protection failure may also mean that the
message was tampered with intentionally by an attacker.
+@ifclear gpgone
@item --allow-weak-digest-algos
@opindex allow-weak-digest-algos
Signatures made with the broken MD5 algorithm are normally rejected
with an ``invalid digest algorithm'' message. This option allows the
verification of signatures made with such weak algorithms.
-
+@end ifclear
@item --no-default-keyring
@opindex no-default-keyring