projects
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4b4f249
)
Correction: salt is now default
author
Dr. Stephen Henson
<steve@openssl.org>
Fri, 4 Sep 2009 12:27:01 +0000
(12:27 +0000)
committer
Dr. Stephen Henson
<steve@openssl.org>
Fri, 4 Sep 2009 12:27:01 +0000
(12:27 +0000)
doc/apps/enc.pod
patch
|
blob
|
history
diff --git
a/doc/apps/enc.pod
b/doc/apps/enc.pod
index 018365ba40be4df6f632025c2accfb95f2ba5f08..3dee4ed9923848514b887184b78a100417241f4a 100644
(file)
--- 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>
=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>
=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>
=item B<-e>