From 31e7b8d61903aef77725d14365b35caca5a43517 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sat, 5 Aug 2017 13:15:35 +0100
Subject: [PATCH] tripwire qr code verification

---
 src/freedombone-base-tripwire |  2 +-
 src/freedombone-controlpanel  | 11 ++++++++++-
 src/freedombone-upgrade       |  6 ------
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/freedombone-base-tripwire b/src/freedombone-base-tripwire
index f5d198ae..4a4c9121 100755
--- a/src/freedombone-base-tripwire
+++ b/src/freedombone-base-tripwire
@@ -58,7 +58,7 @@ function install_tripwire {
     debconf-set-selections <<< "tripwire tripwire/use-sitekey boolean false"
     debconf-set-selections <<< "tripwire tripwire/use-localkey boolean false"
 
-    apt-get -yq install tripwire
+    apt-get -yq install tripwire qrencode
     apt-get -yq autoremove
     cd /etc/tripwire
 
diff --git a/src/freedombone-controlpanel b/src/freedombone-controlpanel
index 1eefc388..c8892a5b 100755
--- a/src/freedombone-controlpanel
+++ b/src/freedombone-controlpanel
@@ -1298,7 +1298,16 @@ function reset_tripwire {
 
                 ' | reset-tripwire
     echo ''
-    echo $'Tripwire is now reset'
+    if [ -f /var/lib/tripwire/${HOSTNAME}.net.twd ]; then
+        DBHASH=$(sha512sum  /var/lib/tripwire/${HOSTNAME}.net.twd)
+        echo "$DBHASH" | qrencode -t UTF8
+        echo ''
+        echo "$DBHASH"
+        echo ''
+        echo $'Tripwire is now reset'
+    else
+        echo $'ERROR: tripwire database was not created'
+    fi
     any_key
 }
 
diff --git a/src/freedombone-upgrade b/src/freedombone-upgrade
index 1cee7878..f855433b 100755
--- a/src/freedombone-upgrade
+++ b/src/freedombone-upgrade
@@ -109,10 +109,4 @@ fi
 # If logging was left on then turn it off
 ${PROJECT_NAME}-logging off
 
-if [ -f /usr/bin/reset-tripwire ]; then
-    echo '
-
-' | reset-tripwire
-fi
-
 # deliberately there is no 'exit 0' here