From: Mark Wooding <mdw@distorted.org.uk>
Date: Sat, 4 Jun 2016 15:39:48 +0000 (+0100)
Subject: Use new Catacomb `rand_quick' to gather entropy from other fast sources.
X-Git-Tag: 1.0.0pre19~40
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/commitdiff_plain/36b9f99a5250c776888c50ad7ddd89afce84c31d

Use new Catacomb `rand_quick' to gather entropy from other fast sources.

This requires a very shiny Catcomb.  I can make the dependency softer if
necessary.
---

diff --git a/configure.ac b/configure.ac
index 6f11c663..dc5ed909 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,7 +65,7 @@ case "$host_os" in
 esac
 
 PKG_CHECK_MODULES([mLib], [mLib >= 2.2.1])
-PKG_CHECK_MODULES([catacomb], [catacomb >= 2.1.4])
+PKG_CHECK_MODULES([catacomb], [catacomb >= 2.2.2-38])
 
 AM_CFLAGS="$AM_CFLAGS $mLib_CFLAGS $catacomb_CFLAGS"
 
diff --git a/debian/control b/debian/control
index eb944af5..beff1188 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ XS-Python-Version: >= 2.4
 Build-Depends: debhelper (>= 9), pkg-config, curl, rsync, python-central,
 	tshark, wireshark-dev (>= 0.10.10),
 	mlib-dev (>= 2.2.2),
-	catacomb-dev (>= 2.1.4), catacomb-bin (>= 2.1.4)
+	catacomb-dev (>= 2.2.2+38), catacomb-bin (>= 2.1.4)
 Build-Depends-Indep: python,
 	python-cdb, python-gtk2,
 	python-mlib (>= 1.0.2), python-catacomb (>= 1.1.0)
diff --git a/server/tripe.h b/server/tripe.h
index 9e298c80..a967ae6d 100644
--- a/server/tripe.h
+++ b/server/tripe.h
@@ -576,7 +576,8 @@ extern unsigned tr_flags;		/* Trace options flags */
 
 /*----- Other macros ------------------------------------------------------*/
 
-#define QUICKRAND noise_timer(RAND_GLOBAL)
+#define QUICKRAND							\
+  do { rand_quick(RAND_GLOBAL); noise_timer(RAND_GLOBAL); } while (0)
 
 /*----- Key management ----------------------------------------------------*/