Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merging the crypto tree for 3.17 in order to resolve the conflict on the 32-bit DRBG overflow fix.
This commit is contained in:
commit
ea2d9fc1af
|
@ -1872,9 +1872,6 @@ static inline int __init drbg_healthcheck_sanity(void)
|
|||
/* overflow max addtllen with personalization string */
|
||||
ret = drbg_instantiate(drbg, &addtl, coreref, pr);
|
||||
BUG_ON(0 == ret);
|
||||
/* test uninstantated DRBG */
|
||||
len = drbg_generate(drbg, buf, (max_request_bytes + 1), NULL);
|
||||
BUG_ON(0 < len);
|
||||
/* all tests passed */
|
||||
rc = 0;
|
||||
|
||||
|
|
Loading…
Reference in New Issue