X-Git-Url: http://www.git.cypherpunks.ru/?p=gogost.git;a=blobdiff_plain;f=gost3410%2Fvko2012_test.go;h=33aabd963eb9c394d12532a01154ef2f0a565d15;hp=3d23b95abb1e3a36bc66ddc8623f6b6ace689d9f;hb=7ed4c1e0857134c14ef5c03dee48c1cc7a555e98;hpb=4b8bfe9cc90778192b77d5d3eaa8a67a89e486df

diff --git a/gost3410/vko2012_test.go b/gost3410/vko2012_test.go
index 3d23b95..33aabd9 100644
--- a/gost3410/vko2012_test.go
+++ b/gost3410/vko2012_test.go
@@ -30,11 +30,11 @@ func TestVKO2012256(t *testing.T) {
 	pubRawA, _ := hex.DecodeString("aab0eda4abff21208d18799fb9a8556654ba783070eba10cb9abb253ec56dcf5d3ccba6192e464e6e5bcb6dea137792f2431f6c897eb1b3c0cc14327b1adc0a7914613a3074e363aedb204d38d3563971bd8758e878c9db11403721b48002d38461f92472d40ea92f9958c0ffa4c93756401b97f89fdbe0b5e46e4a4631cdb5a")
 	prvRawB, _ := hex.DecodeString("48c859f7b6f11585887cc05ec6ef1390cfea739b1a18c0d4662293ef63b79e3b8014070b44918590b4b996acfea4edfbbbcccc8c06edd8bf5bda92a51392d0db")
 	pubRawB, _ := hex.DecodeString("192fe183b9713a077253c72c8735de2ea42a3dbc66ea317838b65fa32523cd5efca974eda7c863f4954d1147f1f2b25c395fce1c129175e876d132e94ed5a65104883b414c9b592ec4dc84826f07d0b6d9006dda176ce48c391e3f97d102e03bb598bf132a228a45f7201aba08fc524a2d77e43a362ab022ad4028f75bde3b79")
-	pubA, _ := NewPublicKey(c, Mode2012, pubRawA)
-	pubB, _ := NewPublicKey(c, Mode2012, pubRawB)
+	pubA, _ := NewPublicKey(c, pubRawA)
+	pubB, _ := NewPublicKey(c, pubRawB)
 	kek, _ := hex.DecodeString("c9a9a77320e2cc559ed72dce6f47e2192ccea95fa648670582c054c0ef36c221")
-	prvA, _ := NewPrivateKey(c, Mode2012, prvRawA)
-	prvB, _ := NewPrivateKey(c, Mode2012, prvRawB)
+	prvA, _ := NewPrivateKey(c, prvRawA)
+	prvB, _ := NewPrivateKey(c, prvRawB)
 	kekA, _ := prvA.KEK2012256(pubB, ukm)
 	kekB, _ := prvB.KEK2012256(pubA, ukm)
 	if bytes.Compare(kekA, kekB) != 0 {
@@ -48,11 +48,11 @@ func TestVKO2012256(t *testing.T) {
 func TestRandomVKO2012256(t *testing.T) {
 	c := CurveIdtc26gost341012512paramSetA()
 	f := func(prvRaw1 [64]byte, prvRaw2 [64]byte, ukmRaw [8]byte) bool {
-		prv1, err := NewPrivateKey(c, Mode2012, prvRaw1[:])
+		prv1, err := NewPrivateKey(c, prvRaw1[:])
 		if err != nil {
 			return false
 		}
-		prv2, err := NewPrivateKey(c, Mode2012, prvRaw2[:])
+		prv2, err := NewPrivateKey(c, prvRaw2[:])
 		if err != nil {
 			return false
 		}
@@ -76,11 +76,11 @@ func TestVKO2012512(t *testing.T) {
 	pubRawA, _ := hex.DecodeString("aab0eda4abff21208d18799fb9a8556654ba783070eba10cb9abb253ec56dcf5d3ccba6192e464e6e5bcb6dea137792f2431f6c897eb1b3c0cc14327b1adc0a7914613a3074e363aedb204d38d3563971bd8758e878c9db11403721b48002d38461f92472d40ea92f9958c0ffa4c93756401b97f89fdbe0b5e46e4a4631cdb5a")
 	prvRawB, _ := hex.DecodeString("48c859f7b6f11585887cc05ec6ef1390cfea739b1a18c0d4662293ef63b79e3b8014070b44918590b4b996acfea4edfbbbcccc8c06edd8bf5bda92a51392d0db")
 	pubRawB, _ := hex.DecodeString("192fe183b9713a077253c72c8735de2ea42a3dbc66ea317838b65fa32523cd5efca974eda7c863f4954d1147f1f2b25c395fce1c129175e876d132e94ed5a65104883b414c9b592ec4dc84826f07d0b6d9006dda176ce48c391e3f97d102e03bb598bf132a228a45f7201aba08fc524a2d77e43a362ab022ad4028f75bde3b79")
-	pubA, _ := NewPublicKey(c, Mode2012, pubRawA)
-	pubB, _ := NewPublicKey(c, Mode2012, pubRawB)
+	pubA, _ := NewPublicKey(c, pubRawA)
+	pubB, _ := NewPublicKey(c, pubRawB)
 	kek, _ := hex.DecodeString("79f002a96940ce7bde3259a52e015297adaad84597a0d205b50e3e1719f97bfa7ee1d2661fa9979a5aa235b558a7e6d9f88f982dd63fc35a8ec0dd5e242d3bdf")
-	prvA, _ := NewPrivateKey(c, Mode2012, prvRawA)
-	prvB, _ := NewPrivateKey(c, Mode2012, prvRawB)
+	prvA, _ := NewPrivateKey(c, prvRawA)
+	prvB, _ := NewPrivateKey(c, prvRawB)
 	kekA, _ := prvA.KEK2012512(pubB, ukm)
 	kekB, _ := prvB.KEK2012512(pubA, ukm)
 	if bytes.Compare(kekA, kekB) != 0 {
@@ -94,11 +94,11 @@ func TestVKO2012512(t *testing.T) {
 func TestRandomVKO2012512(t *testing.T) {
 	c := CurveIdtc26gost341012512paramSetA()
 	f := func(prvRaw1 [64]byte, prvRaw2 [64]byte, ukmRaw [8]byte) bool {
-		prv1, err := NewPrivateKey(c, Mode2012, prvRaw1[:])
+		prv1, err := NewPrivateKey(c, prvRaw1[:])
 		if err != nil {
 			return false
 		}
-		prv2, err := NewPrivateKey(c, Mode2012, prvRaw2[:])
+		prv2, err := NewPrivateKey(c, prvRaw2[:])
 		if err != nil {
 			return false
 		}