diff options
author | dtucker <> | 2017-02-09 03:43:05 +0000 |
---|---|---|
committer | dtucker <> | 2017-02-09 03:43:05 +0000 |
commit | bc047f5237e81843012b06739757d793a5958066 (patch) | |
tree | 62a96124716b696143134fd3fddd2a8ac5abe02b | |
parent | 7afc297dcad79eeff814dc4a06faa6be54a2d987 (diff) | |
download | openbsd-bc047f5237e81843012b06739757d793a5958066.tar.gz openbsd-bc047f5237e81843012b06739757d793a5958066.tar.bz2 openbsd-bc047f5237e81843012b06739757d793a5958066.zip |
DES keys are not 7 days long. ok jsing@
-rw-r--r-- | src/lib/libcrypto/des/set_key.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/man/DES_set_key.3 | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libcrypto/des/set_key.c b/src/lib/libcrypto/des/set_key.c index 59d6893a80..7d2c6b4390 100644 --- a/src/lib/libcrypto/des/set_key.c +++ b/src/lib/libcrypto/des/set_key.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: set_key.c,v 1.19 2014/10/28 07:35:58 jsg Exp $ */ | 1 | /* $OpenBSD: set_key.c,v 1.20 2017/02/09 03:43:05 dtucker Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -106,7 +106,7 @@ int DES_check_key_parity(const_DES_cblock *key) | |||
106 | return(1); | 106 | return(1); |
107 | } | 107 | } |
108 | 108 | ||
109 | /* Weak and semi week keys as take from | 109 | /* Weak and semi weak keys as taken from |
110 | * %A D.W. Davies | 110 | * %A D.W. Davies |
111 | * %A W.L. Price | 111 | * %A W.L. Price |
112 | * %T Security for Computer Networks | 112 | * %T Security for Computer Networks |
diff --git a/src/lib/libcrypto/man/DES_set_key.3 b/src/lib/libcrypto/man/DES_set_key.3 index 7d48ca5bfe..0a9e7381bc 100644 --- a/src/lib/libcrypto/man/DES_set_key.3 +++ b/src/lib/libcrypto/man/DES_set_key.3 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: DES_set_key.3,v 1.6 2016/12/08 22:13:59 jmc Exp $ | 1 | .\" $OpenBSD: DES_set_key.3,v 1.7 2017/02/09 03:43:05 dtucker Exp $ |
2 | .\" OpenSSL c7497f34 Aug 14 10:50:26 2014 -0400 | 2 | .\" OpenSSL c7497f34 Aug 14 10:50:26 2014 -0400 |
3 | .\" | 3 | .\" |
4 | .\" -------------------------------------------------------------------------- | 4 | .\" -------------------------------------------------------------------------- |
@@ -114,7 +114,7 @@ | |||
114 | .\" copied and put under another distribution licence | 114 | .\" copied and put under another distribution licence |
115 | .\" [including the GNU Public Licence.] | 115 | .\" [including the GNU Public Licence.] |
116 | .\" | 116 | .\" |
117 | .Dd $Mdocdate: December 8 2016 $ | 117 | .Dd $Mdocdate: February 9 2017 $ |
118 | .Dt DES_SET_KEY 3 | 118 | .Dt DES_SET_KEY 3 |
119 | .Os | 119 | .Os |
120 | .Sh NAME | 120 | .Sh NAME |
@@ -435,7 +435,7 @@ or | |||
435 | function. | 435 | function. |
436 | .Pp | 436 | .Pp |
437 | .Fn DES_set_key_checked | 437 | .Fn DES_set_key_checked |
438 | will check that the key passed is of odd parity and is not a week or | 438 | will check that the key passed is of odd parity and is not a weak or |
439 | semi-weak key. | 439 | semi-weak key. |
440 | If the parity is wrong, then -1 is returned. | 440 | If the parity is wrong, then -1 is returned. |
441 | If the key is a weak key, then -2 is returned. | 441 | If the key is a weak key, then -2 is returned. |