9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

OpenSSL: Simplify the RNG code

Browse source
This commit is contained in:
Aaron Jones 2016-09-15 19:51:36 +00:00
parent 15e2cab1e5
commit 5bb5226edc
No known key found for this signature in database
GPG key ID: EC6F86EE9CD840B5
1 changed files with 14 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
libratbox/src/openssl.c
View file

@ -429,45 +429,32 @@ rb_setup_ssl_server(const char *const certfile, const char *keyfile,
int int
rb_init_prng(const char *const path, prng_seed_t seed_type) rb_init_prng(const char *const path, prng_seed_t seed_type)
{ {
if(seed_type == RB_PRNG_DEFAULT) (void) rb_ssl_last_err();
{
#ifdef _WIN32
RAND_screen();
#endif
return RAND_status();
}
if(path == NULL)
return RAND_status();
switch(seed_type) if(seed_type == RB_PRNG_FILE && RAND_load_file(path, -1) < 0)
rb_lib_log("%s: RAND_load_file: %s", __func__, rb_ssl_strerror(rb_ssl_last_err()));
if(RAND_status() != 1)
{ {
case RB_PRNG_FILE: rb_lib_log("%s: RAND_status: %s", __func__, rb_ssl_strerror(rb_ssl_last_err()));
if(RAND_load_file(path, -1) == -1) return 0;
return -1;
break;
#ifdef _WIN32
case RB_PRNGWIN32:
RAND_screen();
break;
#endif
default:
return -1;
} }
return RAND_status(); return 1;
} }
int int
rb_get_random(void *const buf, const size_t length) rb_get_random(void *const buf, const size_t length)
{ {
int ret; (void) rb_ssl_last_err();
if((ret = RAND_bytes(buf, length)) == 0) if(RAND_bytes(buf, (int) length) != 1)
{ {
/* remove the error from the queue */ rb_lib_log("%s: RAND_bytes: %s", __func__, rb_ssl_strerror(rb_ssl_last_err()));
rb_ssl_last_err(); return 0;
} }
return ret;
return 1;
} }
const char * const char *