diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2014-09-05 16:11:43 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2014-09-05 16:11:43 +0800 |
| commit | 340274c558571a7a2733b66c7c0367ae9f108e03 (patch) | |
| tree | 12a735ae8dbb5a80e658e4f47f6c7c911dec1d59 /crypto/drbg.c | |
| parent | e7455ec8adc0886f43498e4fbb97a025decb7efc (diff) | |
| parent | 1f4a3a1fc2510d44daeb6fe285a2e402d0774a03 (diff) | |
| download | linux-crypto-340274c558571a7a2733b66c7c0367ae9f108e03.tar.gz linux-crypto-340274c558571a7a2733b66c7c0367ae9f108e03.zip | |
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/drbg.c')
| -rw-r--r-- | crypto/drbg.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/crypto/drbg.c b/crypto/drbg.c index 39ed9183..54cfd482 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; |