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.
josf · Sep 5, 2014 · ea2d9fc · ea2d9fc
2 parents 0e56673 + 78f543a
commit ea2d9fc
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/crypto/drbg.c b/crypto/drbg.c
@@ -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;