diff options
| author | Jakob Unterwurzacher | 2016-09-25 15:05:09 +0200 |
|---|---|---|
| committer | Jakob Unterwurzacher | 2016-09-25 16:43:17 +0200 |
| commit | 2050c7f3b3822a4a3329d4ba5b146d269ef05b4d (patch) | |
| tree | 69e5639a02498e37fa4f1aa3af6f605f756f42cc /internal/configfile | |
| parent | f8da264222f7348c6b9e6dd9d372200f850d2878 (diff) | |
reverse: add gcmsiv flag and associated tests
Diffstat (limited to 'internal/configfile')
| -rw-r--r-- | internal/configfile/config_file.go | 8 | ||||
| -rw-r--r-- | internal/configfile/config_test.go | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/internal/configfile/config_file.go b/internal/configfile/config_file.go index b1504b4..32e7e66 100644 --- a/internal/configfile/config_file.go +++ b/internal/configfile/config_file.go @@ -45,7 +45,7 @@ type ConfFile struct { // CreateConfFile - create a new config with a random key encrypted with // "password" and write it to "filename". // Uses scrypt with cost parameter logN. -func CreateConfFile(filename string, password string, plaintextNames bool, logN int, creator string, reverse bool) error { +func CreateConfFile(filename string, password string, plaintextNames bool, logN int, creator string, gcmsiv bool) error { var cf ConfFile cf.filename = filename cf.Creator = creator @@ -59,7 +59,7 @@ func CreateConfFile(filename string, password string, plaintextNames bool, logN cf.EncryptKey(key, password, logN) // Set feature flags - cf.FeatureFlags = append(cf.FeatureFlags, knownFlags[FlagGCMIV128]) + cf.FeatureFlags = append(cf.FeatureFlags, knownFlags[FlagGCMIV128]) // 128-bit IVs if plaintextNames { cf.FeatureFlags = append(cf.FeatureFlags, knownFlags[FlagPlaintextNames]) } else { @@ -67,8 +67,8 @@ func CreateConfFile(filename string, password string, plaintextNames bool, logN cf.FeatureFlags = append(cf.FeatureFlags, knownFlags[FlagEMENames]) cf.FeatureFlags = append(cf.FeatureFlags, knownFlags[FlagLongNames]) } - if reverse { - cf.FeatureFlags = append(cf.FeatureFlags, knownFlags[FlagGCMSIV]) + if gcmsiv { + cf.FeatureFlags = append(cf.FeatureFlags, knownFlags[FlagGCMSIV]) // GCM-SIV encryption mode } // Write file to disk diff --git a/internal/configfile/config_test.go b/internal/configfile/config_test.go index 72c25f6..ac85c8d 100644 --- a/internal/configfile/config_test.go +++ b/internal/configfile/config_test.go @@ -71,7 +71,7 @@ func TestCreateConfFile(t *testing.T) { } -func TestCreateConfFileReverse(t *testing.T) { +func TestCreateConfFileGCMSIV(t *testing.T) { err := CreateConfFile("config_test/tmp.conf", "test", false, 10, "test", true) if err != nil { t.Fatal(err) @@ -87,7 +87,7 @@ func TestCreateConfFileReverse(t *testing.T) { func TestIsFeatureFlagKnown(t *testing.T) { // Test a few hardcoded values - testKnownFlags := []string{"DirIV", "PlaintextNames", "EMENames", "GCMIV128", "LongNames"} + testKnownFlags := []string{"DirIV", "PlaintextNames", "EMENames", "GCMIV128", "LongNames", "GCMSIV"} // And also everything in knownFlags (yes, it is likely that we end up with // some duplicates. Does not matter.) for _, f := range knownFlags { |