tests: add v1.1-aessiv example filesystem

Also move the example content into "content".

12 files changed, 43 insertions, 0 deletions

diff --git a/tests/example_filesystems/abs b/tests/example_filesystems/content/abs
index e1740fa..e1740fa 120000
--- a/tests/example_filesystems/abs
+++ b/tests/example_filesystems/content/abs
diff --git a/tests/example_filesystems/status.txt b/tests/example_filesystems/content/longname_255_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
index 68300b8..68300b8 100644
--- a/tests/example_filesystems/status.txt
+++ b/tests/example_filesystems/content/longname_255_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
diff --git a/tests/example_filesystems/rel b/tests/example_filesystems/content/rel
index 8279c75..8279c75 120000
--- a/tests/example_filesystems/rel
+++ b/tests/example_filesystems/content/rel
diff --git a/tests/example_filesystems/content/status.txt b/tests/example_filesystems/content/status.txt
new file mode 100644
index 0000000..68300b8
--- /dev/null
+++ b/tests/example_filesystems/content/status.txt
@@ -0,0 +1 @@
+It works!
diff --git a/tests/example_filesystems/example_filesystems_test.go b/tests/example_filesystems/example_filesystems_test.go
index d182f3a..34514c5 100644
--- a/tests/example_filesystems/example_filesystems_test.go
+++ b/tests/example_filesystems/example_filesystems_test.go
@@ -138,3 +138,22 @@ func TestExampleFSv09(t *testing.T) {
 	checkExampleFSLongnames(t, pDir)
 	test_helpers.UnmountPanic(pDir)
 }
+
+// gocryptfs v1.1 introduced AES-SIV
+func TestExampleFSv11(t *testing.T) {
+	cDir := "v1.1-aessiv"
+	pDir := test_helpers.TmpDir + "/" + cDir
+	err := os.Mkdir(pDir, 0777)
+	if err != nil {
+		t.Fatal(err)
+	}
+	test_helpers.MountOrFatal(t, cDir, pDir, "-extpass", "echo test", opensslOpt)
+	checkExampleFSLongnames(t, pDir)
+	test_helpers.UnmountPanic(pDir)
+	pDir = pDir + ".2"
+	test_helpers.MountOrFatal(t, cDir, pDir, "-masterkey",
+		"be505f7d-54871394-2c0c2481-1bdcd0d8-9113b08a-0f7b4dfc-851c96da-55ef36b5",
+		"-aessiv", opensslOpt)
+	checkExampleFSLongnames(t, pDir)
+	test_helpers.UnmountPanic(pDir)
+}
diff --git a/tests/example_filesystems/v1.1-aessiv/MA0FDdmnXpmPJtS_AcAbqQ== b/tests/example_filesystems/v1.1-aessiv/MA0FDdmnXpmPJtS_AcAbqQ==
new file mode 100644
index 0000000..6767b2a
--- /dev/null
+++ b/tests/example_filesystems/v1.1-aessiv/MA0FDdmnXpmPJtS_AcAbqQ==
diff --git a/tests/example_filesystems/v1.1-aessiv/Sjl6QXHm2IjuKwaKgJ5jig== b/tests/example_filesystems/v1.1-aessiv/Sjl6QXHm2IjuKwaKgJ5jig==
new file mode 120000
index 0000000..b3d31e3
--- /dev/null
+++ b/tests/example_filesystems/v1.1-aessiv/Sjl6QXHm2IjuKwaKgJ5jig==
@@ -0,0 +1 @@
+ozeZ1xXCP-Q904JCvkPk40enJd5zVL6FqBugkS6Y4tfcii_G1DOdDQ==
\ No newline at end of file
diff --git a/tests/example_filesystems/v1.1-aessiv/gocryptfs.conf b/tests/example_filesystems/v1.1-aessiv/gocryptfs.conf
new file mode 100644
index 0000000..d16051a
--- /dev/null
+++ b/tests/example_filesystems/v1.1-aessiv/gocryptfs.conf
@@ -0,0 +1,19 @@
+{
+	"Creator": "gocryptfs v1.1-beta1-33-gf054353-dirty",
+	"EncryptedKey": "y2ldEXg3Ui0jwic99bqvvrvGRPRDB7gYzvOBwZxcmWqRgcp3BLMShhIXwx3Pewmst5TivqSrK2r9wUIL",
+	"ScryptObject": {
+		"Salt": "oEt1In6W5UD1Pe9CFSz21x5ptTRluU43mmshUtmSwAk=",
+		"N": 1024,
+		"R": 8,
+		"P": 1,
+		"KeyLen": 32
+	},
+	"Version": 2,
+	"FeatureFlags": [
+		"GCMIV128",
+		"DirIV",
+		"EMENames",
+		"LongNames",
+		"AESSIV"
+	]
+}
\ No newline at end of file
diff --git a/tests/example_filesystems/v1.1-aessiv/gocryptfs.diriv b/tests/example_filesystems/v1.1-aessiv/gocryptfs.diriv
new file mode 100644
index 0000000..9ca19fd
--- /dev/null
+++ b/tests/example_filesystems/v1.1-aessiv/gocryptfs.diriv
@@ -0,0 +1 @@
+‘ºqyæ@Œ¤0‰kY´]
\ No newline at end of file
diff --git a/tests/example_filesystems/v1.1-aessiv/gocryptfs.longname.dDhdE3C5egl47Q4C4SuPNGPGkzyxuuHCP1efYMCaGqk= b/tests/example_filesystems/v1.1-aessiv/gocryptfs.longname.dDhdE3C5egl47Q4C4SuPNGPGkzyxuuHCP1efYMCaGqk=
new file mode 100644
index 0000000..a5c444d
--- /dev/null
+++ b/tests/example_filesystems/v1.1-aessiv/gocryptfs.longname.dDhdE3C5egl47Q4C4SuPNGPGkzyxuuHCP1efYMCaGqk=
diff --git a/tests/example_filesystems/v1.1-aessiv/gocryptfs.longname.dDhdE3C5egl47Q4C4SuPNGPGkzyxuuHCP1efYMCaGqk=.name b/tests/example_filesystems/v1.1-aessiv/gocryptfs.longname.dDhdE3C5egl47Q4C4SuPNGPGkzyxuuHCP1efYMCaGqk=.name
new file mode 100644
index 0000000..1865eda
--- /dev/null
+++ b/tests/example_filesystems/v1.1-aessiv/gocryptfs.longname.dDhdE3C5egl47Q4C4SuPNGPGkzyxuuHCP1efYMCaGqk=.name
@@ -0,0 +1 @@
+8S9oaCrWGfWIF0_DTQsRvNARW78Vl5HcEYPZOwh3susDIHIbs8JiAF19oqWQz5HN1gpH2213kWqE4m1H1jVKslRHxSPxkQ5sDyaIm4PBZZg5-5djCYoQDLObvrgQv9HsN_NDb2rV8bmmH9SFArJ2SSKX5JdbMcraGr9Rj1AE89-9jIS0VTfKvpA_UgZEdR6IJ7V8VnD3eNo4KsBzJiL4G5wlpxvDLTy7mm7lxK_erV5gzKVHZGIz9Z-ehF--duIfY3x_h2hDNdocIKQltOEcxryHtcUqzcuFB_XkjW6BOTOYINHvLLA8CkLNSOXxLAqoeeu-8GwTgIDKrKhGnTTzgQ==
\ No newline at end of file
diff --git a/tests/example_filesystems/v1.1-aessiv/jCGXyJJqu4sdxRLsDQNEtA== b/tests/example_filesystems/v1.1-aessiv/jCGXyJJqu4sdxRLsDQNEtA==
new file mode 120000
index 0000000..20d2b58
--- /dev/null
+++ b/tests/example_filesystems/v1.1-aessiv/jCGXyJJqu4sdxRLsDQNEtA==
@@ -0,0 +1 @@
+GMqHOo4BNUhfLc-Vqi_R6J76C-OQhHLVgsBl5j9t-XFoq97KNlcuC1Vd
\ No newline at end of file