diff options
Diffstat (limited to 'internal/configfile')
| -rw-r--r-- | internal/configfile/config_file.go | 10 | ||||
| -rw-r--r-- | internal/configfile/config_test.go | 4 | ||||
| -rw-r--r-- | internal/configfile/kdf.go | 4 | 
3 files changed, 9 insertions, 9 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.")  	} diff --git a/internal/configfile/config_test.go b/internal/configfile/config_test.go index d0540c3..775a616 100644 --- a/internal/configfile/config_test.go +++ b/internal/configfile/config_test.go @@ -5,7 +5,7 @@ import (  	"testing"  	"time" -	"github.com/rfjakob/gocryptfs/internal/toggledlog" +	"github.com/rfjakob/gocryptfs/internal/tlog"  )  func TestLoadV1(t *testing.T) { @@ -35,7 +35,7 @@ func TestLoadV2(t *testing.T) {  func TestLoadV2PwdError(t *testing.T) {  	if !testing.Verbose() { -		toggledlog.Warn.Enabled = false +		tlog.Warn.Enabled = false  	}  	_, _, err := LoadConfFile("config_test/v2.conf", "wrongpassword")  	if err == nil { diff --git a/internal/configfile/kdf.go b/internal/configfile/kdf.go index e77a743..ca87975 100644 --- a/internal/configfile/kdf.go +++ b/internal/configfile/kdf.go @@ -8,7 +8,7 @@ import (  	"golang.org/x/crypto/scrypt"  	"github.com/rfjakob/gocryptfs/internal/cryptocore" -	"github.com/rfjakob/gocryptfs/internal/toggledlog" +	"github.com/rfjakob/gocryptfs/internal/tlog"  )  const ( @@ -32,7 +32,7 @@ func NewScryptKdf(logN int) scryptKdf {  		s.N = 1 << ScryptDefaultLogN  	} else {  		if logN < 10 { -			toggledlog.Fatal.Println("Error: scryptn below 10 is too low to make sense. Aborting.") +			tlog.Fatal.Println("Error: scryptn below 10 is too low to make sense. Aborting.")  			os.Exit(1)  		}  		s.N = 1 << uint32(logN) | 
