diff options
| author | David Shaw <[email protected]> | 2002-11-17 15:22:48 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2002-11-17 15:22:48 +0000 |
| commit | 1c2bf6217ffc2b079a03c496a3b91571f45d3058 (patch) | |
| tree | 91955e04a70440eb0d4a36b4426aa7f0cbd982b1 | |
| parent | * config.links: Use OpenBSD/NetBSD powerpc assembler code for Darwin. (diff) | |
| download | gnupg-1c2bf6217ffc2b079a03c496a3b91571f45d3058.tar.gz gnupg-1c2bf6217ffc2b079a03c496a3b91571f45d3058.zip | |
* gpg.sgml: Correct defaults for --s2k-mode and --s2k-digest-mode. Noted
by Haakon Riiser.
| -rw-r--r-- | doc/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/gpg.sgml | 18 |
2 files changed, 13 insertions, 10 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog index 4454ad311..02cadb8b5 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,8 @@ +2002-11-17 David Shaw <[email protected]> + + * gpg.sgml: Correct defaults for --s2k-mode and --s2k-digest-mode. + Noted by Haakon Riiser. + 2002-11-14 David Shaw <[email protected]> * gpg.sgml: --compress-algo now allows algorithm names. diff --git a/doc/gpg.sgml b/doc/gpg.sgml index 91f4b0a5f..72c1169bd 100644 --- a/doc/gpg.sgml +++ b/doc/gpg.sgml @@ -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> |