summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2009-09-04 12:26:47 +0000
committerDr. Stephen Henson <steve@openssl.org>2009-09-04 12:26:47 +0000
commit11d655ef4058e44317152b134fb2f992925c9b63 (patch)
tree556b1b2d520d78f60a97ca16fcd37ce9f5c943c8 /doc
parent1da61e8051a67bf449e44a38dd856740caeb0e8b (diff)
Correction: salt is now default
Diffstat (limited to 'doc')
-rw-r--r--doc/apps/enc.pod10
1 files changed, 4 insertions, 6 deletions
diff --git a/doc/apps/enc.pod b/doc/apps/enc.pod
index 4391c93360..d3049e82e9 100644
--- a/doc/apps/enc.pod
+++ b/doc/apps/enc.pod
@@ -50,15 +50,13 @@ see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)|openssl(1)>.
=item B<-salt>
-use a salt in the key derivation routines. This option should B<ALWAYS>
-be used unless compatibility with previous versions of OpenSSL or SSLeay
-is required. This option is only present on OpenSSL versions 0.9.5 or
-above.
+use a salt in the key derivation routines. This is the default.
=item B<-nosalt>
-don't use a salt in the key derivation routines. This is the default for
-compatibility with previous versions of OpenSSL and SSLeay.
+don't use a salt in the key derivation routines. This option B<SHOULD NOT> be
+used except for test purposes or compatibility with ancient versions of OpenSSL
+and SSLeay.
=item B<-e>