From ab7308639b1ec6ff384d7e78e32a0607574ea485 Mon Sep 17 00:00:00 2001 From: Jakob Unterwurzacher Date: Tue, 24 Aug 2021 13:53:50 +0200 Subject: tests/example_filesystems: add v2.2-xchacha-deterministic-names Combines both new flags. --- .../example_filesystems_test.go | 22 +++++++++++++++++++++ .../2IdIAfbUzIONJq8bnXtVgg | Bin 0 -> 68 bytes .../QCVelV3GWR6e2tG6SEivxA | 1 + .../gocryptfs.conf | 19 ++++++++++++++++++ ...ame.YgPZi_hPi23QQOZcHFtxAXzdHSBtlWZlGQ6XIjf8DtY | Bin 0 -> 68 bytes ...gPZi_hPi23QQOZcHFtxAXzdHSBtlWZlGQ6XIjf8DtY.name | 1 + .../pU6pYJvzh5ekRiQUuhQm0w | 1 + 7 files changed, 44 insertions(+) create mode 100644 tests/example_filesystems/v2.2-xchacha-deterministic-names/2IdIAfbUzIONJq8bnXtVgg create mode 120000 tests/example_filesystems/v2.2-xchacha-deterministic-names/QCVelV3GWR6e2tG6SEivxA create mode 100644 tests/example_filesystems/v2.2-xchacha-deterministic-names/gocryptfs.conf create mode 100644 tests/example_filesystems/v2.2-xchacha-deterministic-names/gocryptfs.longname.YgPZi_hPi23QQOZcHFtxAXzdHSBtlWZlGQ6XIjf8DtY create mode 100644 tests/example_filesystems/v2.2-xchacha-deterministic-names/gocryptfs.longname.YgPZi_hPi23QQOZcHFtxAXzdHSBtlWZlGQ6XIjf8DtY.name create mode 120000 tests/example_filesystems/v2.2-xchacha-deterministic-names/pU6pYJvzh5ekRiQUuhQm0w (limited to 'tests') diff --git a/tests/example_filesystems/example_filesystems_test.go b/tests/example_filesystems/example_filesystems_test.go index 7ecae81..37820b5 100644 --- a/tests/example_filesystems/example_filesystems_test.go +++ b/tests/example_filesystems/example_filesystems_test.go @@ -426,3 +426,25 @@ func TestExampleFSv22xchacha(t *testing.T) { checkExampleFSLongnames(t, pDir) test_helpers.UnmountPanic(pDir) } + +// gocryptfs v2.2 introduced -xchacha and -deterministic-names +func TestExampleFSv22xchachaDeterministicNames(t *testing.T) { + cDir := "v2.2-xchacha-deterministic-names" + pDir := test_helpers.TmpDir + "/" + cDir + cDir = tmpFsPath + 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 + "_m" + test_helpers.MountOrFatal(t, cDir, pDir, "-xchacha", "-deterministic-names", "-masterkey", + "beba88a9-c6cd1dc0-b69c6f9d-9daea493-"+ + "9ae87082-4ffc40bf-b44e52db-3933af39", + opensslOpt) + checkExampleFSLongnames(t, pDir) + test_helpers.UnmountPanic(pDir) +} diff --git a/tests/example_filesystems/v2.2-xchacha-deterministic-names/2IdIAfbUzIONJq8bnXtVgg b/tests/example_filesystems/v2.2-xchacha-deterministic-names/2IdIAfbUzIONJq8bnXtVgg new file mode 100644 index 0000000..043bffe Binary files /dev/null and b/tests/example_filesystems/v2.2-xchacha-deterministic-names/2IdIAfbUzIONJq8bnXtVgg differ diff --git a/tests/example_filesystems/v2.2-xchacha-deterministic-names/QCVelV3GWR6e2tG6SEivxA b/tests/example_filesystems/v2.2-xchacha-deterministic-names/QCVelV3GWR6e2tG6SEivxA new file mode 120000 index 0000000..9d75e99 --- /dev/null +++ b/tests/example_filesystems/v2.2-xchacha-deterministic-names/QCVelV3GWR6e2tG6SEivxA @@ -0,0 +1 @@ +KdGr5TgxeWRuT6LF294wqzUS6gcKJpimyu8R0Y6omKeoe2VrPEX1ZeYMQLFMki9_hZI \ No newline at end of file diff --git a/tests/example_filesystems/v2.2-xchacha-deterministic-names/gocryptfs.conf b/tests/example_filesystems/v2.2-xchacha-deterministic-names/gocryptfs.conf new file mode 100644 index 0000000..d7d9f28 --- /dev/null +++ b/tests/example_filesystems/v2.2-xchacha-deterministic-names/gocryptfs.conf @@ -0,0 +1,19 @@ +{ + "Creator": "gocryptfs v2.1-27-gabaa129-dirty.xchacha", + "EncryptedKey": "XKST0+9lmTP7Vam3WpNMuF5RIp78ufCiMgV0W85Z2z46SJYKAqzTEK32wMLw+5y6S/N6tQWFlisR27gy/gBqcg==", + "ScryptObject": { + "Salt": "aD15Xe/HLWjBDvV9hwJGBsfYAHYt5DKlAzy8+flL9SE=", + "N": 1024, + "R": 8, + "P": 1, + "KeyLen": 32 + }, + "Version": 2, + "FeatureFlags": [ + "HKDF", + "XChaCha20Poly1305", + "EMENames", + "LongNames", + "Raw64" + ] +} diff --git a/tests/example_filesystems/v2.2-xchacha-deterministic-names/gocryptfs.longname.YgPZi_hPi23QQOZcHFtxAXzdHSBtlWZlGQ6XIjf8DtY b/tests/example_filesystems/v2.2-xchacha-deterministic-names/gocryptfs.longname.YgPZi_hPi23QQOZcHFtxAXzdHSBtlWZlGQ6XIjf8DtY new file mode 100644 index 0000000..a5e8089 Binary files /dev/null and b/tests/example_filesystems/v2.2-xchacha-deterministic-names/gocryptfs.longname.YgPZi_hPi23QQOZcHFtxAXzdHSBtlWZlGQ6XIjf8DtY differ diff --git a/tests/example_filesystems/v2.2-xchacha-deterministic-names/gocryptfs.longname.YgPZi_hPi23QQOZcHFtxAXzdHSBtlWZlGQ6XIjf8DtY.name b/tests/example_filesystems/v2.2-xchacha-deterministic-names/gocryptfs.longname.YgPZi_hPi23QQOZcHFtxAXzdHSBtlWZlGQ6XIjf8DtY.name new file mode 100644 index 0000000..d52a6df --- /dev/null +++ b/tests/example_filesystems/v2.2-xchacha-deterministic-names/gocryptfs.longname.YgPZi_hPi23QQOZcHFtxAXzdHSBtlWZlGQ6XIjf8DtY.name @@ -0,0 +1 @@ +lY_fhfc5U-Dy8S27eCl8IZf5MlLz8o1sMMCU6uRFRDYyN6jBvEVszHaEHrV-p2PIvrQq61mYUPcoQbR_lDAs9Pz9bGI7GD3Ws6MwyxeHLeZlwDbmLQd05Bgd5rX22ZJYyLWsTWj_sdbWxiqS7S50XZiUr5AuLSBVRijJZ5fKVlWZo59sIHCTZ2xJyEO3hg4X8oDTUb5O0CfYDWzqazE9kVtEfnv_2f24g3fmUpePnuvnx-jEpq58ZJA9opDUJxyyWrI8GmGMLcKQj0xRgLh4ESia_mCrYRhhfnPHL23PVFpH9eljAJ_BV51hSEoIReuM5WUU_httsLTJIq0iuMihDw \ No newline at end of file diff --git a/tests/example_filesystems/v2.2-xchacha-deterministic-names/pU6pYJvzh5ekRiQUuhQm0w b/tests/example_filesystems/v2.2-xchacha-deterministic-names/pU6pYJvzh5ekRiQUuhQm0w new file mode 120000 index 0000000..f1f4a96 --- /dev/null +++ b/tests/example_filesystems/v2.2-xchacha-deterministic-names/pU6pYJvzh5ekRiQUuhQm0w @@ -0,0 +1 @@ +AduJ9ttohPi2MRdZZ8SrMTN_wyxWGvQeIJb_vUgBQdXMjJKYm9sdZ49X2jX_nunJ \ No newline at end of file -- cgit v1.2.3