From e76d3eab836dac1f310b32e16af158b6c127b810 Mon Sep 17 00:00:00 2001 From: David Shaw Date: Sun, 17 Nov 2002 15:15:36 +0000 Subject: [PATCH] * gpg.sgml: Correct defaults for --s2k-mode and --s2k-digest-mode. Noted by Haakon Riiser. --- doc/ChangeLog | 5 +++++ doc/gpg.sgml | 18 ++++++++---------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 8866e6af7..6dc57277d 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,8 @@ +2002-11-17 David Shaw + + * gpg.sgml: Correct defaults for --s2k-mode and --s2k-digest-mode. + Noted by Haakon Riiser. + 2002-11-14 David Shaw * gpg.sgml: Correct --compress-algo documentation to match diff --git a/doc/gpg.sgml b/doc/gpg.sgml index 2d634adfc..ac23225cf 100644 --- a/doc/gpg.sgml +++ b/doc/gpg.sgml @@ -1542,22 +1542,20 @@ conventional encryption if --cipher-algo is not given. --s2k-digest-algo &ParmName; -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. --s2k-mode &ParmN; -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.