Raise copyright years in advance

[gogost.git] / internal / gost34112012 / hash.go

diff --git a/internal/gost34112012/hash.go b/internal/gost34112012/hash.go
index 45ec60107eb224a9f82e681557a7cbb20b15385f..4aed02f2e7db155e56e69a24a081c17a2481baac 100644 (file)
--- a/internal/gost34112012/hash.go
+++ b/internal/gost34112012/hash.go
@@ -1,5 +1,5 @@
 // GoGOST -- Pure Go GOST cryptographic functions library
-// Copyright (C) 2015-2021 Sergey Matveev <stargrave@stargrave.org>
+// Copyright (C) 2015-2024 Sergey Matveev <stargrave@stargrave.org>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@ import (
 const (
        BlockSize = 64
 
-       MarshaledName = "STREEBOG"
+       MarshalledName = "STREEBOG"
 )
 
 var (
@@ -288,16 +288,18 @@ func init() {
 }
 
 type Hash struct {
-       size   int
-       buf    []byte
-       n      uint64
-       hsh    []byte
-       chk    []byte
-       tmp    []byte
-       psBuf  []byte
-       eBuf   []byte
-       gBuf   []byte
-       addBuf []byte
+       size    int
+       buf     []byte
+       n       uint64
+       hsh     []byte
+       chk     []byte
+       tmp     []byte
+       psBuf   []byte
+       eMsgBuf []byte
+       eKBuf   []byte
+       eXorBuf []byte
+       gBuf    []byte
+       addBuf  []byte
 }
 
 // Create new hash object with specified size digest size.
@@ -306,14 +308,16 @@ func New(size int) *Hash {
                panic("size must be either 32 or 64")
        }
        h := Hash{
-               size:   size,
-               hsh:    make([]byte, BlockSize),
-               chk:    make([]byte, BlockSize),
-               tmp:    make([]byte, BlockSize),
-               psBuf:  make([]byte, BlockSize),
-               eBuf:   make([]byte, BlockSize),
-               gBuf:   make([]byte, BlockSize),
-               addBuf: make([]byte, BlockSize),
+               size:    size,
+               hsh:     make([]byte, BlockSize),
+               chk:     make([]byte, BlockSize),
+               tmp:     make([]byte, BlockSize),
+               psBuf:   make([]byte, BlockSize),
+               eMsgBuf: make([]byte, BlockSize),
+               eKBuf:   make([]byte, BlockSize),
+               eXorBuf: make([]byte, BlockSize),
+               gBuf:    make([]byte, BlockSize),
+               addBuf:  make([]byte, BlockSize),
        }
        h.Reset()
        return &h
@@ -344,8 +348,8 @@ func (h *Hash) Write(data []byte) (int, error) {
        h.buf = append(h.buf, data...)
        for len(h.buf) >= BlockSize {
                copy(h.tmp, h.buf[:BlockSize])
-               h.hsh = h.g(h.n, h.hsh, h.tmp)
-               h.chk = h.add512bit(h.chk, h.tmp)
+               copy(h.hsh, h.g(h.n, h.hsh, h.tmp))
+               copy(h.chk, h.add512bit(h.chk, h.tmp))
                h.n += BlockSize * 8
                h.buf = h.buf[BlockSize:]
        }
@@ -354,13 +358,14 @@ func (h *Hash) Write(data []byte) (int, error) {
 
 func (h *Hash) Sum(in []byte) []byte {
        buf := make([]byte, BlockSize)
+       hsh := make([]byte, BlockSize)
        copy(h.tmp, buf)
        copy(buf, h.buf)
        buf[len(h.buf)] = 1
-       hsh := h.g(h.n, h.hsh, buf)
+       copy(hsh, h.g(h.n, h.hsh, buf))
        binary.LittleEndian.PutUint64(h.tmp, h.n+uint64(len(h.buf))*8)
-       hsh = h.g(0, hsh, h.tmp)
-       hsh = h.g(0, hsh, h.add512bit(h.chk, buf))
+       copy(hsh, h.g(0, hsh, h.tmp))
+       copy(hsh, h.g(0, hsh, h.add512bit(h.chk, buf)))
        if h.size == 32 {
                return append(in, hsh[BlockSize/2:]...)
        }
@@ -377,27 +382,25 @@ func (h *Hash) add512bit(chk, data []byte) []byte {
 }
 
 func (h *Hash) g(n uint64, hsh, data []byte) []byte {
-       r := make([]byte, BlockSize)
-       copy(r, hsh)
-       r[0] ^= byte((n >> 0) & 0xFF)
-       r[1] ^= byte((n >> 8) & 0xFF)
-       r[2] ^= byte((n >> 16) & 0xFF)
-       r[3] ^= byte((n >> 24) & 0xFF)
-       r[4] ^= byte((n >> 32) & 0xFF)
-       r[5] ^= byte((n >> 40) & 0xFF)
-       r[6] ^= byte((n >> 48) & 0xFF)
-       r[7] ^= byte((n >> 56) & 0xFF)
-       return blockXor(h.gBuf, blockXor(h.gBuf, h.e(l(r, h.ps(r)), data), hsh), data)
+       out := h.gBuf
+       copy(out, hsh)
+       out[0] ^= byte((n >> 0) & 0xFF)
+       out[1] ^= byte((n >> 8) & 0xFF)
+       out[2] ^= byte((n >> 16) & 0xFF)
+       out[3] ^= byte((n >> 24) & 0xFF)
+       out[4] ^= byte((n >> 32) & 0xFF)
+       out[5] ^= byte((n >> 40) & 0xFF)
+       out[6] ^= byte((n >> 48) & 0xFF)
+       out[7] ^= byte((n >> 56) & 0xFF)
+       return blockXor(out, blockXor(out, h.e(l(out, h.ps(out)), data), hsh), data)
 }
 
 func (h *Hash) e(k, msg []byte) []byte {
-       msgBuf := make([]byte, BlockSize)
-       kBuf := make([]byte, BlockSize)
        for i := 0; i < 12; i++ {
-               msg = l(msgBuf, h.ps(blockXor(h.eBuf, k, msg)))
-               k = l(kBuf, h.ps(blockXor(h.eBuf, k, c[i][:])))
+               msg = l(h.eMsgBuf, h.ps(blockXor(h.eXorBuf, k, msg)))
+               k = l(h.eKBuf, h.ps(blockXor(h.eXorBuf, k, c[i][:])))
        }
-       return blockXor(h.eBuf, k, msg)
+       return blockXor(h.eXorBuf, k, msg)
 }
 
 func blockXor(dst, x, y []byte) []byte {
@@ -431,9 +434,9 @@ func l(out, data []byte) []byte {
 }
 
 func (h *Hash) MarshalBinary() (data []byte, err error) {
-       data = make([]byte, len(MarshaledName)+1+8+2*BlockSize+len(h.buf))
-       copy(data, []byte(MarshaledName))
-       idx := len(MarshaledName)
+       data = make([]byte, len(MarshalledName)+1+8+2*BlockSize+len(h.buf))
+       copy(data, []byte(MarshalledName))
+       idx := len(MarshalledName)
        data[idx] = byte(h.size)
        idx += 1
        binary.BigEndian.PutUint64(data[idx:idx+8], h.n)
@@ -447,14 +450,14 @@ func (h *Hash) MarshalBinary() (data []byte, err error) {
 }
 
 func (h *Hash) UnmarshalBinary(data []byte) error {
-       expectedLen := len(MarshaledName) + 1 + 8 + 2*BlockSize
+       expectedLen := len(MarshalledName) + 1 + 8 + 2*BlockSize
        if len(data) < expectedLen {
-               return fmt.Errorf("gogost/internal/gost34112012: len(data) != %d", expectedLen)
+               return fmt.Errorf("gogost/internal/gost34112012: len(data)=%d != %d", len(data), expectedLen)
        }
-       if !bytes.HasPrefix(data, []byte(MarshaledName)) {
+       if !bytes.HasPrefix(data, []byte(MarshalledName)) {
                return errors.New("gogost/internal/gost34112012: no hash name prefix")
        }
-       idx := len(MarshaledName)
+       idx := len(MarshalledName)
        h.size = int(data[idx])
        idx += 1
        h.n = binary.BigEndian.Uint64(data[idx : idx+8])