X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=gost3410%2F2001_test.go;h=50712b40e98309e9db2e72bfcb4394c97e75244a;hb=285c03431192ff6ffbfa7470652fd545f06e0b00;hp=e330d4e5fc9ad4e2fb5083062399a027f31fe89c;hpb=c40d1e5634cf6d540d908a57423f4b504e39f186;p=gogost.git

diff --git a/gost3410/2001_test.go b/gost3410/2001_test.go
index e330d4e..50712b4 100644
--- a/gost3410/2001_test.go
+++ b/gost3410/2001_test.go
@@ -1,5 +1,5 @@
 // GoGOST -- Pure Go GOST cryptographic functions library
-// Copyright (C) 2015-2020 Sergey Matveev <stargrave@stargrave.org>
+// Copyright (C) 2015-2023 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
@@ -59,7 +59,7 @@ func TestRFCVectors(t *testing.T) {
 	}
 
 	c := CurveIdGostR34102001TestParamSet()
-	prv, err := NewPrivateKey(c, Mode2001, priv)
+	prv, err := NewPrivateKey(c, priv)
 	if err != nil {
 		t.FailNow()
 	}
@@ -67,10 +67,10 @@ func TestRFCVectors(t *testing.T) {
 	if err != nil {
 		t.FailNow()
 	}
-	if bytes.Compare(pub.Raw()[:32], pubX) != 0 {
+	if !bytes.Equal(pub.Raw()[:32], pubX) {
 		t.FailNow()
 	}
-	if bytes.Compare(pub.Raw()[32:], pubY) != 0 {
+	if !bytes.Equal(pub.Raw()[32:], pubY) {
 		t.FailNow()
 	}
 	ourSign, err := prv.SignDigest(digest, rand.Reader)
@@ -90,11 +90,7 @@ func TestRFCVectors(t *testing.T) {
 func TestRandom2001(t *testing.T) {
 	c := CurveIdGostR34102001TestParamSet()
 	f := func(data [31]byte, digest [32]byte) bool {
-		prv, err := NewPrivateKey(
-			c,
-			Mode2001,
-			append([]byte{0xde}, data[:]...),
-		)
+		prv, err := NewPrivateKey(c, append([]byte{0xde}, data[:]...))
 		if err != nil {
 			return false
 		}
@@ -103,7 +99,7 @@ func TestRandom2001(t *testing.T) {
 			return false
 		}
 		pubRaw := pub.Raw()
-		pub, err = NewPublicKey(c, Mode2001, pubRaw)
+		pub, err = NewPublicKey(c, pubRaw)
 		if err != nil {
 			return false
 		}
@@ -124,7 +120,7 @@ func TestRandom2001(t *testing.T) {
 
 func BenchmarkSign2001(b *testing.B) {
 	c := CurveIdGostR34102001TestParamSet()
-	prv, err := GenPrivateKey(c, Mode2001, rand.Reader)
+	prv, err := GenPrivateKey(c, rand.Reader)
 	if err != nil {
 		b.FailNow()
 	}
@@ -138,7 +134,7 @@ func BenchmarkSign2001(b *testing.B) {
 
 func BenchmarkVerify2001(b *testing.B) {
 	c := CurveIdGostR34102001TestParamSet()
-	prv, err := GenPrivateKey(c, Mode2001, rand.Reader)
+	prv, err := GenPrivateKey(c, rand.Reader)
 	if err != nil {
 		b.FailNow()
 	}
@@ -160,9 +156,9 @@ func BenchmarkVerify2001(b *testing.B) {
 
 func TestPrvEqualsTo1(t *testing.T) {
 	c := CurveIdGostR34102001TestParamSet()
-	prvRaw := make([]byte, int(Mode2001))
+	prvRaw := make([]byte, 32)
 	prvRaw[len(prvRaw)-1] = 1
-	prv, err := NewPrivateKey(c, Mode2001, prvRaw)
+	prv, err := NewPrivateKey(c, prvRaw)
 	if err != nil {
 		t.FailNow()
 	}