1
0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-23 10:29:58 +01:00

* gpg.sgml: Correct defaults for --s2k-mode and --s2k-digest-mode. Noted

by Haakon Riiser.
This commit is contained in:
David Shaw 2002-11-17 15:22:48 +00:00
parent 6b48375467
commit 1c2bf6217f
2 changed files with 13 additions and 10 deletions

View File

@ -1,3 +1,8 @@
2002-11-17 David Shaw <dshaw@jabberwocky.com>
* gpg.sgml: Correct defaults for --s2k-mode and --s2k-digest-mode.
Noted by Haakon Riiser.
2002-11-14 David Shaw <dshaw@jabberwocky.com>
* gpg.sgml: --compress-algo now allows algorithm names.

View File

@ -1591,22 +1591,20 @@ conventional encryption if --cipher-algo is not given.
<varlistentry>
<term>--s2k-digest-algo &ParmName;</term>
<listitem><para>
Use &ParmName; as the digest algorithm used to mangle the
passphrases. The default algorithm is RIPE-MD-160.
This digest algorithm is also used for conventional
encryption if --digest-algo is not given.
Use &ParmName; as the digest algorithm used to mangle the passphrases.
The default algorithm is SHA-1. This digest algorithm is also used
for conventional encryption if --digest-algo is not given.
</para></listitem></varlistentry>
<varlistentry>
<term>--s2k-mode &ParmN;</term>
<listitem><para>
Selects how passphrases are mangled. If &ParmN; is 0
a plain passphrase (which is not recommended) will be used,
a 1 (default) adds a salt to the passphrase and
a 3 iterates the whole process a couple of times.
Unless --rfc1991 is used, this mode is also used
for conventional encryption.
Selects how passphrases are mangled. If &ParmN; is 0 a plain
passphrase (which is not recommended) will be used, a 1 adds a salt to
the passphrase and a 3 (the default) iterates the whole process a
couple of times. Unless --rfc1991 is used, this mode is also used for
conventional encryption.
</para></listitem></varlistentry>