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 6f11c6639c43672bd621ce1717ef3374f120dccc..dc5ed9091bc4f4f8b6b2656ca0b4a4cb9525ea83 100644 (file)
--- 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 eb944af563052d68f8ac4c22198ac9c418dc865d..beff1188bd70b0ae426249f6f9367e46b2ac10f9 100644 (file)
--- 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 9e298c806f6749f6a0c076e92351953d09193e9f..a967ae6d778b56d93d2c0f23c86ea62089d5107a 100644 (file)
--- 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 ----------------------------------------------------*/