security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

doc: Replace "conventional encryption" by "symmetric encryption".

Browse source 
--

Suggested-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>

Ported from 2.0.
This commit is contained in:
Werner Koch 2015-06-02 17:46:42 +02:00
parent e5c69e87be
commit a7f7aa766f
No known key found for this signature in database
GPG key ID: E3FDFF218E45B72B
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
doc/gpg.texi
View file

@ -2291,9 +2291,10 @@ to consider (e.g. @option{--symmetric}).
@item --s2k-cipher-algo @code{name}
@opindex s2k-cipher-algo
Use @code{name} as the cipher algorithm used to protect secret keys.
The default cipher is @value{DEFSYMENCALGO}. This cipher is also used for
conventional encryption if @option{--personal-cipher-preferences} and
@option{--cipher-algo} is not given.
The default cipher is @value{DEFSYMENCALGO}. This cipher is also used
for symmetric encryption with a passphrase if
@option{--personal-cipher-preferences} and @option{--cipher-algo} is
not given.
@item --s2k-digest-algo @code{name}
@opindex s2k-digest-algo
@ -2306,7 +2307,7 @@ Selects how passphrases are mangled. If @code{n} 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
number of times (see --s2k-count). Unless @option{--rfc1991} is used,
this mode is also used for conventional encryption.
this mode is also used for symmetric encryption with a passphrase.
@item --s2k-count @code{n}
@opindex s2k-count