diff options
| -rw-r--r-- | internal/configfile/config_file.go | 5 | ||||
| -rw-r--r-- | main.go | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/internal/configfile/config_file.go b/internal/configfile/config_file.go index 6ed49d9..006f6fe 100644 --- a/internal/configfile/config_file.go +++ b/internal/configfile/config_file.go @@ -107,11 +107,12 @@ func LoadConfFile(filename string, password string) ([]byte, *ConfFile, error) { cc := cryptocore.New(scryptHash, false, false) ce := contentenc.New(cc, 4096) + toggledlog.Warn.Enabled = false // Silence DecryptBlock() error messages on incorrect password key, err := ce.DecryptBlock(cf.EncryptedKey, 0, nil) + toggledlog.Warn.Enabled = true if err != nil { toggledlog.Warn.Printf("failed to unlock master key: %s", err.Error()) - toggledlog.Warn.Printf("Password incorrect.") - return nil, nil, err + return nil, nil, fmt.Errorf("Password incorrect.") } return key, &cf, nil @@ -123,12 +123,9 @@ func loadConfig(args *argContainer) (masterkey []byte, confFile *configfile.Conf } pw := readPassword(args.extpass) toggledlog.Info.Printf("Decrypting master key... ") - toggledlog.Warn.Enabled = false // Silence DecryptBlock() error messages on incorrect password masterkey, confFile, err = configfile.LoadConfFile(args.config, pw) - toggledlog.Warn.Enabled = true if err != nil { - fmt.Println(err) - fmt.Println(colorRed + "Wrong password." + colorReset) + fmt.Println(os.Stderr, colorRed+err.Error()+colorReset) os.Exit(ERREXIT_LOADCONF) } toggledlog.Info.Printf("done.") |