From d2be22a07f32d5c41223419314c9fb6b8ad2ab42 Mon Sep 17 00:00:00 2001 From: Jakob Unterwurzacher Date: Wed, 7 Jun 2017 23:08:43 +0200 Subject: cryptocore: remove lastNonce check This check would need locking to be multithreading-safe. But as it is in the fastpath, just remove it. rand.Read() already guarantees that the value is random. --- internal/cryptocore/nonce.go | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/internal/cryptocore/nonce.go b/internal/cryptocore/nonce.go index 3f56cc9..412cdbb 100644 --- a/internal/cryptocore/nonce.go +++ b/internal/cryptocore/nonce.go @@ -1,14 +1,9 @@ package cryptocore import ( - "bytes" "crypto/rand" "encoding/binary" - "encoding/hex" - "fmt" "log" - - "github.com/rfjakob/gocryptfs/internal/tlog" ) // RandBytes gets "n" random bytes from /dev/urandom or panics @@ -28,18 +23,11 @@ func RandUint64() uint64 { } type nonceGenerator struct { - lastNonce []byte - nonceLen int // bytes + nonceLen int // bytes } // Get a random "nonceLen"-byte nonce func (n *nonceGenerator) Get() []byte { nonce := RandBytes(n.nonceLen) - 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)) - log.Panic(m) - } - n.lastNonce = nonce return nonce } -- cgit v1.2.3