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

[libratbox] Remove an unused random function

Browse source 
Nothing in the Charybdis or libratbox code calls rb_get_pseudo_random
and under OpenSSL it uses RAND_pseudo_bytes() which is both dangerous
and removed in OpenSSL version 1.1.0.
This commit is contained in:
Aaron Jones 2015-10-25 15:59:16 +00:00
parent 25f7ee7dd6
commit 0b05d1aad5
No known key found for this signature in database
GPG key ID: 6E854C0FAAD4CEA4
5 changed files with 0 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libratbox/include/rb_commio.h
View file

@ -166,7 +166,6 @@ typedef enum
int rb_init_prng(const char *path, prng_seed_t seed_type); int rb_init_prng(const char *path, prng_seed_t seed_type);
int rb_get_random(void *buf, size_t len); int rb_get_random(void *buf, size_t len);
int rb_get_pseudo_random(void *buf, size_t len);
void rb_ssl_start_accepted(rb_fde_t *new_F, ACCB * cb, void *data, int timeout); void rb_ssl_start_accepted(rb_fde_t *new_F, ACCB * cb, void *data, int timeout);
void rb_ssl_start_connected(rb_fde_t *F, CNCB * callback, void *data, int timeout); void rb_ssl_start_connected(rb_fde_t *F, CNCB * callback, void *data, int timeout);
int rb_supports_ssl(void); int rb_supports_ssl(void);

1
libratbox/src/export-syms.txt
View file

@ -146,7 +146,6 @@ rb_spawn_process
rb_supports_ssl rb_supports_ssl
rb_ssl_handshake_count rb_ssl_handshake_count
rb_ssl_clear_handshake_count rb_ssl_clear_handshake_count
rb_get_pseudo_random
rb_strerror rb_strerror
rb_kill rb_kill
rb_setenv rb_setenv

11
libratbox/src/gnutls.c
View file

@ -552,17 +552,6 @@ rb_get_random(void *buf, size_t length)
return 1; return 1;
} }
int
rb_get_pseudo_random(void *buf, size_t length)
{
#if GNUTLS_VERSION_MAJOR < 3
gcry_randomize(buf, length, GCRY_WEAK_RANDOM);
#else
gnutls_rnd(GNUTLS_RND_RANDOM, buf, length);
#endif
return 1;
}
const char * const char *
rb_get_ssl_strerror(rb_fde_t *F) rb_get_ssl_strerror(rb_fde_t *F)
{ {

7
libratbox/src/nossl.c
View file

@ -86,13 +86,6 @@ rb_get_random(void *buf, size_t length)
return 1; return 1;
} }
int
rb_get_pseudo_random(void *buf, size_t length)
{
return rb_get_random(buf, length);
}
const char * const char *
rb_get_ssl_strerror(rb_fde_t *F) rb_get_ssl_strerror(rb_fde_t *F)
{ {

10
libratbox/src/openssl.c
View file

@ -674,16 +674,6 @@ rb_get_random(void *buf, size_t length)
return ret; return ret;
} }
int
rb_get_pseudo_random(void *buf, size_t length)
{
int ret;
ret = RAND_pseudo_bytes(buf, length);
if(ret < 0)
return 0;
return 1;
}
const char * const char *
rb_get_ssl_strerror(rb_fde_t *F) rb_get_ssl_strerror(rb_fde_t *F)
{ {