diff options
| author | David Shaw <dshaw@jabberwocky.com> | 2006-10-13 06:09:56 +0200 |
|---|---|---|
| committer | David Shaw <dshaw@jabberwocky.com> | 2006-10-13 06:09:56 +0200 |
| commit | 694dcf5d359d9dcdf2cd8ff9dc51895e374063ed (patch) | |
| tree | 26f6f07f63c4876da746ef35aee8849e4ea9e05b | |
| parent | * parse-packet.c (parse_symkeyenc): Show the unpacked as well as the (diff) | |
| download | gnupg2-694dcf5d359d9dcdf2cd8ff9dc51895e374063ed.tar.xz gnupg2-694dcf5d359d9dcdf2cd8ff9dc51895e374063ed.zip | |
* gpg.texi: Document --s2k-count.
| -rw-r--r-- | doc/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/gpg.texi | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog index 96cce9d79..0ceb6e05c 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,7 @@ +2006-10-12 David Shaw <dshaw@jabberwocky.com> + + * gpg.texi: Document --s2k-count. + 2006-09-25 Werner Koch <wk@g10code.com> * gpg.texi (GPG Examples): Add markup to all options. This is diff --git a/doc/gpg.texi b/doc/gpg.texi index 87dc95575..1337cd15c 100644 --- a/doc/gpg.texi +++ b/doc/gpg.texi @@ -1866,6 +1866,13 @@ the passphrase and a 3 (the default) iterates the whole process a couple of times. Unless @option{--rfc1991} is used, this mode is also used for conventional encryption. +@item --s2k-count @code{n} +Specify how many times the passphrase mangling is repeated. This +value may range between 1024 and 65011712 inclusive, and the default +is 65536. Note that not all values in the 1024-65011712 range are +legal and if an illegal value is selected, GnuPG will round up to the +nearest legal value. This option is only meaningful if +@option{--s2k-mode} is 3. @end table |