Shorter unified curve argument name

[gogost.git] / gost3410 / public.go

diff --git a/gost3410/public.go b/gost3410/public.go
index e2e3814e381e9dd8db2caf0408a67bd79fb65d86..85d3557bfe03c7506e4417ed258c6e62665aa46f 100644 (file)
--- a/gost3410/public.go
+++ b/gost3410/public.go
@@ -1,5 +1,5 @@
 // GoGOST -- Pure Go GOST cryptographic functions library
-// Copyright (C) 2015-2020 Sergey Matveev <stargrave@stargrave.org>
+// Copyright (C) 2015-2021 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
@@ -16,6 +16,7 @@
 package gost3410
 
 import (
+       "crypto"
        "fmt"
        "math/big"
 )
@@ -26,8 +27,8 @@ type PublicKey struct {
        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))
@@ -36,7 +37,7 @@ func NewPublicKey(curve *Curve, raw []byte) (*PublicKey, error) {
                key[i] = raw[len(raw)-i-1]
        }
        return &PublicKey{
-               curve,
+               c,
                bytes2big(key[pointSize : 2*pointSize]),
                bytes2big(key[:pointSize]),
        }, nil
@@ -107,3 +108,11 @@ func (pub *PublicKey) VerifyDigest(digest, signature []byte) (bool, error) {
        lm.Mod(lm, pub.C.Q)
        return lm.Cmp(r) == 0, nil
 }
+
+func (our *PublicKey) Equal(theirKey crypto.PublicKey) bool {
+       their, ok := theirKey.(*PublicKey)
+       if !ok {
+               return false
+       }
+       return our.X.Cmp(their.X) == 0 && our.Y.Cmp(their.Y) == 0 && our.C.Equal(their.C)
+}