The branch master has been updated via 4fd7b54dc224930a0ce6dd67b35c598c5072857c (commit) from 4bbd8a5daaa810c487f684971c0339a1d7c15da9 (commit)
- Log ----------------------------------------------------------------- commit 4fd7b54dc224930a0ce6dd67b35c598c5072857c Author: Darren Tucker <dtuc...@google.com> Date: Mon Feb 13 10:36:29 2017 +1100 DES keys are not 7 days long. CLA: trivial Reviewed-by: Matt Caswell <m...@openssl.org> Reviewed-by: Richard Levitte <levi...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2604) ----------------------------------------------------------------------- Summary of changes: crypto/des/set_key.c | 2 +- doc/man3/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 93adff3..795d954 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/man3/DES_random_key.pod b/doc/man3/DES_random_key.pod index 052b96d..bcf9761 100644 --- a/doc/man3/DES_random_key.pod +++ b/doc/man3/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. _____ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits