From: Dr. Stephen Henson <steve@openssl.org>
Date: Fri, 4 Sep 2009 12:27:01 +0000 (+0000)
Subject: Correction: salt is now default
X-Git-Tag: OpenSSL_1_0_0-beta4~85
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7483896e15a9d9203913555ba2f8cc4d7c20e008;p=oweals%2Fopenssl.git

Correction: salt is now default
---

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>