diff options
Diffstat (limited to 'internal/cryptocore')
| -rw-r--r-- | internal/cryptocore/gcm_go1.4.go | 6 | ||||
| -rw-r--r-- | internal/cryptocore/nonce.go | 4 | 
2 files changed, 5 insertions, 5 deletions
| diff --git a/internal/cryptocore/gcm_go1.4.go b/internal/cryptocore/gcm_go1.4.go index aaae259..f7b77b2 100644 --- a/internal/cryptocore/gcm_go1.4.go +++ b/internal/cryptocore/gcm_go1.4.go @@ -7,7 +7,7 @@ import (  	"crypto/cipher"  	"fmt" -	"github.com/rfjakob/gocryptfs/internal/toggledlog" +	"github.com/rfjakob/gocryptfs/internal/tlog"  )  // goGCMWrapper - This wrapper makes sure gocryptfs can be compiled on Go @@ -16,8 +16,8 @@ import (  // compiled on 1.4.  func goGCMWrapper(bc cipher.Block, nonceSize int) (cipher.AEAD, error) {  	if nonceSize != 12 { -		toggledlog.Warn.Printf("128 bit GCM IVs are not supported by Go 1.4 and lower.") -		toggledlog.Warn.Printf("Please use openssl crypto or recompile using a newer Go runtime.") +		tlog.Warn.Printf("128 bit GCM IVs are not supported by Go 1.4 and lower.") +		tlog.Warn.Printf("Please use openssl crypto or recompile using a newer Go runtime.")  		return nil, fmt.Errorf("128 bit GCM IVs are not supported by Go 1.4 and lower")  	}  	return cipher.NewGCM(bc) diff --git a/internal/cryptocore/nonce.go b/internal/cryptocore/nonce.go index 72d8588..6b0c31d 100644 --- a/internal/cryptocore/nonce.go +++ b/internal/cryptocore/nonce.go @@ -7,7 +7,7 @@ import (  	"encoding/hex"  	"fmt" -	"github.com/rfjakob/gocryptfs/internal/toggledlog" +	"github.com/rfjakob/gocryptfs/internal/tlog"  )  // Get "n" random bytes from /dev/urandom or panic @@ -34,7 +34,7 @@ type nonceGenerator struct {  // Get a random "nonceLen"-byte nonce  func (n *nonceGenerator) Get() []byte {  	nonce := RandBytes(n.nonceLen) -	toggledlog.Debug.Printf("nonceGenerator.Get(): %s\n", hex.EncodeToString(nonce)) +	tlog.Debug.Printf("nonceGenerator.Get(): %s\n", hex.EncodeToString(nonce))  	if bytes.Equal(nonce, n.lastNonce) {  		m := fmt.Sprintf("Got the same nonce twice: %s. This should never happen!", hex.EncodeToString(nonce))  		panic(m) | 
