summaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2014-09-05 12:11:43 +0400
committerHerbert Xu <herbert@gondor.apana.org.au>2014-09-05 12:11:43 +0400
commitea2d9fc1af6ebcdf849723ac4f3f91a1c93b5e7c (patch)
tree0bccb1282f603164f7ca22ace2c3c5f49d470391 /crypto
parent0e56673b7bb4e66c15a5a2ca2d9ecabf9d74c2af (diff)
parent78f543a93473f67a1035949a293b79288e259b6e (diff)
downloadlinux-ea2d9fc1af6ebcdf849723ac4f3f91a1c93b5e7c.tar.xz
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.
Diffstat (limited to 'crypto')
-rw-r--r--crypto/drbg.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/crypto/drbg.c b/crypto/drbg.c
index 39ed9183d30f..54cfd4820abc 100644
--- 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;