Download link for 5.14.1 release

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

diff --git a/gost3410/2012_test.go b/gost3410/2012_test.go
index fa868f28378d8bc192d5189d3dedf8f4e9ba34aa..a482d2190dcd433d415018aa3120542c5f3bc3e0 100644 (file)
--- a/gost3410/2012_test.go
+++ b/gost3410/2012_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,13 +59,13 @@ 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.Compare(sign, append(s, r...)) != 0 {
+       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.Compare(sign, append(s, r...)) != 0 {
-               t.FailNow()
+       if !bytes.Equal(sign, append(s, r...)) {
+               t.Fatal(err)
        }
 }
 
@@ -326,25 +326,25 @@ 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.Compare(pub.Raw()[:64], pubX) != 0 {
+       if !bytes.Equal(pub.Raw()[:64], pubX) {
                t.FailNow()
        }
-       if bytes.Compare(pub.Raw()[64:], pubY) != 0 {
+       if !bytes.Equal(pub.Raw()[64:], 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 {
@@ -404,7 +404,7 @@ func TestSESPAKE(t *testing.T) {
                yBetaExpected  string
        }
        vectors := []vector{
-               vector{
+               {
                        curve:          CurveIdGostR34102001CryptoProAParamSet(),
                        qIndX:          "A69D51CAF1A309FA9E9B66187759B0174C274E080356F23CFCBFE84D396AD7BB",
                        qIndY:          "5D26F29ECC2E9AC0404DCF7986FA55FE94986362170F54B9616426A659786DAC",
@@ -418,7 +418,7 @@ func TestSESPAKE(t *testing.T) {
                        xBetaExpected:  "6097341C1BE388E83E7CA2DF47FAB86E2271FD942E5B7B2EB2409E49F742BC29",
                        yBetaExpected:  "C81AA48BDB4CA6FA0EF18B9788AE25FE30857AA681B3942217F9FED151BAB7D0",
                },
-               vector{
+               {
                        curve:          CurveIdGostR34102001CryptoProBParamSet(),
                        qIndX:          "3D715A874A4B17CB3B517893A9794A2B36C89D2FFC693F01EE4CC27E7F49E399",
                        qIndY:          "1C5A641FCF7CE7E87CDF8CEA38F3DB3096EACE2FAD158384B53953365F4FE7FE",
@@ -432,7 +432,7 @@ func TestSESPAKE(t *testing.T) {
                        xBetaExpected:  "33BC6F7E9C0BA10CFB2B72546C327171295508EA97F8C8BA9F890F2478AB4D6C",
                        yBetaExpected:  "75D57B396C396F492F057E9222CCC686437A2AAD464E452EF426FC8EEED1A4A6",
                },
-               vector{
+               {
                        curve:          CurveIdGostR34102001CryptoProCParamSet(),
                        qIndX:          "1E36383E43BB6CFA2917167D71B7B5DD3D6D462B43D7C64282AE67DFBEC2559D",
                        qIndY:          "137478A9F721C73932EA06B45CF72E37EB78A63F29A542E563C614650C8B6399",
@@ -446,7 +446,7 @@ func TestSESPAKE(t *testing.T) {
                        xBetaExpected:  "4B9C0AB55A938121F282F48A2CC4396EB16E7E0068B495B0C1DD4667786A3EB7",
                        yBetaExpected:  "223460AA8E09383E9DF9844C5A0F2766484738E5B30128A171B69A77D9509B96",
                },
-               vector{
+               {
                        curve:          CurveIdtc26gost341012512paramSetA(),
                        qIndX:          "2A17F8833A32795327478871B5C5E88AEFB91126C64B4B8327289BEA62559425D18198F133F400874328B220C74497CD240586CB249E158532CB8090776CD61C",
                        qIndY:          "728F0C4A73B48DA41CE928358FAD26B47A6E094E9362BAE82559F83CDDC4EC3A4676BD3707EDEAF4CD85E99695C64C241EDC622BE87DC0CF87F51F4367F723C5",
@@ -460,7 +460,7 @@ func TestSESPAKE(t *testing.T) {
                        xBetaExpected:  "238B38644E440452A99FA6B93D9FD7DA0CB83C32D3C1E3CFE5DF5C3EB0F9DB91E588DAEDC849EA2FB867AE855A21B4077353C0794716A6480995113D8C20C7AF",
                        yBetaExpected:  "B2273D5734C1897F8D15A7008B862938C8C74CA7E877423D95243EB7EBD02FD2C456CF9FC956F078A59AA86F19DD1075E5167E4ED35208718EA93161C530ED14",
                },
-               vector{
+               {
                        curve:          CurveIdtc26gost341012512paramSetB(),
                        qIndX:          "7E1FAE8285E035BEC244BEF2D0E5EBF436633CF50E55231DEA9C9CF21D4C8C33DF85D4305DE92971F0A4B4C07E00D87BDBC720EB66E49079285AAF12E0171149",
                        qIndY:          "2CC89998B875D4463805BA0D858A196592DB20AB161558FF2F4EF7A85725D20953967AE621AFDEAE89BB77C83A2528EF6FCE02F68BDA4679D7F2704947DBC408",
@@ -474,7 +474,7 @@ func TestSESPAKE(t *testing.T) {
                        xBetaExpected:  "34C0149E7BB91AE377B02573FCC48AF7BFB7B16DEB8F9CE870F384688E3241A3A868588CC0EF4364CCA67D17E3260CD82485C202ADC76F895D5DF673B1788E67",
                        yBetaExpected:  "608E944929BD643569ED5189DB871453F13333A1EAF82B2FE1BE8100E775F13DD9925BD317B63BFAF05024D4A738852332B64501195C1B2EF789E34F23DDAFC5",
                },
-               vector{
+               {
                        curve:          CurveIdtc26gost34102012256paramSetA(),
                        qIndX:          "B51ADF93A40AB15792164FAD3352F95B66369EB2A4EF5EFAE32829320363350E",
                        qIndY:          "74A358CC08593612F5955D249C96AFB7E8B0BB6D8BD2BBE491046650D822BE18",
@@ -488,7 +488,7 @@ func TestSESPAKE(t *testing.T) {
                        xBetaExpected:  "2B2D89FAB735433970564F2F28CFA1B57D640CB902BC6334A538F44155022CB2",
                        yBetaExpected:  "10EF6A82EEF1E70F942AA81D6B4CE5DEC0DDB9447512962874870E6F2849A96F",
                },
-               vector{
+               {
                        curve:          CurveIdtc26gost34102012512paramSetC(),
                        qIndX:          "489C91784E02E98F19A803ABCA319917F37689E5A18965251CE2FF4E8D8B298F5BA7470F9E0E713487F96F4A8397B3D09A270C9D367EB5E0E6561ADEEB51581D",
                        qIndY:          "684EA885ACA64EAF1B3FEE36C0852A3BE3BD8011B0EF18E203FF87028D6EB5DB2C144A0DCC71276542BFD72CA2A43FA4F4939DA66D9A60793C704A8C94E16F18",
@@ -513,38 +513,44 @@ 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.Compare(x.Bytes(), raw) != 0 {
+               if !bytes.Equal(x.Bytes(), raw) {
                        t.FailNow()
                }
                raw, _ = hex.DecodeString(vector.yExpected)
-               if bytes.Compare(y.Bytes(), raw) != 0 {
+               if !bytes.Equal(y.Bytes(), raw) {
                        t.FailNow()
                }
 
                raw, _ = hex.DecodeString(vector.alpha)
                alpha := bytes2big(raw)
                x, y, err = vector.curve.Exp(alpha, vector.curve.X, vector.curve.Y)
+               if err != nil {
+                       t.Fatal(err)
+               }
                raw, _ = hex.DecodeString(vector.xAlphaExpected)
-               if bytes.Compare(x.Bytes(), raw) != 0 {
+               if !bytes.Equal(x.Bytes(), raw) {
                        t.FailNow()
                }
                raw, _ = hex.DecodeString(vector.yAlphaExpected)
-               if bytes.Compare(y.Bytes(), raw) != 0 {
+               if !bytes.Equal(y.Bytes(), raw) {
                        t.FailNow()
                }
 
                raw, _ = hex.DecodeString(vector.beta)
                beta := bytes2big(raw)
                x, y, err = vector.curve.Exp(beta, vector.curve.X, vector.curve.Y)
+               if err != nil {
+                       t.Fatal(err)
+               }
                raw, _ = hex.DecodeString(vector.xBetaExpected)
-               if bytes.Compare(x.Bytes(), raw) != 0 {
+               if !bytes.Equal(x.Bytes(), raw) {
                        t.FailNow()
                }
                raw, _ = hex.DecodeString(vector.yBetaExpected)
-               if bytes.Compare(y.Bytes(), raw) != 0 {
+               if !bytes.Equal(y.Bytes(), raw) {
                        t.FailNow()
                }
        }
@@ -580,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)
@@ -594,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++ {