Run haveged during autopkgtests to ensure that they have enough entropy for key generation (LP: #1712921).

2 files changed, 19 insertions, 0 deletions

diff --git a/debian/tests/control b/debian/tests/control
index df8f9b847..ba59c97b4 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,6 +1,7 @@
 Tests: regress
 Restrictions: needs-root allow-stderr
 Depends: devscripts,
+         haveged,
          openssh-client,
          openssh-server,
          openssh-sftp-server,
@@ -8,4 +9,5 @@ Depends: devscripts,
          putty-tools (>= 0.67-2),
          python-twisted-conch (>= 1:15.5.0-1),
          sudo,
+         sysvinit-utils,
          @builddeps@,
diff --git a/debian/tests/regress b/debian/tests/regress
index 662526b54..79405e198 100755
--- a/debian/tests/regress
+++ b/debian/tests/regress
@@ -5,6 +5,12 @@ if [ "$(id -un)" != openssh-tests ]; then
         TMP="$ADTTMP/user"
 
         cleanup () {
+                if [ -e "$TMP/haveged.pid" ]; then
+                        start-stop-daemon --stop --quiet \
+                                --retry=TERM/30/KILL/5 \
+                                --pidfile "$TMP/haveged.pid" \
+                                --name haveged
+                fi
                 rm -rf "$TMP"
                 rm -f /etc/sudoers.d/openssh-tests
                 if id openssh-tests >/dev/null 2>&1; then
@@ -21,6 +27,17 @@ EOF
         mkdir -p "$TMP"
         cp -a . "$TMP/tree"
         chown -R openssh-tests:openssh-tests "$TMP"
+
+        # If we're running in a container, haveged may not have started
+        # automatically.  Do this by hand rather than via systemctl or
+        # similar, since autopkgtests shouldn't depend on a particular init
+        # system.
+        if ! pidof haveged >/dev/null; then
+                start-stop-daemon --start --quiet \
+                        --pidfile "$TMP/haveged.pid" \
+                        --exec /usr/sbin/haveged -- -w 1024
+        fi
+
         sudo -u openssh-tests env TMP="$TMP" "$0" "$@"
         exit "$?"
 fi