aboutsummaryrefslogtreecommitdiff
path: root/internal/configfile/config_file.go
diff options
context:
space:
mode:
Diffstat (limited to 'internal/configfile/config_file.go')
-rw-r--r--internal/configfile/config_file.go10
1 files changed, 5 insertions, 5 deletions
diff --git a/internal/configfile/config_file.go b/internal/configfile/config_file.go
index ea023d0..1753cf3 100644
--- a/internal/configfile/config_file.go
+++ b/internal/configfile/config_file.go
@@ -7,7 +7,7 @@ import (
"github.com/rfjakob/gocryptfs/internal/contentenc"
"github.com/rfjakob/gocryptfs/internal/cryptocore"
- "github.com/rfjakob/gocryptfs/internal/toggledlog"
+ "github.com/rfjakob/gocryptfs/internal/tlog"
)
import "os"
@@ -84,7 +84,7 @@ func LoadConfFile(filename string, password string) ([]byte, *ConfFile, error) {
// Unmarshal
err = json.Unmarshal(js, &cf)
if err != nil {
- toggledlog.Warn.Printf("Failed to unmarshal config file")
+ tlog.Warn.Printf("Failed to unmarshal config file")
return nil, nil, err
}
@@ -135,11 +135,11 @@ 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
+ tlog.Warn.Enabled = false // Silence DecryptBlock() error messages on incorrect password
key, err := ce.DecryptBlock(cf.EncryptedKey, 0, nil)
- toggledlog.Warn.Enabled = true
+ tlog.Warn.Enabled = true
if err != nil {
- toggledlog.Warn.Printf("failed to unlock master key: %s", err.Error())
+ tlog.Warn.Printf("failed to unlock master key: %s", err.Error())
return nil, nil, fmt.Errorf("Password incorrect.")
}