From 3c2c3453ad7d31927a2faee02bea34388c1da830 Mon Sep 17 00:00:00 2001 From: Jakob Unterwurzacher Date: Sat, 8 Oct 2016 21:24:26 +0200 Subject: [PATCH] tests: add v1.1-aessiv example filesystem Also move the example content into "content". --- tests/example_filesystems/{ => content}/abs | 0 ...xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx} | 0 tests/example_filesystems/{ => content}/rel | 0 tests/example_filesystems/content/status.txt | 1 + .../example_filesystems_test.go | 19 ++++++++++++++++++ .../v1.1-aessiv/MA0FDdmnXpmPJtS_AcAbqQ== | Bin 0 -> 60 bytes .../v1.1-aessiv/Sjl6QXHm2IjuKwaKgJ5jig== | 1 + .../v1.1-aessiv/gocryptfs.conf | 19 ++++++++++++++++++ .../v1.1-aessiv/gocryptfs.diriv | 1 + ...hdE3C5egl47Q4C4SuPNGPGkzyxuuHCP1efYMCaGqk= | Bin 0 -> 60 bytes ...5egl47Q4C4SuPNGPGkzyxuuHCP1efYMCaGqk=.name | 1 + .../v1.1-aessiv/jCGXyJJqu4sdxRLsDQNEtA== | 1 + 12 files changed, 43 insertions(+) rename tests/example_filesystems/{ => content}/abs (100%) rename tests/example_filesystems/{status.txt => content/longname_255_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx} (100%) rename tests/example_filesystems/{ => content}/rel (100%) create mode 100644 tests/example_filesystems/content/status.txt create mode 100644 tests/example_filesystems/v1.1-aessiv/MA0FDdmnXpmPJtS_AcAbqQ== create mode 120000 tests/example_filesystems/v1.1-aessiv/Sjl6QXHm2IjuKwaKgJ5jig== create mode 100644 tests/example_filesystems/v1.1-aessiv/gocryptfs.conf create mode 100644 tests/example_filesystems/v1.1-aessiv/gocryptfs.diriv create mode 100644 tests/example_filesystems/v1.1-aessiv/gocryptfs.longname.dDhdE3C5egl47Q4C4SuPNGPGkzyxuuHCP1efYMCaGqk= create mode 100644 tests/example_filesystems/v1.1-aessiv/gocryptfs.longname.dDhdE3C5egl47Q4C4SuPNGPGkzyxuuHCP1efYMCaGqk=.name create mode 120000 tests/example_filesystems/v1.1-aessiv/jCGXyJJqu4sdxRLsDQNEtA== diff --git a/tests/example_filesystems/abs b/tests/example_filesystems/content/abs similarity index 100% rename from tests/example_filesystems/abs rename to tests/example_filesystems/content/abs diff --git a/tests/example_filesystems/status.txt b/tests/example_filesystems/content/longname_255_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx similarity index 100% rename from tests/example_filesystems/status.txt rename to tests/example_filesystems/content/longname_255_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx diff --git a/tests/example_filesystems/rel b/tests/example_filesystems/content/rel similarity index 100% rename from tests/example_filesystems/rel rename to 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 0000000000000000000000000000000000000000..6767b2a137477987199b7d4a315d493426296144 GIT binary patch literal 60 zcmV-C0K@+P0zZk(x0}QRBYo0zY|)URFfsFF>?rA522xTG{=`6acXq7Ny5AQT==nQN S54+bO`=^jGJ&auLUj#&Bt{lDq literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a5c444d4bb0da5f3679b9819b308c1791fb52b81 GIT binary patch literal 60 zcmV-C0K@+P0^`jh(Pk&eSgw7Zg3gv-VQAgHUCY2URK~qETE~1R4GzG8$BNR35H`3| S%wK4?4ZeMK7MCrxM!a={e;pP8 literal 0 HcmV?d00001 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