diff options
| -rw-r--r-- | init_dir.go | 2 | ||||
| -rw-r--r-- | internal/configfile/config_file.go | 6 | ||||
| -rw-r--r-- | internal/configfile/config_test.go | 24 |
3 files changed, 10 insertions, 22 deletions
diff --git a/init_dir.go b/init_dir.go index bf6740e..7b1dc7b 100644 --- a/init_dir.go +++ b/init_dir.go @@ -38,7 +38,7 @@ func initDir(args *argContainer) { password := readpassword.Twice(args.extpass) readpassword.CheckTrailingGarbage() creator := tlog.ProgramName + " " + GitVersion - err = configfile.CreateConfFile(args.config, password, args.plaintextnames, args.scryptn, creator, args.aessiv, args.raw64) + err = configfile.CreateConfFile(args.config, password, args.plaintextnames, args.scryptn, creator, args.aessiv) if err != nil { tlog.Fatal.Println(err) os.Exit(ErrExitInit) diff --git a/internal/configfile/config_file.go b/internal/configfile/config_file.go index d28b1d4..5bb021c 100644 --- a/internal/configfile/config_file.go +++ b/internal/configfile/config_file.go @@ -50,7 +50,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, aessiv bool, raw64 bool) error { +func CreateConfFile(filename string, password string, plaintextNames bool, logN int, creator string, aessiv bool) error { var cf ConfFile cf.filename = filename cf.Creator = creator @@ -71,9 +71,7 @@ func CreateConfFile(filename string, password string, plaintextNames bool, logN cf.FeatureFlags = append(cf.FeatureFlags, knownFlags[FlagDirIV]) cf.FeatureFlags = append(cf.FeatureFlags, knownFlags[FlagEMENames]) cf.FeatureFlags = append(cf.FeatureFlags, knownFlags[FlagLongNames]) - if raw64 { - cf.FeatureFlags = append(cf.FeatureFlags, knownFlags[FlagRaw64]) - } + cf.FeatureFlags = append(cf.FeatureFlags, knownFlags[FlagRaw64]) } if aessiv { cf.FeatureFlags = append(cf.FeatureFlags, knownFlags[FlagAESSIV]) diff --git a/internal/configfile/config_test.go b/internal/configfile/config_test.go index 5a16533..7899dac 100644 --- a/internal/configfile/config_test.go +++ b/internal/configfile/config_test.go @@ -60,18 +60,22 @@ func TestLoadV2StrangeFeature(t *testing.T) { } func TestCreateConfFile(t *testing.T) { - err := CreateConfFile("config_test/tmp.conf", "test", false, 10, "test", false, false) + err := CreateConfFile("config_test/tmp.conf", "test", false, 10, "test", false) if err != nil { t.Fatal(err) } - _, _, err = LoadConfFile("config_test/tmp.conf", "test") + _, c, err := LoadConfFile("config_test/tmp.conf", "test") if err != nil { t.Fatal(err) } + // Raw64 is set by default since gocryptfs v1.3 + if !c.IsFeatureFlagSet(FlagRaw64) { + t.Error("FlagRaw64 flag should be set but is not") + } } func TestCreateConfFileAESSIV(t *testing.T) { - err := CreateConfFile("config_test/tmp.conf", "test", false, 10, "test", true, false) + err := CreateConfFile("config_test/tmp.conf", "test", false, 10, "test", true) if err != nil { t.Fatal(err) } @@ -84,20 +88,6 @@ func TestCreateConfFileAESSIV(t *testing.T) { } } -func TestCreateConfFileRaw64(t *testing.T) { - err := CreateConfFile("config_test/tmp.conf", "test", false, 10, "test", false, true) - if err != nil { - t.Fatal(err) - } - _, c, err := LoadConfFile("config_test/tmp.conf", "test") - if err != nil { - t.Fatal(err) - } - if !c.IsFeatureFlagSet(FlagRaw64) { - t.Error("FlagRaw64 flag should be set but is not") - } -} - func TestIsFeatureFlagKnown(t *testing.T) { // Test a few hardcoded values testKnownFlags := []string{"DirIV", "PlaintextNames", "EMENames", "GCMIV128", "LongNames", "AESSIV"} |