From 248155eea0518dcdc283f7712e2c4828a6383b80 Mon Sep 17 00:00:00 2001 From: 19byte <87568744+19byte@users.noreply.github.com> Date: Mon, 4 Mar 2024 19:33:10 +0800 Subject: [PATCH] rand.read > io.readFull --- signer/storage/aes_gcm_storage.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/signer/storage/aes_gcm_storage.go b/signer/storage/aes_gcm_storage.go index 913a5f0091..39eedd88fd 100644 --- a/signer/storage/aes_gcm_storage.go +++ b/signer/storage/aes_gcm_storage.go @@ -159,9 +159,9 @@ func (s *AESEncryptedStorage) writeEncryptedStorage(creds map[string]storedCrede return nil } -func randBytes(size int) (blk []byte, err error) { - blk = make([]byte, size) - _, err = rand.Read(blk) +func (s *AESEncryptedStorage) randBytes() (nonce []byte, err error) { + nonce = make([]byte, s.gcmNS) + _, err = io.ReadFull(rand.Reader, nonce) return } @@ -173,7 +173,7 @@ func (s *AESEncryptedStorage) encrypt(plaintext []byte, additionalData []byte) ( // key because of the risk of a repeat. var n []byte - if n, err = randBytes(s.gcmNS); err != nil { + if n, err = s.randBytes(); err != nil { return } return append(n, s.gcm.Seal(nil, n, plaintext, additionalData)...), n, nil