From e9bb8b800c6c724125ccd862f4d20946317b31f5 Mon Sep 17 00:00:00 2001
From: Jakob Unterwurzacher
Date: Mon, 26 Sep 2016 23:25:13 +0200
Subject: reverse: switch from GCM-SIV to AES-SIV

GCM-SIV is not yet finalized, and the reference implemenation is
painfully slow at about 2 MB/s. Switch to AES-SIV.
---
 tests/normal/cli_test.go              | 18 +++++++++---------
 tests/reverse/linux-tarball-test.bash |  3 ++-
 tests/reverse/main_test.go            |  2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'tests')

diff --git a/tests/normal/cli_test.go b/tests/normal/cli_test.go
index 62ad217..f0e160d 100644
--- a/tests/normal/cli_test.go
+++ b/tests/normal/cli_test.go
@@ -27,20 +27,20 @@ func TestInit(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if c.IsFeatureFlagSet(configfile.FlagGCMSIV) {
-		t.Error("GCMSIV flag should not be set")
+	if c.IsFeatureFlagSet(configfile.FlagAESSIV) {
+		t.Error("AESSIV flag should not be set")
 	}
 }
 
-// Test -init with -gcmsiv
-func TestInitGcmsiv(t *testing.T) {
-	dir := test_helpers.InitFS(t, "-gcmsiv")
+// Test -init with -aessiv
+func TestInitAessiv(t *testing.T) {
+	dir := test_helpers.InitFS(t, "-aessiv")
 	_, c, err := configfile.LoadConfFile(dir+"/"+configfile.ConfDefaultName, "test")
 	if err != nil {
 		t.Fatal(err)
 	}
-	if !c.IsFeatureFlagSet(configfile.FlagGCMSIV) {
-		t.Error("GCMSIV flag should be set but is not")
+	if !c.IsFeatureFlagSet(configfile.FlagAESSIV) {
+		t.Error("AESSIV flag should be set but is not")
 	}
 }
 
@@ -51,8 +51,8 @@ func TestInitReverse(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if !c.IsFeatureFlagSet(configfile.FlagGCMSIV) {
-		t.Error("GCMSIV flag should be set but is not")
+	if !c.IsFeatureFlagSet(configfile.FlagAESSIV) {
+		t.Error("AESSIV flag should be set but is not")
 	}
 }
 
diff --git a/tests/reverse/linux-tarball-test.bash b/tests/reverse/linux-tarball-test.bash
index 7306600..5fbc3fc 100755
--- a/tests/reverse/linux-tarball-test.bash
+++ b/tests/reverse/linux-tarball-test.bash
@@ -28,4 +28,5 @@ gocryptfs -q -extpass="echo test" b c
 # Check md5 sums
 cd c
 echo "Checking md5 sums"
-md5sum --status -c $MD5
+set -o pipefail
+md5sum -c $MD5 | pv -l -s 36782 -N "files checked" | (grep -v ": OK" || true)
diff --git a/tests/reverse/main_test.go b/tests/reverse/main_test.go
index f59386b..a42bb82 100644
--- a/tests/reverse/main_test.go
+++ b/tests/reverse/main_test.go
@@ -26,7 +26,7 @@ func TestMain(m *testing.M) {
 		panic(err)
 	}
 	test_helpers.MountOrExit(dirA, dirB, "-zerokey", "-reverse")
-	test_helpers.MountOrExit(dirB, dirC, "-zerokey", "-gcmsiv")
+	test_helpers.MountOrExit(dirB, dirC, "-zerokey", "-aessiv")
 	r := m.Run()
 	test_helpers.UnmountPanic(dirC)
 	test_helpers.UnmountPanic(dirB)
-- 
cgit v1.2.3