hardcoresushi/libgocryptfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

main: print actual error from LoadConfFile()

Browse Source 
It may not have been a "Wrong password" after all.

Also, push down disabling the warning so LoadConfFile() can
warn about things that matter.
This commit is contained in:
Jakob Unterwurzacher 2016-06-05 13:44:22 +02:00
parent f2d208c464
commit ca54b665e3
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internal/configfile/config_file.go
View File

@ -107,11 +107,12 @@ func LoadConfFile(filename string, password string) ([]byte, *ConfFile, error) {
cc := cryptocore.New(scryptHash, false, false) cc := cryptocore.New(scryptHash, false, false)
ce := contentenc.New(cc, 4096) ce := contentenc.New(cc, 4096)
toggledlog.Warn.Enabled = false // Silence DecryptBlock() error messages on incorrect password
key, err := ce.DecryptBlock(cf.EncryptedKey, 0, nil) key, err := ce.DecryptBlock(cf.EncryptedKey, 0, nil)
toggledlog.Warn.Enabled = true
if err != nil { if err != nil {
toggledlog.Warn.Printf("failed to unlock master key: %s", err.Error()) toggledlog.Warn.Printf("failed to unlock master key: %s", err.Error())
toggledlog.Warn.Printf("Password incorrect.") return nil, nil, fmt.Errorf("Password incorrect.")
return nil, nil, err
} }
return key, &cf, nil return key, &cf, nil

5
main.go
View File

@ -123,12 +123,9 @@ func loadConfig(args *argContainer) (masterkey []byte, confFile *configfile.Conf
} }
pw := readPassword(args.extpass) pw := readPassword(args.extpass)
toggledlog.Info.Printf("Decrypting master key... ") 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) masterkey, confFile, err = configfile.LoadConfFile(args.config, pw)
toggledlog.Warn.Enabled = true
if err != nil { if err != nil {
fmt.Println(err) fmt.Println(os.Stderr, colorRed+err.Error()+colorReset)
fmt.Println(colorRed + "Wrong password." + colorReset)
os.Exit(ERREXIT_LOADCONF) os.Exit(ERREXIT_LOADCONF)
} }
toggledlog.Info.Printf("done.") toggledlog.Info.Printf("done.")