diff options
10 files changed, 43 insertions, 4 deletions
diff --git a/integration_tests/example_filesystems/normal/3-HZSwv99agoWgTErV0YFQ== b/integration_tests/example_filesystems/v0.4/3-HZSwv99agoWgTErV0YFQ== Binary files differindex 5d0af82..5d0af82 100644 --- a/integration_tests/example_filesystems/normal/3-HZSwv99agoWgTErV0YFQ== +++ b/integration_tests/example_filesystems/v0.4/3-HZSwv99agoWgTErV0YFQ== diff --git a/integration_tests/example_filesystems/normal/6hL2fPVB2aMSh4-UoDn5Kw== b/integration_tests/example_filesystems/v0.4/6hL2fPVB2aMSh4-UoDn5Kw== index 31b9013..31b9013 120000 --- a/integration_tests/example_filesystems/normal/6hL2fPVB2aMSh4-UoDn5Kw== +++ b/integration_tests/example_filesystems/v0.4/6hL2fPVB2aMSh4-UoDn5Kw== diff --git a/integration_tests/example_filesystems/normal/TBIgdfhDKwkXVTnWLVzFSg== b/integration_tests/example_filesystems/v0.4/TBIgdfhDKwkXVTnWLVzFSg== index 7a15694..7a15694 120000 --- a/integration_tests/example_filesystems/normal/TBIgdfhDKwkXVTnWLVzFSg== +++ b/integration_tests/example_filesystems/v0.4/TBIgdfhDKwkXVTnWLVzFSg== diff --git a/integration_tests/example_filesystems/normal/gocryptfs.conf b/integration_tests/example_filesystems/v0.4/gocryptfs.conf index 354b4bb..354b4bb 100644 --- a/integration_tests/example_filesystems/normal/gocryptfs.conf +++ b/integration_tests/example_filesystems/v0.4/gocryptfs.conf diff --git a/integration_tests/example_filesystems/v0.5/By5HbeLik3V5zkv7Ls1pbg== b/integration_tests/example_filesystems/v0.5/By5HbeLik3V5zkv7Ls1pbg== new file mode 120000 index 0000000..9f74ead --- /dev/null +++ b/integration_tests/example_filesystems/v0.5/By5HbeLik3V5zkv7Ls1pbg== @@ -0,0 +1 @@ +l7TSsTckQSyPjfmEJGNd8dRrbJCA68YIqD_ZYpKu4UQxlM-8RqA=
\ No newline at end of file diff --git a/integration_tests/example_filesystems/v0.5/VxphQR1cIIFkEKhP8f18NQ== b/integration_tests/example_filesystems/v0.5/VxphQR1cIIFkEKhP8f18NQ== Binary files differnew file mode 100644 index 0000000..aa686c6 --- /dev/null +++ b/integration_tests/example_filesystems/v0.5/VxphQR1cIIFkEKhP8f18NQ== diff --git a/integration_tests/example_filesystems/v0.5/gNdxbufjfWaFvNeyEZ-mUg== b/integration_tests/example_filesystems/v0.5/gNdxbufjfWaFvNeyEZ-mUg== new file mode 120000 index 0000000..2eecd29 --- /dev/null +++ b/integration_tests/example_filesystems/v0.5/gNdxbufjfWaFvNeyEZ-mUg== @@ -0,0 +1 @@ +fgxzwbsvjcQzLLJCh8iXmdL89StySXpiXyLSyGLWuDmDxNVH
\ No newline at end of file diff --git a/integration_tests/example_filesystems/v0.5/gocryptfs.conf b/integration_tests/example_filesystems/v0.5/gocryptfs.conf new file mode 100644 index 0000000..4aa8951 --- /dev/null +++ b/integration_tests/example_filesystems/v0.5/gocryptfs.conf @@ -0,0 +1,14 @@ +{ + "EncryptedKey": "eEjly8AC1f/7HSiBwZlCWtzYXx+le7HpKu2qf8mcNo6ua2J0N4wasewjkzntU6r2ROdp3hjFQyHtZrCf", + "ScryptObject": { + "Salt": "MHr2o3kUQAHPE7Wc+p4eDDhKrpA8AOwzOo14JYoU89s=", + "N": 65536, + "R": 8, + "P": 1, + "KeyLen": 32 + }, + "Version": 2, + "FeatureFlags": [ + "DirIV" + ] +}
\ No newline at end of file diff --git a/integration_tests/example_filesystems/v0.5/gocryptfs.diriv b/integration_tests/example_filesystems/v0.5/gocryptfs.diriv new file mode 100644 index 0000000..25e74aa --- /dev/null +++ b/integration_tests/example_filesystems/v0.5/gocryptfs.diriv @@ -0,0 +1 @@ +«¯úDÈ|å ¯?jq
\ No newline at end of file diff --git a/integration_tests/example_filesystems_test.go b/integration_tests/example_filesystems_test.go index bd4f21d..6f1574a 100644 --- a/integration_tests/example_filesystems_test.go +++ b/integration_tests/example_filesystems_test.go @@ -44,11 +44,11 @@ func checkExampleContent(t *testing.T, dir string) { } } -// Test example_filesystems/normal +// Test example_filesystems/v0.4 // with password mount and -masterkey mount -func TestExampleFsNormal(t *testing.T) { - pDir := tmpDir + "TestExampleFsNormal/" - cDir := "example_filesystems/normal" +func TestExampleFsV04(t *testing.T) { + pDir := tmpDir + "TestExampleFsV04/" + cDir := "example_filesystems/v0.4" err := os.Mkdir(pDir, 0777) if err != nil { t.Fatal(err) @@ -65,3 +65,25 @@ func TestExampleFsNormal(t *testing.T) { t.Error(err) } } + +// Test example_filesystems/v0.5 +// with password mount and -masterkey mount +func TestExampleFsV05(t *testing.T) { + pDir := tmpDir + "TestExampleFsV05/" + cDir := "example_filesystems/v0.5" + err := os.Mkdir(pDir, 0777) + if err != nil { + t.Fatal(err) + } + mount(cDir, pDir, "-extpass", "echo test") + checkExampleContent(t, pDir) + unmount(pDir) + mount(cDir, pDir, "-masterkey", "e7f38c71-0da80f68-d3b2cd7d-ee4f49e5-"+ + "f8bc98cd-d7976950-85204c54-3081b302") + checkExampleContent(t, pDir) + unmount(pDir) + err = os.Remove(pDir) + if err != nil { + t.Error(err) + } +} |