root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fix some RAND bugs 

RT2630 -- segfault for int overlow
RT2877 -- check return values in apps/rand
Update CHANGES file for previous "windows rand" changes.

Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Rich Salz 2016-05-29 14:11:44 -04:00
parent f83b85fb0f
commit 0f91e1dff4
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES
View File

@ -4,6 +4,11 @@
Changes between 1.0.2h and 1.1.0 [xx XXX 2016] Changes between 1.0.2h and 1.1.0 [xx XXX 2016]
*) Windows RAND implementation was simplified to only get entropy by
calling CryptGenRandom(). Various other RAND-related tickets
were also closed.
[Joseph Wylie Yandle, Rich Salz]
*) The stack and lhash API's were renamed to start with OPENSSL_SK_ *) The stack and lhash API's were renamed to start with OPENSSL_SK_
and OPENSSL_LH_, respectively. The old names are available and OPENSSL_LH_, respectively. The old names are available
with API compatibility. They new names are now completely documented. with API compatibility. They new names are now completely documented.

16
apps/rand.c
View File

@ -105,22 +105,26 @@ int rand_main(int argc, char **argv)
r = RAND_bytes(buf, chunk); r = RAND_bytes(buf, chunk);
if (r <= 0) if (r <= 0)
goto end; goto end;
if (format != FORMAT_TEXT) /* hex */ if (format != FORMAT_TEXT) {
BIO_write(out, buf, chunk); if (BIO_write(out, buf, chunk) != chunk)
else { goto end;
} else {
for (i = 0; i < chunk; i++) for (i = 0; i < chunk; i++)
BIO_printf(out, "%02x", buf[i]); if (BIO_printf(out, "%02x", buf[i]) != 2)
goto end;
} }
num -= chunk; num -= chunk;
} }
if (format == FORMAT_TEXT) if (format == FORMAT_TEXT)
BIO_puts(out, "\n"); BIO_puts(out, "\n");
(void)BIO_flush(out); if (BIO_flush(out) <= 0 || !app_RAND_write_file(NULL))
goto end;
app_RAND_write_file(NULL);
ret = 0; ret = 0;
end: end:
if (ret != 0)
ERR_print_errors(bio_err);
BIO_free_all(out); BIO_free_all(out);
return (ret); return (ret);
} }

6
crypto/rand/md_rand.c
View File

@ -38,7 +38,7 @@
/* #define PREDICT 1 */ /* #define PREDICT 1 */
#define STATE_SIZE 1023 #define STATE_SIZE 1023
static int state_num = 0, state_index = 0; static size_t state_num = 0, state_index = 0;
static unsigned char state[STATE_SIZE + MD_DIGEST_LENGTH]; static unsigned char state[STATE_SIZE + MD_DIGEST_LENGTH];
static unsigned char md[MD_DIGEST_LENGTH]; static unsigned char md[MD_DIGEST_LENGTH];
static long md_count[2] = { 0, 0 }; static long md_count[2] = { 0, 0 };
@ -268,8 +268,8 @@ static int rand_seed(const void *buf, int num)
static int rand_bytes(unsigned char *buf, int num, int pseudo) static int rand_bytes(unsigned char *buf, int num, int pseudo)
{ {
static volatile int stirred_pool = 0; static volatile int stirred_pool = 0;
int i, j, k, st_num, st_idx; int i, j, k;
int num_ceil; size_t num_ceil, st_idx, st_num;
int ok; int ok;
long md_c[2]; long md_c[2];
unsigned char local_md[MD_DIGEST_LENGTH]; unsigned char local_md[MD_DIGEST_LENGTH];