diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-15 07:23:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-15 07:23:21 -0700 |
| commit | b9e89cef449430b7dcdc79fccb245fed20d2692d (patch) | |
| tree | 7b76302f8328a7ae32f23ae1d4bd4ad111899b1f /crypto | |
| parent | 4f73ff2a190664f7f6edb950510ae1af0b4fb6d0 (diff) | |
| parent | 1f4a3a1fc2510d44daeb6fe285a2e402d0774a03 (diff) | |
| download | linux-crypto-b9e89cef449430b7dcdc79fccb245fed20d2692d.tar.gz linux-crypto-b9e89cef449430b7dcdc79fccb245fed20d2692d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"This fixes the newly added drbg generator so that it actually works on
32-bit machines. Previously the code was only tested on 64-bit and on
32-bit it overflowed and simply doesn't work"
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: drbg - remove check for uninitialized DRBG handle
crypto: drbg - backport "fix maximum value checks on 32 bit systems"
Diffstat (limited to 'crypto')
| -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 7894db9c..a53ee099 100644 --- a/crypto/drbg.c +++ b/crypto/drbg.c @@ -1922,9 +1922,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; |