summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2009-09-04 12:27:12 +0000
committerDr. Stephen Henson <steve@openssl.org>2009-09-04 12:27:12 +0000
commit88a3dd7896eaaa015f47c7cb6f1fc049528d6424 (patch)
tree1a7b03b87aa512f2ce3e479e706f15b6f770cb96 /doc
parent4f59432c0650db1da3255ea61f78c817ee98eaf5 (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 018365ba40..3dee4ed992 100644
--- a/doc/apps/enc.pod
+++ b/doc/apps/enc.pod
@@ -57,15 +57,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>