diff options
| author | marha <marha@users.sourceforge.net> | 2014-09-02 18:48:52 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-09-02 18:48:52 +0200 |
| commit | dea8f13d8104872dec9243abe06f3d9e4c807ccd (patch) | |
| tree | b01e5b901eaca45f1e3aa2b6fddfd45ca271ee75 /openssl/doc/crypto/des.pod | |
| parent | 3293021e6f582c7348667e7638941620134525e1 (diff) | |
| parent | 04168ae281bfbd714ddf6b90d98eac892508dde8 (diff) | |
| download | vcxsrv-dea8f13d8104872dec9243abe06f3d9e4c807ccd.tar.gz vcxsrv-dea8f13d8104872dec9243abe06f3d9e4c807ccd.tar.bz2 vcxsrv-dea8f13d8104872dec9243abe06f3d9e4c807ccd.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
openssl/Makefile
openssl/crypto/opensslconf.h
Diffstat (limited to 'openssl/doc/crypto/des.pod')
| -rw-r--r-- | openssl/doc/crypto/des.pod | 7 |
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)))>. |