diff options
| -rw-r--r-- | internal/configfile/config_test.go | 2 | ||||
| -rw-r--r-- | internal/configfile/config_test/PlaintextNames.conf | 10 | ||||
| -rw-r--r-- | internal/configfile/config_test/StrangeFeature.conf | 11 | ||||
| -rw-r--r-- | internal/configfile/config_test/v2.conf | 15 |
4 files changed, 26 insertions, 12 deletions
diff --git a/internal/configfile/config_test.go b/internal/configfile/config_test.go index 775a616..e34a3cd 100644 --- a/internal/configfile/config_test.go +++ b/internal/configfile/config_test.go @@ -22,7 +22,7 @@ func TestLoadV1(t *testing.T) { func TestLoadV2(t *testing.T) { t1 := time.Now() - _, _, err := LoadConfFile("config_test/v2.conf", "foo") + _, _, err := LoadConfFile("config_test/v2.conf", "test") if err != nil { t.Errorf("Could not load v2 config file: %v", err) } diff --git a/internal/configfile/config_test/PlaintextNames.conf b/internal/configfile/config_test/PlaintextNames.conf index c1ff8cc..5b9f4f7 100644 --- a/internal/configfile/config_test/PlaintextNames.conf +++ b/internal/configfile/config_test/PlaintextNames.conf @@ -1,14 +1,16 @@ { - "EncryptedKey": "rG4u0argMq02V5G9Fa+gAaaHtNrj3wn7OZjP44hWOzO4yBFtn+Qn3PW4V6LMuKmGLEhyktCyWOI3K8lj", + "Creator": "gocryptfs v0.11-13-g96750a7-dirty", + "EncryptedKey": "pH6/kgPFrwkuFW/HDN/0UzwC8hLJCMm/upyEnsR1pVTfSJLL/JxfBaVCRyuZhc/S7h2PrxVSMO1xzLrk", "ScryptObject": { - "Salt": "bRjq1V63u5ML3FoTWx/GBXUhUVpTunOX3DPxS+yPjg0=", - "N": 65536, + "Salt": "Hq0BqXXeMGVGfdYE1Y/qcW+pvxJBJymRAVgPUxQiZ8Y=", + "N": 1024, "R": 8, "P": 1, "KeyLen": 32 }, "Version": 2, "FeatureFlags": [ + "GCMIV128", "PlaintextNames" ] -} +}
\ No newline at end of file diff --git a/internal/configfile/config_test/StrangeFeature.conf b/internal/configfile/config_test/StrangeFeature.conf index 6a97781..eadf168 100644 --- a/internal/configfile/config_test/StrangeFeature.conf +++ b/internal/configfile/config_test/StrangeFeature.conf @@ -1,14 +1,19 @@ { - "EncryptedKey": "rG4u0argMq02V5G9Fa+gAaaHtNrj3wn7OZjP44hWOzO4yBFtn+Qn3PW4V6LMuKmGLEhyktCyWOI3K8lj", + "Creator": "gocryptfs v0.11-13-g96750a7-dirty", + "EncryptedKey": "mfN2FITcsLE+8QlpTb3r/D5rAAqEX5mJQuU655tcdwAotUwHkrIdYiKa2BjoocctQC0grwqPyuWxB7SH", "ScryptObject": { - "Salt": "bRjq1V63u5ML3FoTWx/GBXUhUVpTunOX3DPxS+yPjg0=", - "N": 65536, + "Salt": "9G2knR016guT/AJqOKemjusYhqg+mI177Dz6a5RS7ts=", + "N": 1024, "R": 8, "P": 1, "KeyLen": 32 }, "Version": 2, "FeatureFlags": [ + "GCMIV128", + "DirIV", + "EMENames", + "LongNames", "StrangeFeatureFlag" ] } diff --git a/internal/configfile/config_test/v2.conf b/internal/configfile/config_test/v2.conf index 8ef3dcf..d1ca609 100644 --- a/internal/configfile/config_test/v2.conf +++ b/internal/configfile/config_test/v2.conf @@ -1,11 +1,18 @@ { - "EncryptedKey": "RvxJnZWKTBSU21+7xbl08xlZyNyUCkpIqlK8Z51TUrRiBhqqNPxbdk1WXMvmOf/YzZ85Xbyz+DGM+SDf", + "Creator": "gocryptfs v0.11-13-g96750a7-dirty", + "EncryptedKey": "zY06x2JS0Fi7bkZ/3DppjmWZOI6xTjQ/Bf4Nru1rUzHml+stkAtvcoHT8PpHN4eKqL73ymQ86MmdYz+1", "ScryptObject": { - "Salt": "2OrFRfdW/5SanbMXM3TMINmfMO6oYU9awG+NZ77V8E8=", + "Salt": "U5MbvyTmwhEkLqe6XxlrONzPZEf2GLFZCAIixz2Kal0=", "N": 65536, "R": 8, "P": 1, "KeyLen": 32 }, - "Version": 2 -} + "Version": 2, + "FeatureFlags": [ + "GCMIV128", + "DirIV", + "EMENames", + "LongNames" + ] +}
\ No newline at end of file |