diff options
| -rw-r--r-- | cryptfs/config_file.go | 8 | ||||
| -rw-r--r-- | cryptfs/config_test.go | 2 | ||||
| -rw-r--r-- | main.go | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/cryptfs/config_file.go b/cryptfs/config_file.go index bf1f2a0..48e5474 100644 --- a/cryptfs/config_file.go +++ b/cryptfs/config_file.go @@ -33,9 +33,10 @@ 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, EMENames bool) error { +func CreateConfFile(filename string, password string, plaintextNames bool, logN int) error { var cf ConfFile cf.filename = filename + cf.Version = HEADER_CURRENT_VERSION // Generate new random master key key := RandBytes(KEY_LEN) @@ -44,10 +45,7 @@ func CreateConfFile(filename string, password string, plaintextNames bool, logN // This sets ScryptObject and EncryptedKey cf.EncryptKey(key, password, logN) - // Set defaults - cf.Version = HEADER_CURRENT_VERSION - - // Set values chosen by the user + // Set feature flags if plaintextNames { cf.FeatureFlags = append(cf.FeatureFlags, FlagPlaintextNames) } else { diff --git a/cryptfs/config_test.go b/cryptfs/config_test.go index 01c0d71..817e6ae 100644 --- a/cryptfs/config_test.go +++ b/cryptfs/config_test.go @@ -59,7 +59,7 @@ func TestLoadV2StrangeFeature(t *testing.T) { } func TestCreateConfFile(t *testing.T) { - err := CreateConfFile("config_test/tmp.conf", "test", false, 10, true) + err := CreateConfFile("config_test/tmp.conf", "test", false, 10) if err != nil { t.Fatal(err) } @@ -55,7 +55,7 @@ func initDir(args *argContainer) { // Create gocryptfs.conf cryptfs.Info.Printf("Choose a password for protecting your files.\n") password := readPasswordTwice(args.extpass) - err = cryptfs.CreateConfFile(args.config, password, args.plaintextnames, args.scryptn, args.emenames) + err = cryptfs.CreateConfFile(args.config, password, args.plaintextnames, args.scryptn) if err != nil { fmt.Println(err) os.Exit(ERREXIT_INIT) @@ -267,7 +267,7 @@ func main() { // Initialize FUSE server cryptfs.Debug.Printf("cli args: %v\n", args) srv := pathfsFrontend(masterkey, args, confFile) - cryptfs.Info.Println("Filesystem ready.") + cryptfs.Info.Println("Filesystem mounted and ready.") // We are ready - send USR1 signal to our parent if args.notifypid > 0 { sendUsr1(args.notifypid) |