diff options
| author | Darren Tucker <dtucker@google.com> | 2017-02-13 10:36:29 +1100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2017-02-13 11:53:24 +0100 |
| commit | ca423a693a619b38fb96d94b0385f8ce91a8e759 (patch) | |
| tree | 725d35f1b51ad2946c499dd631910008dbcd606a | |
| parent | b67a37b84674881226bb96709239a7e5945bc480 (diff) | |
DES keys are not 7 days long.
CLA: trivial
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2604)
(cherry picked from commit 4fd7b54dc224930a0ce6dd67b35c598c5072857c)
| -rw-r--r-- | crypto/des/set_key.c | 2 | ||||
| -rw-r--r-- | doc/crypto/DES_random_key.pod | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crypto/des/set_key.c b/crypto/des/set_key.c index 93adff3982..795d9549cf 100644 --- a/crypto/des/set_key.c +++ b/crypto/des/set_key.c @@ -71,7 +71,7 @@ int DES_check_key_parity(const_DES_cblock *key) } /*- - * Weak and semi week keys as take from + * Weak and semi weak keys as taken from * %A D.W. Davies * %A W.L. Price * %T Security for Computer Networks diff --git a/doc/crypto/DES_random_key.pod b/doc/crypto/DES_random_key.pod index 0131093ba9..77cfddab3b 100644 --- a/doc/crypto/DES_random_key.pod +++ b/doc/crypto/DES_random_key.pod @@ -114,7 +114,7 @@ architecture dependent I<DES_key_schedule> via the DES_set_key_checked() or DES_set_key_unchecked() function. DES_set_key_checked() will check that the key passed is of odd parity -and is not a week or semi-weak key. If the parity is wrong, then -1 +and is not a weak or semi-weak key. If the parity is wrong, then -1 is returned. If the key is a weak key, then -2 is returned. If an error is returned, the key schedule is not generated. |