Use numbers instead of encoded binaries in gost3410.NewCurve

diff --git a/src/cypherpunks.ru/gogost/gost3410/2012_test.go b/src/cypherpunks.ru/gogost/gost3410/2012_test.go
index 1814691ae210b09e33ef77f10dcb0fb1f0b4a3bc..cbccee63bade8fb37a2c7605848651b68d81c8db 100644 (file)
--- a/src/cypherpunks.ru/gogost/gost3410/2012_test.go
+++ b/src/cypherpunks.ru/gogost/gost3410/2012_test.go
@@ -142,7 +142,14 @@ func TestGCL3Vectors(t *testing.T) {
                0x60, 0xC9, 0x3B, 0xCB, 0xCD, 0x9C, 0x5C, 0x33,
                0x17, 0xE1, 0x93, 0x44, 0xE1, 0x73, 0xAE, 0x36,
        }
-       c, err := NewCurve(p, q, a, b, x, y)
+       c, err := NewCurve(
+               bytes2big(p),
+               bytes2big(q),
+               bytes2big(a),
+               bytes2big(b),
+               bytes2big(x),
+               bytes2big(y),
+       )
        if err != nil {
                t.FailNow()
        }

diff --git a/src/cypherpunks.ru/gogost/gost3410/curve.go b/src/cypherpunks.ru/gogost/gost3410/curve.go
index 0ad10c9ff747dcc4d3b3b5087f735d4bf2ee98a8..b25131636f3605fdea75c2adeef6dfc3a88219ea 100644 (file)
--- a/src/cypherpunks.ru/gogost/gost3410/curve.go
+++ b/src/cypherpunks.ru/gogost/gost3410/curve.go
@@ -46,14 +46,14 @@ type Curve struct {
        ty *big.Int
 }
 
-func NewCurve(p, q, a, b, bx, by []byte) (*Curve, error) {
+func NewCurve(p, q, a, b, x, y *big.Int) (*Curve, error) {
        c := Curve{
-               P:  bytes2big(p[:]),
-               Q:  bytes2big(q[:]),
-               A:  bytes2big(a[:]),
-               B:  bytes2big(b[:]),
-               Bx: bytes2big(bx[:]),
-               By: bytes2big(by[:]),
+               P:  p,
+               Q:  q,
+               A:  a,
+               B:  b,
+               X:  x,
+               Y:  y,
                t:  big.NewInt(0),
                tx: big.NewInt(0),
                ty: big.NewInt(0),

diff --git a/src/cypherpunks.ru/gogost/gost3410/params.go b/src/cypherpunks.ru/gogost/gost3410/params.go
index be1a82c0293ac7b868dad79b2f95e7caaf210c5b..dbf3040de980edb13b8da32824fec761ab5aad26 100644 (file)
--- a/src/cypherpunks.ru/gogost/gost3410/params.go
+++ b/src/cypherpunks.ru/gogost/gost3410/params.go
@@ -24,42 +24,42 @@ var (
 
        CurveGostR34102001ParamSetcc func() *Curve = func() *Curve {
                curve, err := NewCurve(
-                       []byte{
+                       bytes2big([]byte{
                                0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xC7,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0x5f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
                                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
                                0x60, 0x61, 0x17, 0xa2, 0xf4, 0xbd, 0xe4, 0x28,
                                0xb7, 0x45, 0x8a, 0x54, 0xb6, 0xe8, 0x7b, 0x85,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xc4,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0x2d, 0x06, 0xB4, 0x26, 0x5e, 0xbc, 0x74, 0x9f,
                                0xf7, 0xd0, 0xf1, 0xf1, 0xf8, 0x82, 0x32, 0xe8,
                                0x16, 0x32, 0xe9, 0x08, 0x8f, 0xd4, 0x4b, 0x77,
                                0x87, 0xd5, 0xe4, 0x07, 0xe9, 0x55, 0x08, 0x0c,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0xa2, 0x0e, 0x03, 0x4b, 0xf8, 0x81, 0x3e, 0xf5,
                                0xc1, 0x8d, 0x01, 0x10, 0x5e, 0x72, 0x6a, 0x17,
                                0xeb, 0x24, 0x8b, 0x26, 0x4a, 0xe9, 0x70, 0x6f,
                                0x44, 0x0b, 0xed, 0xc8, 0xcc, 0xb6, 0xb2, 0x2c,
-                       },
+                       }),
                )
                if err != nil {
                        panic(err)
@@ -69,42 +69,42 @@ var (
        // id-GostR3410-2001-TestParamSet
        CurveIdGostR34102001TestParamSet func() *Curve = func() *Curve {
                curve, err := NewCurve(
-                       []byte{
+                       bytes2big([]byte{
                                0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x31,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
                                0x50, 0xFE, 0x8A, 0x18, 0x92, 0x97, 0x61, 0x54,
                                0xC5, 0x9C, 0xFC, 0x19, 0x3A, 0xCC, 0xF5, 0xB3,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0x5F, 0xBF, 0xF4, 0x98, 0xAA, 0x93, 0x8C, 0xE7,
                                0x39, 0xB8, 0xE0, 0x22, 0xFB, 0xAF, 0xEF, 0x40,
                                0x56, 0x3F, 0x6E, 0x6A, 0x34, 0x72, 0xFC, 0x2A,
                                0x51, 0x4C, 0x0C, 0xE9, 0xDA, 0xE2, 0x3B, 0x7E,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0x08, 0xE2, 0xA8, 0xA0, 0xE6, 0x51, 0x47, 0xD4,
                                0xBD, 0x63, 0x16, 0x03, 0x0E, 0x16, 0xD1, 0x9C,
                                0x85, 0xC9, 0x7F, 0x0A, 0x9C, 0xA2, 0x67, 0x12,
                                0x2B, 0x96, 0xAB, 0xBC, 0xEA, 0x7E, 0x8F, 0xC8,
-                       },
+                       }),
                )
                if err != nil {
                        panic(err)
@@ -114,42 +114,42 @@ var (
        // id-GostR3410-2001-CryptoPro-A-ParamSet
        CurveIdGostR34102001CryptoProAParamSet func() *Curve = func() *Curve {
                curve, err := NewCurve(
-                       []byte{
+                       bytes2big([]byte{
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0x97,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
                                0x6C, 0x61, 0x10, 0x70, 0x99, 0x5A, 0xD1, 0x00,
                                0x45, 0x84, 0x1B, 0x09, 0xB7, 0x61, 0xB8, 0x93,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0x94,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa6,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0x8D, 0x91, 0xE4, 0x71, 0xE0, 0x98, 0x9C, 0xDA,
                                0x27, 0xDF, 0x50, 0x5A, 0x45, 0x3F, 0x2B, 0x76,
                                0x35, 0x29, 0x4F, 0x2D, 0xDF, 0x23, 0xE3, 0xB1,
                                0x22, 0xAC, 0xC9, 0x9C, 0x9E, 0x9F, 0x1E, 0x14,
-                       },
+                       }),
                )
                if err != nil {
                        panic(err)
@@ -159,42 +159,42 @@ var (
        // id-GostR3410-2001-CryptoPro-B-ParamSet
        CurveIdGostR34102001CryptoProBParamSet func() *Curve = func() *Curve {
                curve, err := NewCurve(
-                       []byte{
+                       bytes2big([]byte{
                                0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x99,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
                                0x5F, 0x70, 0x0C, 0xFF, 0xF1, 0xA6, 0x24, 0xE5,
                                0xE4, 0x97, 0x16, 0x1B, 0xCC, 0x8A, 0x19, 0x8F,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x96,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0x3E, 0x1A, 0xF4, 0x19, 0xA2, 0x69, 0xA5, 0xF8,
                                0x66, 0xA7, 0xD3, 0xC2, 0x5C, 0x3D, 0xF8, 0x0A,
                                0xE9, 0x79, 0x25, 0x93, 0x73, 0xFF, 0x2B, 0x18,
                                0x2F, 0x49, 0xD4, 0xCE, 0x7E, 0x1B, 0xBC, 0x8B,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0x3F, 0xA8, 0x12, 0x43, 0x59, 0xF9, 0x66, 0x80,
                                0xB8, 0x3D, 0x1C, 0x3E, 0xB2, 0xC0, 0x70, 0xE5,
                                0xC5, 0x45, 0xC9, 0x85, 0x8D, 0x03, 0xEC, 0xFB,
                                0x74, 0x4B, 0xF8, 0xD7, 0x17, 0x71, 0x7E, 0xFC,
-                       },
+                       }),
                )
                if err != nil {
                        panic(err)
@@ -204,42 +204,42 @@ var (
        // id-GostR3410-2001-CryptoPro-C-ParamSet
        CurveIdGostR34102001CryptoProCParamSet func() *Curve = func() *Curve {
                curve, err := NewCurve(
-                       []byte{
+                       bytes2big([]byte{
                                0x9B, 0x9F, 0x60, 0x5F, 0x5A, 0x85, 0x81, 0x07,
                                0xAB, 0x1E, 0xC8, 0x5E, 0x6B, 0x41, 0xC8, 0xAA,
                                0xCF, 0x84, 0x6E, 0x86, 0x78, 0x90, 0x51, 0xD3,
                                0x79, 0x98, 0xF7, 0xB9, 0x02, 0x2D, 0x75, 0x9B,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0x9B, 0x9F, 0x60, 0x5F, 0x5A, 0x85, 0x81, 0x07,
                                0xAB, 0x1E, 0xC8, 0x5E, 0x6B, 0x41, 0xC8, 0xAA,
                                0x58, 0x2C, 0xA3, 0x51, 0x1E, 0xDD, 0xFB, 0x74,
                                0xF0, 0x2F, 0x3A, 0x65, 0x98, 0x98, 0x0B, 0xB9,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0x9B, 0x9F, 0x60, 0x5F, 0x5A, 0x85, 0x81, 0x07,
                                0xAB, 0x1E, 0xC8, 0x5E, 0x6B, 0x41, 0xC8, 0xAA,
                                0xCF, 0x84, 0x6E, 0x86, 0x78, 0x90, 0x51, 0xD3,
                                0x79, 0x98, 0xF7, 0xB9, 0x02, 0x2D, 0x75, 0x98,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x5a,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0x41, 0xEC, 0xE5, 0x57, 0x43, 0x71, 0x1A, 0x8C,
                                0x3C, 0xBF, 0x37, 0x83, 0xCD, 0x08, 0xC0, 0xEE,
                                0x4D, 0x4D, 0xC4, 0x40, 0xD4, 0x64, 0x1A, 0x8F,
                                0x36, 0x6E, 0x55, 0x0D, 0xFD, 0xB3, 0xBB, 0x67,
-                       },
+                       }),
                )
                if err != nil {
                        panic(err)
@@ -249,42 +249,42 @@ var (
        // id-GostR3410-2001-CryptoPro-XchA-ParamSet
        CurveIdGostR34102001CryptoProXchAParamSet func() *Curve = func() *Curve {
                curve, err := NewCurve(
-                       []byte{
+                       bytes2big([]byte{
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0x97,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
                                0x6C, 0x61, 0x10, 0x70, 0x99, 0x5A, 0xD1, 0x00,
                                0x45, 0x84, 0x1B, 0x09, 0xB7, 0x61, 0xB8, 0x93,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0x94,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa6,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0x8D, 0x91, 0xE4, 0x71, 0xE0, 0x98, 0x9C, 0xDA,
                                0x27, 0xDF, 0x50, 0x5A, 0x45, 0x3F, 0x2B, 0x76,
                                0x35, 0x29, 0x4F, 0x2D, 0xDF, 0x23, 0xE3, 0xB1,
                                0x22, 0xAC, 0xC9, 0x9C, 0x9E, 0x9F, 0x1E, 0x14,
-                       },
+                       }),
                )
                if err != nil {
                        panic(err)
@@ -294,42 +294,42 @@ var (
        // id-GostR3410-2001-CryptoPro-XchB-ParamSet
        CurveIdGostR34102001CryptoProXchBParamSet func() *Curve = func() *Curve {
                curve, err := NewCurve(
-                       []byte{
+                       bytes2big([]byte{
                                0x9B, 0x9F, 0x60, 0x5F, 0x5A, 0x85, 0x81, 0x07,
                                0xAB, 0x1E, 0xC8, 0x5E, 0x6B, 0x41, 0xC8, 0xAA,
                                0xCF, 0x84, 0x6E, 0x86, 0x78, 0x90, 0x51, 0xD3,
                                0x79, 0x98, 0xF7, 0xB9, 0x02, 0x2D, 0x75, 0x9B,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0x9B, 0x9F, 0x60, 0x5F, 0x5A, 0x85, 0x81, 0x07,
                                0xAB, 0x1E, 0xC8, 0x5E, 0x6B, 0x41, 0xC8, 0xAA,
                                0x58, 0x2C, 0xA3, 0x51, 0x1E, 0xDD, 0xFB, 0x74,
                                0xF0, 0x2F, 0x3A, 0x65, 0x98, 0x98, 0x0B, 0xB9,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0x9B, 0x9F, 0x60, 0x5F, 0x5A, 0x85, 0x81, 0x07,
                                0xAB, 0x1E, 0xC8, 0x5E, 0x6B, 0x41, 0xC8, 0xAA,
                                0xCF, 0x84, 0x6E, 0x86, 0x78, 0x90, 0x51, 0xD3,
                                0x79, 0x98, 0xF7, 0xB9, 0x02, 0x2D, 0x75, 0x98,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x5a,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0x41, 0xEC, 0xE5, 0x57, 0x43, 0x71, 0x1A, 0x8C,
                                0x3C, 0xBF, 0x37, 0x83, 0xCD, 0x08, 0xC0, 0xEE,
                                0x4D, 0x4D, 0xC4, 0x40, 0xD4, 0x64, 0x1A, 0x8F,
                                0x36, 0x6E, 0x55, 0x0D, 0xFD, 0xB3, 0xBB, 0x67,
-                       },
+                       }),
                )
                if err != nil {
                        panic(err)
@@ -339,42 +339,42 @@ var (
        // id-tc26-gost-3410-2012-256-paramSetA
        CurveIdtc26gost34102012256paramSetA func() *Curve = func() *Curve {
                curve, err := NewCurve(
-                       []byte{
+                       bytes2big([]byte{
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0x97,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x0F, 0xD8, 0xCD, 0xDF, 0xC8, 0x7B, 0x66, 0x35,
                                0xC1, 0x15, 0xAF, 0x55, 0x6C, 0x36, 0x0C, 0x67,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0xC2, 0x17, 0x3F, 0x15, 0x13, 0x98, 0x16, 0x73,
                                0xAF, 0x48, 0x92, 0xC2, 0x30, 0x35, 0xA2, 0x7C,
                                0xE2, 0x5E, 0x20, 0x13, 0xBF, 0x95, 0xAA, 0x33,
                                0xB2, 0x2C, 0x65, 0x6F, 0x27, 0x7E, 0x73, 0x35,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0x29, 0x5F, 0x9B, 0xAE, 0x74, 0x28, 0xED, 0x9C,
                                0xCC, 0x20, 0xE7, 0xC3, 0x59, 0xA9, 0xD4, 0x1A,
                                0x22, 0xFC, 0xCD, 0x91, 0x08, 0xE1, 0x7B, 0xF7,
                                0xBA, 0x93, 0x37, 0xA6, 0xF8, 0xAE, 0x95, 0x13,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0x91, 0xE3, 0x84, 0x43, 0xA5, 0xE8, 0x2C, 0x0D,
                                0x88, 0x09, 0x23, 0x42, 0x57, 0x12, 0xB2, 0xBB,
                                0x65, 0x8B, 0x91, 0x96, 0x93, 0x2E, 0x02, 0xC7,
                                0x8B, 0x25, 0x82, 0xFE, 0x74, 0x2D, 0xAA, 0x28,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0x32, 0x87, 0x94, 0x23, 0xAB, 0x1A, 0x03, 0x75,
                                0x89, 0x57, 0x86, 0xC4, 0xBB, 0x46, 0xE9, 0x56,
                                0x5F, 0xDE, 0x0B, 0x53, 0x44, 0x76, 0x67, 0x40,
                                0xAF, 0x26, 0x8A, 0xDB, 0x32, 0x32, 0x2E, 0x5C,
-                       },
+                       }),
                )
                if err != nil {
                        panic(err)
@@ -384,7 +384,7 @@ var (
        // id-tc26-gost-3410-12-512-paramSetA
        CurveIdtc26gost341012512paramSetA func() *Curve = func() *Curve {
                curve, err := NewCurve(
-                       []byte{
+                       bytes2big([]byte{
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -393,8 +393,8 @@ var (
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xC7,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -403,8 +403,8 @@ var (
                                0x6F, 0xF2, 0x2B, 0x8D, 0x4E, 0x05, 0x60, 0x60,
                                0x9B, 0x4B, 0x38, 0xAB, 0xFA, 0xD2, 0xB8, 0x5D,
                                0xCA, 0xCD, 0xB1, 0x41, 0x1F, 0x10, 0xB2, 0x75,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -413,8 +413,8 @@ var (
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xC4,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0xE8, 0xC2, 0x50, 0x5D, 0xED, 0xFC, 0x86, 0xDD,
                                0xC1, 0xBD, 0x0B, 0x2B, 0x66, 0x67, 0xF1, 0xDA,
                                0x34, 0xB8, 0x25, 0x74, 0x76, 0x1C, 0xB0, 0xE8,
@@ -423,8 +423,8 @@ var (
                                0x4C, 0xB4, 0x57, 0x40, 0x10, 0xDA, 0x90, 0xDD,
                                0x86, 0x2E, 0xF9, 0xD4, 0xEB, 0xEE, 0x47, 0x61,
                                0x50, 0x31, 0x90, 0x78, 0x5A, 0x71, 0xC7, 0x60,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -433,8 +433,8 @@ var (
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0x75, 0x03, 0xCF, 0xE8, 0x7A, 0x83, 0x6A, 0xE3,
                                0xA6, 0x1B, 0x88, 0x16, 0xE2, 0x54, 0x50, 0xE6,
                                0xCE, 0x5E, 0x1C, 0x93, 0xAC, 0xF1, 0xAB, 0xC1,
@@ -443,7 +443,7 @@ var (
                                0x3D, 0x75, 0xE6, 0xA5, 0x0E, 0x3A, 0x41, 0xE9,
                                0x80, 0x28, 0xFE, 0x5F, 0xC2, 0x35, 0xF5, 0xB8,
                                0x89, 0xA5, 0x89, 0xCB, 0x52, 0x15, 0xF2, 0xA4,
-                       },
+                       }),
                )
                if err != nil {
                        panic(err)
@@ -453,7 +453,7 @@ var (
        // id-tc26-gost-3410-12-512-paramSetB
        CurveIdtc26gost341012512paramSetB func() *Curve = func() *Curve {
                curve, err := NewCurve(
-                       []byte{
+                       bytes2big([]byte{
                                0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -462,8 +462,8 @@ var (
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6F,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -472,8 +472,8 @@ var (
                                0xAC, 0xFD, 0xB7, 0x7B, 0xD9, 0xD4, 0x0C, 0xFA,
                                0x8B, 0x99, 0x67, 0x12, 0x10, 0x1B, 0xEA, 0x0E,
                                0xC6, 0x34, 0x6C, 0x54, 0x37, 0x4F, 0x25, 0xBD,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -482,8 +482,8 @@ var (
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6C,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0x68, 0x7D, 0x1B, 0x45, 0x9D, 0xC8, 0x41, 0x45,
                                0x7E, 0x3E, 0x06, 0xCF, 0x6F, 0x5E, 0x25, 0x17,
                                0xB9, 0x7C, 0x7D, 0x61, 0x4A, 0xF1, 0x38, 0xBC,
@@ -492,8 +492,8 @@ var (
                                0x7F, 0x8B, 0x27, 0x6F, 0xAD, 0x1A, 0xB6, 0x9C,
                                0x50, 0xF7, 0x8B, 0xEE, 0x1F, 0xA3, 0x10, 0x6E,
                                0xFB, 0x8C, 0xCB, 0xC7, 0xC5, 0x14, 0x01, 0x16,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -502,8 +502,8 @@ var (
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0x1A, 0x8F, 0x7E, 0xDA, 0x38, 0x9B, 0x09, 0x4C,
                                0x2C, 0x07, 0x1E, 0x36, 0x47, 0xA8, 0x94, 0x0F,
                                0x3C, 0x12, 0x3B, 0x69, 0x75, 0x78, 0xC2, 0x13,
@@ -512,7 +512,7 @@ var (
                                0x15, 0x2C, 0xBC, 0xAA, 0xF8, 0xC0, 0x39, 0x88,
                                0x28, 0x04, 0x10, 0x55, 0xF9, 0x4C, 0xEE, 0xEC,
                                0x7E, 0x21, 0x34, 0x07, 0x80, 0xFE, 0x41, 0xBD,
-                       },
+                       }),
                )
                if err != nil {
                        panic(err)
@@ -522,7 +522,7 @@ var (
        // id-tc26-gost-3410-2012-512-paramSetC
        CurveIdtc26gost34102012512paramSetC func() *Curve = func() *Curve {
                curve, err := NewCurve(
-                       []byte{
+                       bytes2big([]byte{
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -531,8 +531,8 @@ var (
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xC7,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0x3F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
                                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -541,8 +541,8 @@ var (
                                0x4C, 0x33, 0xA9, 0xFF, 0x51, 0x47, 0x50, 0x2C,
                                0xC8, 0xED, 0xA9, 0xE7, 0xA7, 0x69, 0xA1, 0x26,
                                0x94, 0x62, 0x3C, 0xEF, 0x47, 0xF0, 0x23, 0xED,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0xDC, 0x92, 0x03, 0xE5, 0x14, 0xA7, 0x21, 0x87,
                                0x54, 0x85, 0xA5, 0x29, 0xD2, 0xC7, 0x22, 0xFB,
                                0x18, 0x7B, 0xC8, 0x98, 0x0E, 0xB8, 0x66, 0x64,
@@ -551,8 +551,8 @@ var (
                                0x2A, 0xDE, 0x71, 0xF4, 0x6F, 0xCF, 0x50, 0xFF,
                                0x2A, 0xD9, 0x7F, 0x95, 0x1F, 0xDA, 0x9F, 0x2A,
                                0x2E, 0xB6, 0x54, 0x6F, 0x39, 0x68, 0x9B, 0xD3,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0xB4, 0xC4, 0xEE, 0x28, 0xCE, 0xBC, 0x6C, 0x2C,
                                0x8A, 0xC1, 0x29, 0x52, 0xCF, 0x37, 0xF1, 0x6A,
                                0xC7, 0xEF, 0xB6, 0xA9, 0xF6, 0x9F, 0x4B, 0x57,
@@ -561,8 +561,8 @@ var (
                                0x8D, 0xE0, 0x28, 0x4B, 0x8B, 0xFE, 0xF3, 0xB5,
                                0x2B, 0x8C, 0xC7, 0xA5, 0xF5, 0xBF, 0x0A, 0x3C,
                                0x8D, 0x23, 0x19, 0xA5, 0x31, 0x25, 0x57, 0xE1,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0xE2, 0xE3, 0x1E, 0xDF, 0xC2, 0x3D, 0xE7, 0xBD,
                                0xEB, 0xE2, 0x41, 0xCE, 0x59, 0x3E, 0xF5, 0xDE,
                                0x22, 0x95, 0xB7, 0xA9, 0xCB, 0xAE, 0xF0, 0x21,
@@ -571,8 +571,8 @@ var (
                                0xA7, 0xB9, 0x03, 0x3D, 0xB9, 0xED, 0x36, 0x10,
                                0xC6, 0xFB, 0x85, 0x48, 0x7E, 0xAE, 0x97, 0xAA,
                                0xC5, 0xBC, 0x79, 0x28, 0xC1, 0x95, 0x01, 0x48,
-                       },
-                       []byte{
+                       }),
+                       bytes2big([]byte{
                                0xF5, 0xCE, 0x40, 0xD9, 0x5B, 0x5E, 0xB8, 0x99,
                                0xAB, 0xBC, 0xCF, 0xF5, 0x91, 0x1C, 0xB8, 0x57,
                                0x79, 0x39, 0x80, 0x4D, 0x65, 0x27, 0x37, 0x8B,
@@ -581,7 +581,8 @@ var (
                                0xEF, 0x32, 0xD8, 0x58, 0x22, 0x42, 0x3B, 0x63,
                                0x04, 0xF7, 0x26, 0xAA, 0x85, 0x4B, 0xAE, 0x07,
                                0xD0, 0x39, 0x6E, 0x9A, 0x9A, 0xDD, 0xC4, 0x0F,
-                       },
+                       }),
+                       }),
                )
                if err != nil {
                        panic(err)