From d615adab36bc052d2d25c22561e9fe879a8e266d Mon Sep 17 00:00:00 2001 From: Darien Raymond Date: Mon, 30 Jul 2018 20:08:50 +0200 Subject: [PATCH] optimize padding reading --- common/crypto/auth.go | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/common/crypto/auth.go b/common/crypto/auth.go index 26bdade41..4cbfeee8e 100644 --- a/common/crypto/auth.go +++ b/common/crypto/auth.go @@ -210,7 +210,7 @@ func NewAuthenticationWriter(auth Authenticator, sizeParser ChunkSizeEncoder, wr func (w *AuthenticationWriter) seal(b *buf.Buffer) (*buf.Buffer, error) { encryptedSize := int(b.Len()) + w.auth.Overhead() - paddingSize := 0 + var paddingSize int if w.padding != nil { paddingSize = int(w.padding.NextPaddingLen()) } @@ -228,13 +228,7 @@ func (w *AuthenticationWriter) seal(b *buf.Buffer) (*buf.Buffer, error) { return nil, err } if paddingSize > 0 { - if err := eb.AppendSupplier(func(bb []byte) (int, error) { - common.Must2(rand.Read(bb[:paddingSize])) - return paddingSize, nil - }); err != nil { - eb.Release() - return nil, err - } + common.Must(eb.AppendSupplier(buf.ReadFullFrom(rand.Reader, int32(paddingSize)))) } return eb, nil