src/cypherpunks.ru/gogost/gost3410/2012_test.go | 1 - src/cypherpunks.ru/gogost/gost3410/curve.go | 4 ++-- src/cypherpunks.ru/gogost/gost3410/params.go | 48 ++++++++++++++++++++++++++++++++++-------------- diff --git a/src/cypherpunks.ru/gogost/gost3410/2012_test.go b/src/cypherpunks.ru/gogost/gost3410/2012_test.go index 940872458c45902a2dc6ad52e0a8c6f0590f6cd137aad40e3a0359c169de1de4..fbf193c5abb09e137651d903186f595a15e605fd4651169dd3e418069555261e 100644 --- a/src/cypherpunks.ru/gogost/gost3410/2012_test.go +++ b/src/cypherpunks.ru/gogost/gost3410/2012_test.go @@ -144,7 +144,6 @@ 0x60, 0xC9, 0x3B, 0xCB, 0xCD, 0x9C, 0x5C, 0x33, 0x17, 0xE1, 0x93, 0x44, 0xE1, 0x73, 0xAE, 0x36, } c, err := NewCurve( - "some-name", bytes2big(p), bytes2big(q), bytes2big(a), diff --git a/src/cypherpunks.ru/gogost/gost3410/curve.go b/src/cypherpunks.ru/gogost/gost3410/curve.go index f5170f2abce4f39280317c04d5dceaee78fd7b86a77ddd3ee7fb3fdcec229b42..22191273da1dc1f3e3c84c72e95c12667191a0a5dddc829ac700039509383a7e 100644 --- a/src/cypherpunks.ru/gogost/gost3410/curve.go +++ b/src/cypherpunks.ru/gogost/gost3410/curve.go @@ -56,9 +56,9 @@ edS *big.Int edT *big.Int } -func NewCurve(name string, p, q, a, b, x, y, e, d *big.Int) (*Curve, error) { +func NewCurve(p, q, a, b, x, y, e, d *big.Int) (*Curve, error) { c := Curve{ - Name: name, + Name: "unknown", P: p, Q: q, A: a, diff --git a/src/cypherpunks.ru/gogost/gost3410/params.go b/src/cypherpunks.ru/gogost/gost3410/params.go index 902b6b3b19d7ff9bd0bfc04b26321efe394482e6b2a0eb66fd4bdeab4f1f4019..3deb6de53ad2f33ce936a65ab1ef28750bc2b0badc4842d129015688ed482cd1 100644 --- a/src/cypherpunks.ru/gogost/gost3410/params.go +++ b/src/cypherpunks.ru/gogost/gost3410/params.go @@ -24,7 +24,6 @@ Mode2012 Mode = Mode(64) CurveGostR34102001ParamSetcc func() *Curve = func() *Curve { curve, err := NewCurve( - "GostR34102001ParamSetcc", bytes2big([]byte{ 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -67,12 +66,12 @@ ) if err != nil { panic(err) } + curve.Name = "GostR34102001ParamSetcc" return curve } // id-GostR3410-2001-TestParamSet CurveIdGostR34102001TestParamSet func() *Curve = func() *Curve { curve, err := NewCurve( - "id-GostR3410-2001-TestParamSet", bytes2big([]byte{ 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -115,12 +114,12 @@ ) if err != nil { panic(err) } + curve.Name = "id-GostR3410-2001-TestParamSet" return curve } // id-GostR3410-2001-CryptoPro-A-ParamSet CurveIdGostR34102001CryptoProAParamSet func() *Curve = func() *Curve { curve, err := NewCurve( - "id-GostR3410-2001-CryptoPro-A-ParamSet", bytes2big([]byte{ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, @@ -163,12 +162,12 @@ ) if err != nil { panic(err) } + curve.Name = "id-GostR3410-2001-CryptoPro-A-ParamSet" return curve } // id-GostR3410-2001-CryptoPro-B-ParamSet CurveIdGostR34102001CryptoProBParamSet func() *Curve = func() *Curve { curve, err := NewCurve( - "id-GostR3410-2001-CryptoPro-B-ParamSet", bytes2big([]byte{ 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -211,12 +210,12 @@ ) if err != nil { panic(err) } + curve.Name = "id-GostR3410-2001-CryptoPro-B-ParamSet" return curve } // id-GostR3410-2001-CryptoPro-C-ParamSet CurveIdGostR34102001CryptoProCParamSet func() *Curve = func() *Curve { curve, err := NewCurve( - "id-GostR3410-2001-CryptoPro-C-ParamSet", bytes2big([]byte{ 0x9B, 0x9F, 0x60, 0x5F, 0x5A, 0x85, 0x81, 0x07, 0xAB, 0x1E, 0xC8, 0x5E, 0x6B, 0x41, 0xC8, 0xAA, @@ -259,16 +258,24 @@ ) if err != nil { panic(err) } + curve.Name = "id-GostR3410-2001-CryptoPro-C-ParamSet" return curve } // id-GostR3410-2001-CryptoPro-XchA-ParamSet - CurveIdGostR34102001CryptoProXchAParamSet func() *Curve = CurveIdGostR34102001CryptoProAParamSet + CurveIdGostR34102001CryptoProXchAParamSet func() *Curve = func() *Curve { + c := CurveIdGostR34102001CryptoProAParamSet() + c.Name = "id-GostR3410-2001-CryptoPro-XchA-ParamSet" + return c + } // id-GostR3410-2001-CryptoPro-XchB-ParamSet - CurveIdGostR34102001CryptoProXchBParamSet func() *Curve = CurveIdGostR34102001CryptoProCParamSet + CurveIdGostR34102001CryptoProXchBParamSet func() *Curve = func() *Curve { + c := CurveIdGostR34102001CryptoProCParamSet() + c.Name = "id-GostR3410-2001-CryptoPro-XchB-ParamSet" + return c + } // id-tc26-gost-3410-2012-256-paramSetA CurveIdtc26gost34102012256paramSetA func() *Curve = func() *Curve { curve, err := NewCurve( - "id-tc26-gost-3410-2012-256-paramSetA", bytes2big([]byte{ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, @@ -316,18 +323,30 @@ ) if err != nil { panic(err) } + curve.Name = "id-tc26-gost-3410-2012-256-paramSetA" return curve } // id-tc26-gost-3410-2012-256-paramSetB - CurveIdtc26gost34102012256paramSetB func() *Curve = CurveIdGostR34102001CryptoProAParamSet + CurveIdtc26gost34102012256paramSetB func() *Curve = func() *Curve { + c := CurveIdGostR34102001CryptoProAParamSet() + c.Name = "id-tc26-gost-3410-2012-256-paramSetB" + return c + } // id-tc26-gost-3410-2012-256-paramSetC - CurveIdtc26gost34102012256paramSetC func() *Curve = CurveIdGostR34102001CryptoProBParamSet + CurveIdtc26gost34102012256paramSetC func() *Curve = func() *Curve { + c := CurveIdGostR34102001CryptoProBParamSet() + c.Name = "id-tc26-gost-3410-2012-256-paramSetC" + return c + } // id-tc26-gost-3410-2012-256-paramSetD - CurveIdtc26gost34102012256paramSetD func() *Curve = CurveIdGostR34102001CryptoProCParamSet + CurveIdtc26gost34102012256paramSetD func() *Curve = func() *Curve { + c := CurveIdGostR34102001CryptoProCParamSet() + c.Name = "id-tc26-gost-3410-2012-256-paramSetD" + return c + } // id-tc26-gost-3410-12-512-paramSetA CurveIdtc26gost341012512paramSetA func() *Curve = func() *Curve { curve, err := NewCurve( - "id-tc26-gost-3410-12-512-paramSetA", bytes2big([]byte{ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, @@ -394,12 +413,12 @@ ) if err != nil { panic(err) } + curve.Name = "id-tc26-gost-3410-12-512-paramSetA" return curve } // id-tc26-gost-3410-12-512-paramSetB CurveIdtc26gost341012512paramSetB func() *Curve = func() *Curve { curve, err := NewCurve( - "id-tc26-gost-3410-12-512-paramSetB", bytes2big([]byte{ 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -466,12 +485,12 @@ ) if err != nil { panic(err) } + curve.Name = "id-tc26-gost-3410-12-512-paramSetB" return curve } // id-tc26-gost-3410-2012-512-paramSetC CurveIdtc26gost34102012512paramSetC func() *Curve = func() *Curve { curve, err := NewCurve( - "id-tc26-gost-3410-2012-512-paramSetC", bytes2big([]byte{ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, @@ -547,6 +566,7 @@ ) if err != nil { panic(err) } + curve.Name = "id-tc26-gost-3410-2012-512-paramSetC" return curve }