aboutsummaryrefslogtreecommitdiff
path: root/openssl/doc/crypto/des.pod
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-09-02 18:24:12 +0200
committerMike DePaulo <mikedep333@gmail.com>2015-02-28 07:15:53 -0500
commit8fafe3481b134a4d368ba57e3698754a6a45c4c1 (patch)
treeb617e841e1b5c0b234f7698331e5fb1be1c2332a /openssl/doc/crypto/des.pod
parentfe03d6aef6338e43593f164b09ae993bcd0ecbdd (diff)
downloadvcxsrv-8fafe3481b134a4d368ba57e3698754a6a45c4c1.tar.gz
vcxsrv-8fafe3481b134a4d368ba57e3698754a6a45c4c1.tar.bz2
vcxsrv-8fafe3481b134a4d368ba57e3698754a6a45c4c1.zip
Upgrade openssl to version openssl-1.0.1i
Diffstat (limited to 'openssl/doc/crypto/des.pod')
-rw-r--r--openssl/doc/crypto/des.pod7
1 files changed, 3 insertions, 4 deletions
diff --git a/openssl/doc/crypto/des.pod b/openssl/doc/crypto/des.pod
index 6f0cf1cc5..e1add56b5 100644
--- a/openssl/doc/crypto/des.pod
+++ b/openssl/doc/crypto/des.pod
@@ -135,9 +135,8 @@ depend on a global variable.
DES_set_odd_parity() sets the parity of the passed I<key> to odd.
-DES_is_weak_key() returns 1 is the passed key is a weak key, 0 if it
-is ok. The probability that a randomly generated key is weak is
-1/2^52, so it is not really worth checking for them.
+DES_is_weak_key() returns 1 if the passed key is a weak key, 0 if it
+is ok.
The following routines mostly operate on an input and output stream of
I<DES_cblock>s.
@@ -181,7 +180,7 @@ of 24 bytes. This is much better than CBC DES.
DES_ede3_cbc_encrypt() implements outer triple CBC DES encryption with
three keys. This means that each DES operation inside the CBC mode is
-really an C<C=E(ks3,D(ks2,E(ks1,M)))>. This mode is used by SSL.
+an C<C=E(ks3,D(ks2,E(ks1,M)))>. This mode is used by SSL.
The DES_ede2_cbc_encrypt() macro implements two-key Triple-DES by
reusing I<ks1> for the final encryption. C<C=E(ks1,D(ks2,E(ks1,M)))>.