aboutsummaryrefslogtreecommitdiffstats
path: root/doc/gpg.texi
diff options
context:
space:
mode:
Diffstat (limited to 'doc/gpg.texi')
-rw-r--r--doc/gpg.texi35
1 files changed, 12 insertions, 23 deletions
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 59d5e578f..c617e1971 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -2760,12 +2760,14 @@ is the default.
@itemx --no-force-v4-certs
These options are obsolete and have no effect since GnuPG 2.1.
-@item --force-aead
+@item --force-ocb
+@itemx --force-aead
+@opindex force-ocb
@opindex force-aead
Force the use of AEAD encryption over MDC encryption. AEAD is a
modern and faster way to do authenticated encryption than the old MDC
-method. See also options @option{--aead-algo} and
-@option{--chunk-size}.
+method. @option{--force-aead} is an alias and deprecated. See also
+option @option{--chunk-size}.
@item --force-mdc
@itemx --disable-mdc
@@ -2810,16 +2812,6 @@ preferences, as GPG will only select an algorithm that is usable by
all recipients. The most highly ranked cipher in this list is also
used for the @option{--symmetric} encryption command.
-@item --personal-aead-preferences @var{string}
-@opindex personal-aead-preferences
-Set the list of personal AEAD preferences to @var{string}. Use
-@command{@gpgname --version} to get a list of available algorithms,
-and use @code{none} to set no preference at all. This allows the user
-to safely override the algorithm chosen by the recipient key
-preferences, as GPG will only select an algorithm that is usable by
-all recipients. The most highly ranked cipher in this list is also
-used for the @option{--symmetric} encryption command.
-
@item --personal-digest-preferences @var{string}
@opindex personal-digest-preferences
Set the list of personal digest preferences to @var{string}. Use
@@ -3233,16 +3225,6 @@ it allows you to violate the OpenPGP standard. The option
@option{--personal-cipher-preferences} is the safe way to accomplish the
same thing.
-@item --aead-algo @var{name}
-@opindex aead-algo
-Specify that the AEAD algorithm @var{name} is to be used. This is
-useful for symmetric encryption where no key preference are available
-to select the AEAD algorithm. Running @command{@gpgname} with option
-@option{--version} shows the available AEAD algorithms. In general,
-you do not want to use this option as it allows you to violate the
-OpenPGP standard. The option @option{--personal-aead-preferences} is
-the safe way to accomplish the same thing.
-
@item --digest-algo @var{name}
@opindex digest-algo
Use @var{name} as the message digest algorithm. Running the program
@@ -3786,6 +3768,13 @@ it. These options are deprecated. Use @option{--list-options
[no-]show-policy-url} and/or @option{--verify-options
[no-]show-policy-url} instead.
+@item --personal-aead-preferences @var{string}
+@opindex personal-aead-preferences
+This option is deprecated and has no more effect since version 2.3.9.
+
+@item --aead-algo @var{name}
+This option is deprecated and has no more effect since version 2.3.9.
+
@end table