Download link for 5.14.1 release

[gogost.git] / gost3410 / 2001_test.go

diff --git a/gost3410/2001_test.go b/gost3410/2001_test.go
index e330d4e5fc9ad4e2fb5083062399a027f31fe89c..afe2d48e49d7d96a8716f2c64c401a0554fe76a0 100644 (file)
--- 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-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
@@ -59,23 +59,23 @@ func TestRFCVectors(t *testing.T) {
        }
 
        c := CurveIdGostR34102001TestParamSet()
-       prv, err := NewPrivateKey(c, Mode2001, priv)
+       prv, err := NewPrivateKey(c, priv)
        if err != nil {
-               t.FailNow()
+               t.Fatal(err)
        }
        pub, err := prv.PublicKey()
        if err != nil {
-               t.FailNow()
+               t.Fatal(err)
        }
-       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)
        if err != nil {
-               t.FailNow()
+               t.Fatal(err)
        }
        valid, err := pub.VerifyDigest(digest, ourSign)
        if err != nil || !valid {
@@ -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,9 +120,9 @@ 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()
+               b.Fatal(err)
        }
        digest := make([]byte, 32)
        rand.Read(digest)
@@ -138,19 +134,19 @@ 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()
+               b.Fatal(err)
        }
        digest := make([]byte, 32)
        rand.Read(digest)
        sign, err := prv.SignDigest(digest, rand.Reader)
        if err != nil {
-               b.FailNow()
+               b.Fatal(err)
        }
        pub, err := prv.PublicKey()
        if err != nil {
-               b.FailNow()
+               b.Fatal(err)
        }
        b.ResetTimer()
        for i := 0; i < b.N; i++ {
@@ -160,15 +156,15 @@ 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()
+               t.Fatal(err)
        }
        pub, err := prv.PublicKey()
        if err != nil {
-               t.FailNow()
+               t.Fatal(err)
        }
        digest := []byte{
                0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
@@ -178,7 +174,7 @@ func TestPrvEqualsTo1(t *testing.T) {
        }
        sign, err := prv.SignDigest(digest, rand.Reader)
        if err != nil {
-               t.FailNow()
+               t.Fatal(err)
        }
        valid, err := pub.VerifyDigest(digest, sign)
        if err != nil || !valid {