diff options
author | Stephan Mueller <smueller@chronox.de> | 2015-04-18 19:35:45 +0200 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2015-04-21 09:14:45 +0800 |
commit | 9d57e270d6fa182ca31f3ba5486c74e1b0293779 (patch) | |
tree | 3afefc1fb14842ed3337d9c72b36885ac6579259 | |
parent | a73b9524f62b17b2f24e8ed3063f398a1412eeae (diff) | |
download | linux-crypto-9d57e270d6fa182ca31f3ba5486c74e1b0293779.tar.gz linux-crypto-9d57e270d6fa182ca31f3ba5486c74e1b0293779.zip |
crypto: drbg - fix drbg_generate return val check
The drbg_generate returns 0 in success case. That means that
drbg_generate_long will always only generate drbg_max_request_bytes at
most. Longer requests will be truncated to drbg_max_request_bytes.
Reported-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Stephan Mueller <smueller@chronox.de>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r-- | crypto/drbg.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/crypto/drbg.c b/crypto/drbg.c index 8d2944fa..5a218a5c 100644 --- a/crypto/drbg.c +++ b/crypto/drbg.c @@ -1442,19 +1442,19 @@ static int drbg_generate_long(struct drbg_state *drbg, unsigned char *buf, unsigned int buflen, struct drbg_string *addtl) { - int len = 0; + unsigned int len = 0; unsigned int slice = 0; do { - int tmplen = 0; + int err = 0; unsigned int chunk = 0; slice = ((buflen - len) / drbg_max_request_bytes(drbg)); chunk = slice ? drbg_max_request_bytes(drbg) : (buflen - len); - tmplen = drbg_generate(drbg, buf + len, chunk, addtl); - if (0 >= tmplen) - return tmplen; - len += tmplen; + err = drbg_generate(drbg, buf + len, chunk, addtl); + if (0 > err) + return err; + len += chunk; } while (slice > 0 && (len < buflen)); - return len; + return 0; } /* |