Raise copyright years

[gogost.git] / gost3410 / vko2001.go

diff --git a/gost3410/vko2001.go b/gost3410/vko2001.go
index ed49d8f00fbb423f4991dc650bad9a618bd38800..7472e29cba310920e7226bd4b5ee8d5e920a3e9c 100644 (file)
--- a/gost3410/vko2001.go
+++ b/gost3410/vko2001.go
@@ -1,5 +1,5 @@
 // GoGOST -- Pure Go GOST cryptographic functions library
-// Copyright (C) 2015-2019 Sergey Matveev <stargrave@stargrave.org>
+// Copyright (C) 2015-2021 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
@@ -19,21 +19,23 @@ import (
        "errors"
        "math/big"
 
-       "go.cypherpunks.ru/gogost/v4/gost28147"
-       "go.cypherpunks.ru/gogost/v4/gost341194"
+       "go.cypherpunks.ru/gogost/v5/gost28147"
+       "go.cypherpunks.ru/gogost/v5/gost341194"
 )
 
 // RFC 4357 VKO GOST R 34.10-2001 key agreement function.
 // UKM is user keying material, also called VKO-factor.
 func (prv *PrivateKey) KEK2001(pub *PublicKey, ukm *big.Int) ([]byte, error) {
-       if prv.Mode != Mode2001 {
-               return nil, errors.New("KEK2001 can not be used in Mode2012")
+       if prv.C.PointSize() != 32 {
+               return nil, errors.New("gogost/gost3410: KEK2001 is only for 256-bit curves")
        }
        key, err := prv.KEK(pub, ukm)
        if err != nil {
                return nil, err
        }
        h := gost341194.New(&gost28147.SboxIdGostR341194CryptoProParamSet)
-       h.Write(key)
+       if _, err = h.Write(key); err != nil {
+               return nil, err
+       }
        return h.Sum(key[:0]), nil
 }