From 486f0ea52f6375c529f081143e0729e37fa77cb5 Mon Sep 17 00:00:00 2001
From: Michael Rash <mbr@cipherdyne.org>
Date: Sat, 27 Apr 2013 22:41:17 -0400
Subject: [PATCH] [test suite] restore gpg directories after test suite runs

---
 Makefile.am                            |   1 +
 test/conf/client-gpg-no-pw/trustdb.gpg | Bin 1360 -> 1360 bytes
 test/conf/client-gpg/trustdb.gpg       | Bin 1360 -> 1360 bytes
 test/conf/gpg_dirs_orig.tar.gz         | Bin 0 -> 3876 bytes
 test/conf/server-gpg-no-pw/trustdb.gpg | Bin 1360 -> 1360 bytes
 test/conf/server-gpg/trustdb.gpg       | Bin 1360 -> 1360 bytes
 test/test-fwknop.pl                    |  17 +++++++++++++++++
 7 files changed, 18 insertions(+)
 create mode 100644 test/conf/gpg_dirs_orig.tar.gz

diff --git a/Makefile.am b/Makefile.am
index 049ab4f4..8af715c3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -109,6 +109,7 @@ EXTRA_DIST = \
     python/setup.py \
     python/fkomodule.c \
     python/fko.py \
+    test/conf/gpg_dirs_orig.tar.gz \
     test/conf/client-gpg/pubring.gpg \
     test/conf/client-gpg/secring.gpg \
     test/conf/client-gpg/trustdb.gpg \
diff --git a/test/conf/client-gpg-no-pw/trustdb.gpg b/test/conf/client-gpg-no-pw/trustdb.gpg
index be93308f5a13f5286114a8c85adacca189897c95..58ec2d6dbf204edd880308798a9b72d7f7d66d15 100644
GIT binary patch
delta 28
jcmcb>b%9HOF})z2nVFH5k%581y}swh#6a<l>YA(oXdeeU

delta 28
jcmcb>b%9HOF})z2nVFH5k%@sJu*QLJVxag&bxl?PUylYY

diff --git a/test/conf/client-gpg/trustdb.gpg b/test/conf/client-gpg/trustdb.gpg
index 2c1093e73c1227259c2893e761ac694105f51efb..58ec2d6dbf204edd880308798a9b72d7f7d66d15 100644
GIT binary patch
delta 28
jcmcb>b%9HOF})z2nVFH5k%581y}swh#6a<l>YA(oXdeeU

delta 28
jcmcb>b%9HOF})z2nVFH5k%@sJu*Ok&Vxag&bxl?PU_b^#

diff --git a/test/conf/gpg_dirs_orig.tar.gz b/test/conf/gpg_dirs_orig.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..c853ff3931f43acd64188a5a5dead993eb2eeb3a
GIT binary patch
literal 3876
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
m000000000000000000000000000013di)Dcq7vf(pa1~6+RBsw

literal 0
HcmV?d00001

diff --git a/test/conf/server-gpg-no-pw/trustdb.gpg b/test/conf/server-gpg-no-pw/trustdb.gpg
index 0c29e43a4ea4e82d1e514bb2d55332c721903db1..d5b5b60cd9b030059937355993c0f0602d20d90f 100644
GIT binary patch
delta 28
jcmcb>b%9HOF})z2nVFH5k%581y`J;u#6a<l>YA(oWQ+#b

delta 28
jcmcb>b%9HOF})z2nVFH5k%@sJu*N}PVxag&bxl?PU!Mjq

diff --git a/test/conf/server-gpg/trustdb.gpg b/test/conf/server-gpg/trustdb.gpg
index 8090303dd015d01f003710e02475fa177bab51f8..d5b5b60cd9b030059937355993c0f0602d20d90f 100644
GIT binary patch
delta 28
jcmcb>b%9HOF})z2nVFH5k%581y`J;u#6a<l>YA(oWQ+#b

delta 28
jcmcb>b%9HOF})z2nVFH5k%@sJu*OkqVxag&bxl?PV0Z>f

diff --git a/test/test-fwknop.pl b/test/test-fwknop.pl
index 9d61e4a5..22639ad2 100755
--- a/test/test-fwknop.pl
+++ b/test/test-fwknop.pl
@@ -26,6 +26,7 @@ my $data_tmp        = 'data.tmp';
 my $key_tmp         = 'key.tmp';
 my $enc_save_tmp    = 'openssl_save.enc';
 my $test_suite_path = 'test-fwknop.pl';
+my $gpg_dir_orig_tar = 'gpg_dirs_orig.tar.gz';
 our $gpg_client_home_dir = "$conf_dir/client-gpg";
 our $gpg_client_home_dir_no_pw = "$conf_dir/client-gpg-no-pw";
 our $replay_pcap_file = "$conf_dir/spa_replay.pcap";
@@ -592,6 +593,7 @@ if ($enable_valgrind) {
 &logr("\n");
 
 &remove_permissions_warnings() unless $include_permissions_warnings;
+&restore_gpg_dirs();
 
 my $total_elapsed_seconds = time() - $start_time;
 my $total_elapsed_minutes = sprintf "%.2f", ($total_elapsed_seconds / 60);
@@ -5006,6 +5008,21 @@ sub init() {
     return;
 }
 
+sub restore_gpg_dirs() {
+
+    my $curr_pwd = cwd() or die $!;
+
+    chdir $conf_dir or die $!;
+
+    if (-e $gpg_dir_orig_tar) {
+        system "tar xfz $gpg_dir_orig_tar > /dev/null";
+    }
+
+    chdir $curr_pwd or die $!;
+
+    return;
+}
+
 sub openssl_hmac_style_check() {
     if (&run_cmd("$openssl_path dgst -hex -sha256 -mac HMAC " .
             "-macopt hexkey:61616161 $0", $cmd_out_tmp, $curr_test_file)) {