diff options
| author | Darren Tucker <dtucker@cvs.openbsd.org> | 2017-02-09 03:43:06 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@cvs.openbsd.org> | 2017-02-09 03:43:06 +0000 |
| commit | 659f0b67e23a7d89b9d11e25f194674e463afe2d (patch) | |
| tree | 01ade1241c167b3c45e0ebc84ebcda1c102e17e7 | |
| parent | 375255ddeeb274eb481bbf1b007b6040133cb2fc (diff) | |
DES keys are not 7 days long. ok jsing@
| -rw-r--r-- | lib/libcrypto/des/set_key.c | 4 | ||||
| -rw-r--r-- | lib/libcrypto/man/DES_set_key.3 | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/libcrypto/des/set_key.c b/lib/libcrypto/des/set_key.c index 59d6893a800..7d2c6b43907 100644 --- a/lib/libcrypto/des/set_key.c +++ b/lib/libcrypto/des/set_key.c @@ -1,4 +1,4 @@ -/* $OpenBSD: set_key.c,v 1.19 2014/10/28 07:35:58 jsg Exp $ */ +/* $OpenBSD: set_key.c,v 1.20 2017/02/09 03:43:05 dtucker Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -106,7 +106,7 @@ int DES_check_key_parity(const_DES_cblock *key) return(1); } -/* 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/lib/libcrypto/man/DES_set_key.3 b/lib/libcrypto/man/DES_set_key.3 index 7d48ca5bfec..0a9e7381bce 100644 --- a/lib/libcrypto/man/DES_set_key.3 +++ b/lib/libcrypto/man/DES_set_key.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: DES_set_key.3,v 1.6 2016/12/08 22:13:59 jmc Exp $ +.\" $OpenBSD: DES_set_key.3,v 1.7 2017/02/09 03:43:05 dtucker Exp $ .\" OpenSSL c7497f34 Aug 14 10:50:26 2014 -0400 .\" .\" -------------------------------------------------------------------------- @@ -114,7 +114,7 @@ .\" copied and put under another distribution licence .\" [including the GNU Public Licence.] .\" -.Dd $Mdocdate: December 8 2016 $ +.Dd $Mdocdate: February 9 2017 $ .Dt DES_SET_KEY 3 .Os .Sh NAME @@ -435,7 +435,7 @@ or function. .Pp .Fn DES_set_key_checked -will check that the key passed is of odd parity and is not a week or +will check that the key passed is of odd parity 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. |