From ff37b11bcc4673a97d61be0ba6026e213de2223b Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Mon, 7 Aug 2023 14:44:44 +0300 Subject: [PATCH] Do not hide error --- gost3410/2001_test.go | 20 ++++++++++---------- gost3410/2012_test.go | 34 +++++++++++++++++----------------- gost3410/private_test.go | 2 +- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/gost3410/2001_test.go b/gost3410/2001_test.go index 50712b4..9dc242f 100644 --- a/gost3410/2001_test.go +++ b/gost3410/2001_test.go @@ -61,11 +61,11 @@ func TestRFCVectors(t *testing.T) { c := CurveIdGostR34102001TestParamSet() 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.Equal(pub.Raw()[:32], pubX) { t.FailNow() @@ -75,7 +75,7 @@ func TestRFCVectors(t *testing.T) { } 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 { @@ -122,7 +122,7 @@ func BenchmarkSign2001(b *testing.B) { c := CurveIdGostR34102001TestParamSet() prv, err := GenPrivateKey(c, rand.Reader) if err != nil { - b.FailNow() + b.Fatal(err) } digest := make([]byte, 32) rand.Read(digest) @@ -136,17 +136,17 @@ func BenchmarkVerify2001(b *testing.B) { c := CurveIdGostR34102001TestParamSet() 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,11 +160,11 @@ func TestPrvEqualsTo1(t *testing.T) { prvRaw[len(prvRaw)-1] = 1 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, @@ -174,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 { diff --git a/gost3410/2012_test.go b/gost3410/2012_test.go index 28be7d8..fe32d70 100644 --- a/gost3410/2012_test.go +++ b/gost3410/2012_test.go @@ -59,11 +59,11 @@ func TestStdVector1(t *testing.T) { reverse(prvRaw) prv, err := NewPrivateKey(CurveIdGostR34102001TestParamSet(), prvRaw) if err != nil { - t.FailNow() + t.Fatal(err) } sign, err := prv.SignDigest(dgst, bytes.NewBuffer(rnd)) if err != nil { - t.FailNow() + t.Fatal(err) } if !bytes.Equal(sign, append(s, r...)) { t.FailNow() @@ -129,7 +129,7 @@ func TestStdVector2(t *testing.T) { nil, ) if err != nil { - t.FailNow() + t.Fatal(err) } prvRaw := []byte{ 0x0B, 0xA6, 0x04, 0x8A, 0xAD, 0xAE, 0x24, 0x1B, @@ -184,14 +184,14 @@ func TestStdVector2(t *testing.T) { reverse(prvRaw) prv, err := NewPrivateKey(c, prvRaw) if err != nil { - t.FailNow() + t.Fatal(err) } sign, err := prv.SignDigest(dgst, bytes.NewBuffer(rnd)) if err != nil { - t.FailNow() + t.Fatal(err) } if !bytes.Equal(sign, append(s, r...)) { - t.FailNow() + t.Fatal(err) } } @@ -326,15 +326,15 @@ func TestGCL3Vectors(t *testing.T) { nil, ) if err != nil { - t.FailNow() + t.Fatal(err) } 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.Equal(pub.Raw()[:64], pubX) { t.FailNow() @@ -344,7 +344,7 @@ func TestGCL3Vectors(t *testing.T) { } 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 { @@ -513,7 +513,7 @@ func TestSESPAKE(t *testing.T) { f := bytes2big(raw) x, y, err := vector.curve.Exp(f, qIndX, qIndY) if err != nil { - t.FailNow() + t.Fatal(err) } raw, _ = hex.DecodeString(vector.xExpected) if !bytes.Equal(x.Bytes(), raw) { @@ -528,7 +528,7 @@ func TestSESPAKE(t *testing.T) { alpha := bytes2big(raw) x, y, err = vector.curve.Exp(alpha, vector.curve.X, vector.curve.Y) if err != nil { - t.FailNow() + t.Fatal(err) } raw, _ = hex.DecodeString(vector.xAlphaExpected) if !bytes.Equal(x.Bytes(), raw) { @@ -543,7 +543,7 @@ func TestSESPAKE(t *testing.T) { beta := bytes2big(raw) x, y, err = vector.curve.Exp(beta, vector.curve.X, vector.curve.Y) if err != nil { - t.FailNow() + t.Fatal(err) } raw, _ = hex.DecodeString(vector.xBetaExpected) if !bytes.Equal(x.Bytes(), raw) { @@ -586,7 +586,7 @@ func BenchmarkSign2012(b *testing.B) { c := CurveIdtc26gost341012512paramSetA() prv, err := GenPrivateKey(c, rand.Reader) if err != nil { - b.FailNow() + b.Fatal(err) } digest := make([]byte, 64) rand.Read(digest) @@ -600,17 +600,17 @@ func BenchmarkVerify2012(b *testing.B) { c := CurveIdtc26gost341012512paramSetA() prv, err := GenPrivateKey(c, rand.Reader) if err != nil { - b.FailNow() + b.Fatal(err) } digest := make([]byte, 64) 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++ { diff --git a/gost3410/private_test.go b/gost3410/private_test.go index ecb2659..924cad8 100644 --- a/gost3410/private_test.go +++ b/gost3410/private_test.go @@ -26,7 +26,7 @@ func TestSignerInterface(t *testing.T) { rand.Read(prvRaw) prv, err := NewPrivateKey(CurveIdGostR34102001TestParamSet(), prvRaw) if err != nil { - t.FailNow() + t.Fatal(err) } var _ crypto.Signer = prv } -- 2.44.0