gost3410/private.go | 12 ++++++------ gost3410/public.go | 6 +++--- diff --git a/gost3410/private.go b/gost3410/private.go index 92088a742ccf47c74078ea39bbb8c5e7e299984df8f00afbb74c5f698948b2db..48c1abd88695137c3755baf012ebee0f27eabd341c304418c933278a51cbe18d 100644 --- a/gost3410/private.go +++ b/gost3410/private.go @@ -28,8 +28,8 @@ C *Curve Key *big.Int } -func NewPrivateKey(curve *Curve, raw []byte) (*PrivateKey, error) { - pointSize := curve.PointSize() +func NewPrivateKey(c *Curve, raw []byte) (*PrivateKey, error) { + pointSize := c.PointSize() if len(raw) != pointSize { return nil, fmt.Errorf("gogost/gost3410: len(key) != %d", pointSize) } @@ -41,15 +41,15 @@ k := bytes2big(key) if k.Cmp(zero) == 0 { return nil, errors.New("gogost/gost3410: zero private key") } - return &PrivateKey{curve, k.Mod(k, curve.Q)}, nil + return &PrivateKey{c, k.Mod(k, c.Q)}, nil } -func GenPrivateKey(curve *Curve, rand io.Reader) (*PrivateKey, error) { - raw := make([]byte, curve.PointSize()) +func GenPrivateKey(c *Curve, rand io.Reader) (*PrivateKey, error) { + raw := make([]byte, c.PointSize()) if _, err := io.ReadFull(rand, raw); err != nil { return nil, err } - return NewPrivateKey(curve, raw) + return NewPrivateKey(c, raw) } func (prv *PrivateKey) Raw() []byte { diff --git a/gost3410/public.go b/gost3410/public.go index 077c04e0f62d736b4fd2496327fafaf4665792d69b06700681638bef6bd6e92f..01984d05c2dfc8fc66cbcd53359cb2e282c71c38b6dcb04267b14d3c9175c149 100644 --- a/gost3410/public.go +++ b/gost3410/public.go @@ -27,8 +27,8 @@ X *big.Int Y *big.Int } -func NewPublicKey(curve *Curve, raw []byte) (*PublicKey, error) { - pointSize := curve.PointSize() +func NewPublicKey(c *Curve, raw []byte) (*PublicKey, error) { + pointSize := c.PointSize() key := make([]byte, 2*pointSize) if len(raw) != len(key) { return nil, fmt.Errorf("gogost/gost3410: len(key) != %d", len(key)) @@ -37,7 +37,7 @@ for i := 0; i < len(key); i++ { key[i] = raw[len(raw)-i-1] } return &PublicKey{ - curve, + c, bytes2big(key[pointSize : 2*pointSize]), bytes2big(key[:pointSize]), }, nil