Forbid any later GNU GPL versions autousage

[gogost.git] / src / cypherpunks.ru / gogost / gost3410 / vko2012.go

diff --git a/src/cypherpunks.ru/gogost/gost3410/vko2012.go b/src/cypherpunks.ru/gogost/gost3410/vko2012.go
index d12b51b0255aca00ffb588fe99aab9decde7206f..836d3a4f0b3b5b1572c9327d839e7ac033ed27c9 100644 (file)
--- a/src/cypherpunks.ru/gogost/gost3410/vko2012.go
+++ b/src/cypherpunks.ru/gogost/gost3410/vko2012.go
@@ -1,10 +1,9 @@
 // GoGOST -- Pure Go GOST cryptographic functions library
-// Copyright (C) 2015-2016 Sergey Matveev <stargrave@stargrave.org>
+// Copyright (C) 2015-2019 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
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
+// the Free Software Foundation, version 3 of the License.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,7 +16,6 @@
 package gost3410
 
 import (
-       "errors"
        "math/big"
 
        "cypherpunks.ru/gogost/gost34112012256"
@@ -27,9 +25,6 @@ import (
 // RFC 7836 VKO GOST R 34.10-2012 256-bit key agreement function.
 // UKM is user keying material, also called VKO-factor.
 func (prv *PrivateKey) KEK2012256(pub *PublicKey, ukm *big.Int) ([]byte, error) {
-       if prv.mode != Mode2012 {
-               return nil, errors.New("KEK2012 can not be used in Mode2001")
-       }
        key, err := prv.KEK(pub, ukm)
        if err != nil {
                return nil, err
@@ -42,9 +37,6 @@ func (prv *PrivateKey) KEK2012256(pub *PublicKey, ukm *big.Int) ([]byte, error)
 // RFC 7836 VKO GOST R 34.10-2012 512-bit key agreement function.
 // UKM is user keying material, also called VKO-factor.
 func (prv *PrivateKey) KEK2012512(pub *PublicKey, ukm *big.Int) ([]byte, error) {
-       if prv.mode != Mode2012 {
-               return nil, errors.New("KEK2012 can not be used in Mode2001")
-       }
        key, err := prv.KEK(pub, ukm)
        if err != nil {
                return nil, err