summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Sosedkin <asosedkin@redhat.com>2021-03-08 14:56:32 +0100
committerAlexander Sosedkin <asosedkin@redhat.com>2021-03-08 15:20:42 +0100
commitdb5e38aec5123b6fa4ad5eed7961adbd83deecba (patch)
tree74213c911160884e27fe55b1347e39ce50014482
parent56bcfa474b800a1b84288a59605867e5c62f33f8 (diff)
downloadgnutls-db5e38aec5123b6fa4ad5eed7961adbd83deecba.tar.gz
lib/nettle: get rid of _rnd_system_entropy_check
Signed-off-by: Alexander Sosedkin <asosedkin@redhat.com>
-rw-r--r--lib/nettle/rnd-common.h1
-rw-r--r--lib/nettle/sysrng-bcrypt.c5
-rw-r--r--lib/nettle/sysrng-getentropy.c5
-rw-r--r--lib/nettle/sysrng-linux.c6
-rw-r--r--lib/nettle/sysrng-netbsd.c5
-rw-r--r--lib/nettle/sysrng-windows.c5
-rw-r--r--tests/rng-sigint.c1
7 files changed, 0 insertions, 28 deletions
diff --git a/lib/nettle/rnd-common.h b/lib/nettle/rnd-common.h
index 429ca017d3..025fe02e8f 100644
--- a/lib/nettle/rnd-common.h
+++ b/lib/nettle/rnd-common.h
@@ -35,7 +35,6 @@
#include <fips.h>
int _rnd_system_entropy_init(void);
-int _rnd_system_entropy_check(void);
void _rnd_system_entropy_deinit(void);
typedef int (*get_entropy_func)(void* rnd, size_t size);
diff --git a/lib/nettle/sysrng-bcrypt.c b/lib/nettle/sysrng-bcrypt.c
index 10dc9ac83a..a08e9deb92 100644
--- a/lib/nettle/sysrng-bcrypt.c
+++ b/lib/nettle/sysrng-bcrypt.c
@@ -64,11 +64,6 @@ int _rnd_get_system_entropy_win32(void* rnd, size_t size)
return 0;
}
-int _rnd_system_entropy_check(void)
-{
- return 0;
-}
-
int _rnd_system_entropy_init(void)
{
NTSTATUS err = BCryptOpenAlgorithmProvider
diff --git a/lib/nettle/sysrng-getentropy.c b/lib/nettle/sysrng-getentropy.c
index 99e95ead8b..0666d482c2 100644
--- a/lib/nettle/sysrng-getentropy.c
+++ b/lib/nettle/sysrng-getentropy.c
@@ -71,11 +71,6 @@ int _rnd_system_entropy_init(void)
return 0;
}
-int _rnd_system_entropy_check(void)
-{
- return 0;
-}
-
void _rnd_system_entropy_deinit(void)
{
return;
diff --git a/lib/nettle/sysrng-linux.c b/lib/nettle/sysrng-linux.c
index 62024b121f..6b3971c65f 100644
--- a/lib/nettle/sysrng-linux.c
+++ b/lib/nettle/sysrng-linux.c
@@ -159,12 +159,6 @@ static int _rnd_get_system_entropy_urandom(void* _rnd, size_t size)
return 0;
}
-int _rnd_system_entropy_check(void)
-{
- /* A no-op now when we open and close /dev/urandom every time */
- return 0;
-}
-
int _rnd_system_entropy_init(void)
{
int urandom_fd;
diff --git a/lib/nettle/sysrng-netbsd.c b/lib/nettle/sysrng-netbsd.c
index 7fb3d8d326..7f74b4eed4 100644
--- a/lib/nettle/sysrng-netbsd.c
+++ b/lib/nettle/sysrng-netbsd.c
@@ -71,11 +71,6 @@ int _rnd_system_entropy_init(void)
return 0;
}
-int _rnd_system_entropy_check(void)
-{
- return 0;
-}
-
void _rnd_system_entropy_deinit(void)
{
return;
diff --git a/lib/nettle/sysrng-windows.c b/lib/nettle/sysrng-windows.c
index 9d38e67ec1..8c931d29cc 100644
--- a/lib/nettle/sysrng-windows.c
+++ b/lib/nettle/sysrng-windows.c
@@ -64,11 +64,6 @@ int _rnd_get_system_entropy_win32(void* rnd, size_t size)
return 0;
}
-int _rnd_system_entropy_check(void)
-{
- return 0;
-}
-
int _rnd_system_entropy_init(void)
{
if (!CryptAcquireContext
diff --git a/tests/rng-sigint.c b/tests/rng-sigint.c
index 76b76f353c..04e818ede9 100644
--- a/tests/rng-sigint.c
+++ b/tests/rng-sigint.c
@@ -44,7 +44,6 @@
#define gnutls_assert_val(val) val
int _rnd_system_entropy_init(void);
-int _rnd_system_entropy_check(void);
void _rnd_system_entropy_deinit(void);
typedef int (*get_entropy_func)(void* rnd, size_t size);