From e32d4a5aec0355453a3edccdbaf0dda19a76c94d Mon Sep 17 00:00:00 2001 From: lauener Date: Tue, 2 Apr 2024 12:55:28 +0200 Subject: [PATCH] Simplify New() --- xof/blake2xb/blake.go | 17 +++++++---------- xof/blake2xs/blake.go | 17 +++++++---------- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/xof/blake2xb/blake.go b/xof/blake2xb/blake.go index 56457198a..9fcf11cc0 100644 --- a/xof/blake2xb/blake.go +++ b/xof/blake2xb/blake.go @@ -29,18 +29,15 @@ func New(seed []byte) kyber.XOF { panic("blake2b.NewXOF should not return error: " + err.Error()) } - if seed2 != nil { - _, err := b.Write(seed2) - if err != nil { - panic("blake2b.XOF.Write should not return error: " + err.Error()) - } - - seedCopy := make([]byte, len(seed2)) - copy(seedCopy, seed2) - seed2 = seedCopy + _, err = b.Write(seed2) + if err != nil { + panic("blake2b.XOF.Write should not return error: " + err.Error()) } - return &xof{impl: b, seed: seed2} + seedCopy := make([]byte, len(seed2)) + copy(seedCopy, seed2) + + return &xof{impl: b, seed: seedCopy} } func (x *xof) Clone() kyber.XOF { diff --git a/xof/blake2xs/blake.go b/xof/blake2xs/blake.go index 419faa0e4..e246c541e 100644 --- a/xof/blake2xs/blake.go +++ b/xof/blake2xs/blake.go @@ -29,18 +29,15 @@ func New(seed []byte) kyber.XOF { panic("blake2s.NewXOF should not return error: " + err.Error()) } - if seed2 != nil { - _, err := b.Write(seed2) - if err != nil { - panic("blake2s.XOF.Write should not return error: " + err.Error()) - } - - seedCopy := make([]byte, len(seed2)) - copy(seedCopy, seed2) - seed2 = seedCopy + _, err = b.Write(seed2) + if err != nil { + panic("blake2s.XOF.Write should not return error: " + err.Error()) } - return &xof{impl: b, seed: seed2} + seedCopy := make([]byte, len(seed2)) + copy(seedCopy, seed2) + + return &xof{impl: b, seed: seedCopy} } func (x *xof) Clone() kyber.XOF {