diff --git a/tests/example_filesystems/example_filesystems_test.go b/tests/example_filesystems/example_filesystems_test.go index a43d2a9..4b8b2b8 100644 --- a/tests/example_filesystems/example_filesystems_test.go +++ b/tests/example_filesystems/example_filesystems_test.go @@ -226,3 +226,24 @@ func TestExampleFSv11reversePlaintextnames(t *testing.T) { test_helpers.UnmountPanic(dirC) test_helpers.UnmountPanic(dirB) } + +// gocryptfs v1.3 introduced HKDF +func TestExampleFSv13(t *testing.T) { + cDir := "v1.3" + 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", + "eaf371c3-f9a55336-8819f22b-7bccd7c2-a738cf61-7261c658-14c28a03-9428992b", + "-aessiv", opensslOpt) + checkExampleFSLongnames(t, pDir) + test_helpers.UnmountPanic(pDir) + */ +} diff --git a/tests/example_filesystems/v1.3/QcgCeorWnF7I_noMeo6K-Q b/tests/example_filesystems/v1.3/QcgCeorWnF7I_noMeo6K-Q new file mode 100644 index 0000000..666c1b9 Binary files /dev/null and b/tests/example_filesystems/v1.3/QcgCeorWnF7I_noMeo6K-Q differ diff --git a/tests/example_filesystems/v1.3/WxU6ZeEPEFVBGNZko7LPGA b/tests/example_filesystems/v1.3/WxU6ZeEPEFVBGNZko7LPGA new file mode 120000 index 0000000..f3ebc5e --- /dev/null +++ b/tests/example_filesystems/v1.3/WxU6ZeEPEFVBGNZko7LPGA @@ -0,0 +1 @@ +UwLqHBQ8wn2TtxECb7D44WoT_zsk4y_OUjBhrboYjVwc_st8tPX0jg \ No newline at end of file diff --git a/tests/example_filesystems/v1.3/ZrAj9K21B20StwGO2pjERg b/tests/example_filesystems/v1.3/ZrAj9K21B20StwGO2pjERg new file mode 120000 index 0000000..fb4ea39 --- /dev/null +++ b/tests/example_filesystems/v1.3/ZrAj9K21B20StwGO2pjERg @@ -0,0 +1 @@ +6MMwNmTI01yd9FmF60rt-AYDd9hr_-aZSICYKhxAhGaoYZUQiVraaRip \ No newline at end of file diff --git a/tests/example_filesystems/v1.3/gocryptfs.conf b/tests/example_filesystems/v1.3/gocryptfs.conf new file mode 100644 index 0000000..dcb446c --- /dev/null +++ b/tests/example_filesystems/v1.3/gocryptfs.conf @@ -0,0 +1,20 @@ +{ + "Creator": "gocryptfs v1.2.1-17-g5b54577-dirty", + "EncryptedKey": "dfneWTRGfme/SnCcuBmQ4WBbcU3V2HvZKpp6JMafFYEvrfs6+8QQM6iY1zAuctKvAp//IcfGFmNS2YYG+xkfEA==", + "ScryptObject": { + "Salt": "fHYTB0o+D9sTm2sIpNih1maN3SdGfM08al3WBhVNQ78=", + "N": 1024, + "R": 8, + "P": 1, + "KeyLen": 32 + }, + "Version": 2, + "FeatureFlags": [ + "GCMIV128", + "DirIV", + "EMENames", + "LongNames", + "Raw64", + "HKDF" + ] +} diff --git a/tests/example_filesystems/v1.3/gocryptfs.diriv b/tests/example_filesystems/v1.3/gocryptfs.diriv new file mode 100644 index 0000000..5ef76e0 --- /dev/null +++ b/tests/example_filesystems/v1.3/gocryptfs.diriv @@ -0,0 +1 @@ +;1c‰¡übú »÷…G"w \ No newline at end of file diff --git a/tests/example_filesystems/v1.3/gocryptfs.longname.U-3R657d236Aq17_QJq8BnSEkc5OUnSC01Z5rPDOICo b/tests/example_filesystems/v1.3/gocryptfs.longname.U-3R657d236Aq17_QJq8BnSEkc5OUnSC01Z5rPDOICo new file mode 100644 index 0000000..8ed6884 Binary files /dev/null and b/tests/example_filesystems/v1.3/gocryptfs.longname.U-3R657d236Aq17_QJq8BnSEkc5OUnSC01Z5rPDOICo differ diff --git a/tests/example_filesystems/v1.3/gocryptfs.longname.U-3R657d236Aq17_QJq8BnSEkc5OUnSC01Z5rPDOICo.name b/tests/example_filesystems/v1.3/gocryptfs.longname.U-3R657d236Aq17_QJq8BnSEkc5OUnSC01Z5rPDOICo.name new file mode 100644 index 0000000..477e442 --- /dev/null +++ b/tests/example_filesystems/v1.3/gocryptfs.longname.U-3R657d236Aq17_QJq8BnSEkc5OUnSC01Z5rPDOICo.name @@ -0,0 +1 @@ +oGplYtEMq6lIULihgghjAqWgwYd9E0oZ0PmYoSiGRAjjjQr3YpMWKEkC9zTnLPF1w8DuERO43QBD6LCqhsjuxeAmkZovYDbTS0O4plCWufTLpgxMuLJb_hu_vsi9vex8CmKDzcbGrkgzCuyVDjYb6hCuqxpxAXsgQlqgCkWg2e4N_O2UWvoBpz4rmvnvxr7mpIo6SBkBsSJGluRswsg__aqGa-heLn4hwTPapt8Xk441ka_mPwC9gnUHVgJJ6H9gg5TEi883PuG0S9OC5h_9ZcgHVjyxw7xg4CUpEeKpoGpqvkRHNqO4jvTXewNBevQ4JBhT0lRrxdSwa5DWu_G7jw \ No newline at end of file