From: Antoine Beaupré <redacted>
Date: Mon, 10 Jun 2013 16:18:43 +0000 (-0400)
Subject: Revert "Remove more gnutls references."
X-Git-Url: https://jfr.im/git/solanum.git/commitdiff_plain/608e20b4fa5c19bf98bba76ceba38943e14b2f19

Revert "Remove more gnutls references."

This reverts commit 6a25507e90c2b2f934724e8eb278e9782acac923.
---

diff --git a/README.FIRST b/README.FIRST
index eb81531e..8c23c45f 100644
--- 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 0734ebee..6bdd701f 100644
--- 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 587779e1..dde356e3 100644
--- 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"