Revert "Remove more gnutls references."

This reverts commit 6a25507e90c2b2f934724e8eb278e9782acac923.

diff --git a/README.FIRST b/README.FIRST
index eb81531e1101e6b073df3c2dee33fe93826d4697..8c23c45f48f36a805674872bdfb17c4eba70af29 100644 (file)
--- a/README.FIRST
+++ b/README.FIRST
@@ -27,7 +27,8 @@ Necessary Requirements:
 Feature Specific Requirements:
 
 - For SSL Clients, SSL Challenge controlled OPER feature, and encrypted server links,
-  a working OpenSSL library.
+  a working OpenSSL library or GnuTLS library.  CHALLENGE is not supported on GnuTLS
+  yet.
 
 - For encrypted oper and (optional) server passwords, a working DES, MD5, or SHA library
   implementing crypt().

diff --git a/libratbox/include/arc4random.h b/libratbox/include/arc4random.h
index 0734ebeec300ed1b311431e1ee1052aaa9a08193..6bdd701fd06b154329c7c7598d290d3092786135 100644 (file)
--- a/libratbox/include/arc4random.h
+++ b/libratbox/include/arc4random.h
@@ -1,6 +1,6 @@
 
 
-#if !defined(HAVE_OPENSSL) && !defined(HAVE_ARC4RANDOM)
+#if !defined(HAVE_OPENSSL) && !defined(HAVE_GNUTLS) && !defined(HAVE_ARC4RANDOM)
 void arc4random_stir(void);
 uint32_t arc4random(void);
 void arc4random_addrandom(uint8_t *dat, int datlen);

diff --git a/libratbox/src/arc4random.c b/libratbox/src/arc4random.c
index 587779e184dec6dbb49783d6710961dad89ce2c2..dde356e374a58f35d212970cef45cf2d50025830 100644 (file)
--- a/libratbox/src/arc4random.c
+++ b/libratbox/src/arc4random.c
@@ -31,7 +31,7 @@
 #include <libratbox_config.h>
 #include <ratbox_lib.h>
 
-#if !defined(HAVE_OPENSSL) && !defined(HAVE_ARC4RANDOM)
+#if !defined(HAVE_OPENSSL) && !defined(HAVE_GNUTLS) && !defined(HAVE_ARC4RANDOM)
 
 #include "arc4random.h"