diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-15 18:23:21 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-15 18:23:21 +0400 |
| commit | 3630056d961593bdf41aaf268c7620d36e635119 (patch) | |
| tree | 9c88b19638fce36a6c51b14d69e058dd4b096235 /crypto | |
| parent | 9e82bf014195d6f0054982c463575cdce24292be (diff) | |
| parent | 78f543a93473f67a1035949a293b79288e259b6e (diff) | |
| download | linux-3630056d961593bdf41aaf268c7620d36e635119.tar.xz | |
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 7894db9ca90b..a53ee099e281 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; |