korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-09-21 20:22:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

crypto: drbg - fix drbg_generate return val check

Browse Source 
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>
This commit is contained in:
Stephan Mueller 2015-04-18 19:35:45 +02:00 committed by Herbert Xu
parent 04a34d4680
commit 082eb10ba9
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
crypto/drbg.c
View File

@ -1442,19 +1442,19 @@ static int drbg_generate_long(struct drbg_state *drbg,
unsigned char *buf, unsigned int buflen, unsigned char *buf, unsigned int buflen,
struct drbg_string *addtl) struct drbg_string *addtl)
{ {
int len = 0; unsigned int len = 0;
unsigned int slice = 0; unsigned int slice = 0;
do { do {
int tmplen = 0; int err = 0;
unsigned int chunk = 0; unsigned int chunk = 0;
slice = ((buflen - len) / drbg_max_request_bytes(drbg)); slice = ((buflen - len) / drbg_max_request_bytes(drbg));
chunk = slice ? drbg_max_request_bytes(drbg) : (buflen - len); chunk = slice ? drbg_max_request_bytes(drbg) : (buflen - len);
tmplen = drbg_generate(drbg, buf + len, chunk, addtl); err = drbg_generate(drbg, buf + len, chunk, addtl);
if (0 >= tmplen) if (0 > err)
return tmplen; return err;
len += tmplen; len += chunk;
} while (slice > 0 && (len < buflen)); } while (slice > 0 && (len < buflen));
return len; return 0;
} }
/* /*