Commit 4fd7b54d authored Feb 13, 2017 by Darren Tucker Committed by Richard Levitte Feb 13, 2017

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)

parent 4bbd8a5d

crypto/des/set_key.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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 D.W. Davies
	* %A W.L. Price		* %A W.L. Price
	* %T Security for Computer Networks		* %T Security for Computer Networks

doc/man3/DES_random_key.pod

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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() or DES_set_key_unchecked() function.

	DES_set_key_checked() will check that the key passed is of odd parity		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		is returned. If the key is a weak key, then -2 is returned. If an
	error is returned, the key schedule is not generated.		error is returned, the key schedule is not generated.