aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax <msuraev@sysmocom.de>2018-11-09 13:13:45 +0100
committerHarald Welte <laforge@gnumonks.org>2019-01-07 15:45:00 +0000
commit42e567c5a95af3e823a68fe7c949f5282d06d297 (patch)
tree8b984664ae5dd40268fabf38ecbe81ef190e0aff
parent0187c3ae373f36bd0e81654ae6aa7b496f5990ea (diff)
Automatically disable GnuTLS fallback
Disable GnuTLS fallback if sufficient glibc version detected. Previously GnuTLS fallback was used regardless of getrandom() availability in glibc. Fix this by automatically disabling it when not needed. This does not affect the ability to manually disable it unconditionally. Change-Id: Ibe2117afc050261668a4d5a590044aabcd08aefe
-rw-r--r--src/gsm/gsm_utils.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gsm/gsm_utils.c b/src/gsm/gsm_utils.c
index 14331e59..02cb3d55 100644
--- a/src/gsm/gsm_utils.c
+++ b/src/gsm/gsm_utils.c
@@ -103,6 +103,7 @@
#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2,25)
#pragma message ("glibc " OSMO_STRINGIFY_VAL(__GLIBC__) "." OSMO_STRINGIFY_VAL(__GLIBC_MINOR__) " random detected")
#include <sys/random.h>
+#undef USE_GNUTLS
#elif HAVE_DECL_SYS_GETRANDOM
#include <sys/syscall.h>
#ifndef GRND_NONBLOCK