From 0b05d1aad5981e24697afa7356cd62b8838d4a05 Mon Sep 17 00:00:00 2001
From: Aaron Jones <aaronmdjones@gmail.com>
Date: Sun, 25 Oct 2015 15:59:16 +0000
Subject: [PATCH] [libratbox] Remove an unused random function

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.
---
 libratbox/include/rb_commio.h |  1 -
 libratbox/src/export-syms.txt |  1 -
 libratbox/src/gnutls.c        | 11 -----------
 libratbox/src/nossl.c         |  7 -------
 libratbox/src/openssl.c       | 10 ----------
 5 files changed, 30 deletions(-)

diff --git a/libratbox/include/rb_commio.h b/libratbox/include/rb_commio.h
index df6110d4..016c2d27 100644
--- a/libratbox/include/rb_commio.h
+++ b/libratbox/include/rb_commio.h
@@ -166,7 +166,6 @@ typedef enum
 
 int rb_init_prng(const char *path, prng_seed_t seed_type);
 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_connected(rb_fde_t *F, CNCB * callback, void *data, int timeout);
 int rb_supports_ssl(void);
diff --git a/libratbox/src/export-syms.txt b/libratbox/src/export-syms.txt
index fbfc23c0..0caa7687 100644
--- a/libratbox/src/export-syms.txt
+++ b/libratbox/src/export-syms.txt
@@ -146,7 +146,6 @@ rb_spawn_process
 rb_supports_ssl
 rb_ssl_handshake_count
 rb_ssl_clear_handshake_count
-rb_get_pseudo_random
 rb_strerror
 rb_kill
 rb_setenv
diff --git a/libratbox/src/gnutls.c b/libratbox/src/gnutls.c
index 44e51a90..191ccc13 100644
--- a/libratbox/src/gnutls.c
+++ b/libratbox/src/gnutls.c
@@ -552,17 +552,6 @@ rb_get_random(void *buf, size_t length)
 	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 *
 rb_get_ssl_strerror(rb_fde_t *F)
 {
diff --git a/libratbox/src/nossl.c b/libratbox/src/nossl.c
index 3a9f213b..2faf7889 100644
--- a/libratbox/src/nossl.c
+++ b/libratbox/src/nossl.c
@@ -86,13 +86,6 @@ rb_get_random(void *buf, size_t length)
 	return 1;
 }
 
-int
-rb_get_pseudo_random(void *buf, size_t length)
-{
-	return rb_get_random(buf, length);
-}
-
-
 const char *
 rb_get_ssl_strerror(rb_fde_t *F)
 {
diff --git a/libratbox/src/openssl.c b/libratbox/src/openssl.c
index 133e4ecb..d088f7bb 100644
--- a/libratbox/src/openssl.c
+++ b/libratbox/src/openssl.c
@@ -674,16 +674,6 @@ rb_get_random(void *buf, size_t length)
 	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 *
 rb_get_ssl_strerror(rb_fde_t *F)
 {