Remove unused Signer return value

diff --git a/go/cm/cmd/cmkeytool/main.go b/go/cm/cmd/cmkeytool/main.go
index 077b7cf476a1d0ac4cbcc209e29129d3095afe4d16f5486ec66c5d4c23e20f99..db9520fc49c56d0aa56c46990e9698de176fd07f7d229fbb2d31ef9fbdf00a47 100644 (file)
--- a/go/cm/cmd/cmkeytool/main.go
+++ b/go/cm/cmd/cmkeytool/main.go
@@ -173,15 +173,15 @@ func main() {
                var pub []byte
                switch *algo {
                case ed25519blake2b.Ed25519BLAKE2b:
-                       _, prvRaw, pub, err = ed25519blake2b.NewKeypair()
+                       prvRaw, pub, err = ed25519blake2b.NewKeypair()
                case gost.GOST3410256A, gost.GOST3410512C:
-                       _, prvRaw, pub, err = gost.NewKeypair(*algo)
+                       prvRaw, pub, err = gost.NewKeypair(*algo)
                case sntrup4591761x25519.SNTRUP4591761X25519:
                        prvRaw, pub, err = sntrup4591761x25519.NewKeypair()
                case mceliece6960119x25519.ClassicMcEliece6960119X25519:
                        prvRaw, pub, err = mceliece6960119x25519.NewKeypair()
                case spx.SPHINCSPlusSHAKE256s:
-                       _, prvRaw, pub, err = spx.NewKeypair(*algo)
+                       prvRaw, pub, err = spx.NewKeypair(*algo)
                default:
                        err = errors.New("unknown -algo specified")
                }

diff --git a/go/cm/sign/ed25519-blake2b/kp.go b/go/cm/sign/ed25519-blake2b/kp.go
index e89b549d9157e86308d3539e631ceac744587a087ed631d5e52209babda1b148..d9b2980e9b575149816b54b36dc51edcf2d04714d743ab5150195bf79b21ccbe 100644 (file)
--- a/go/cm/sign/ed25519-blake2b/kp.go
+++ b/go/cm/sign/ed25519-blake2b/kp.go
@@ -19,13 +19,12 @@ import (
        "go.cypherpunks.su/keks/cm/sign/ed25519-blake2b/ed25519"
 )
 
-func NewKeypair() (signer *Signer, prv, pub []byte, err error) {
+func NewKeypair() (prv, pub []byte, err error) {
        var prvEd *ed25519.PrivateKey
        prvEd, err = ed25519.GenerateKey()
        if err != nil {
                return
        }
-       signer = &Signer{Prv: prvEd}
        prv = prvEd.Seed()
        pub = prvEd.PublicKey()
        return

diff --git a/go/cm/sign/gost/kp.go b/go/cm/sign/gost/kp.go
index 39abcbc885d98f6028365dc4201f21aa05e6bb55dbbd71f4033305563c05a62e..b906f4dfeeb77b4f0e5f3c38854236714160dd84bd3217d31f5112fbefd81589 100644 (file)
--- a/go/cm/sign/gost/kp.go
+++ b/go/cm/sign/gost/kp.go
@@ -22,7 +22,7 @@ import (
        "go.cypherpunks.su/gogost/v6/gost3410"
 )
 
-func NewKeypair(algo string) (signer *Signer, prv, pub []byte, err error) {
+func NewKeypair(algo string) (prv, pub []byte, err error) {
        curve := CurveByName(algo)
        if curve == nil {
                err = errors.New("unknown curve")
@@ -35,6 +35,6 @@ func NewKeypair(algo string) (signer *Signer, prv, pub []byte, err error) {
        if err != nil {
                return
        }
-       signer, pub, err = NewSigner(pk.RawBE())
+       _, pub, err = NewSigner(pk.RawBE())
        return
 }

diff --git a/go/cm/sign/spx/kp.go b/go/cm/sign/spx/kp.go
index 9b7b2c1608d5db6760aaa98c01ad763bbf3ecda6bd87d9eaaa404a256e07fa89..10fc55ce603d40214358f950044ffdd19df885c89caa8c60b56af884c67874bb 100644 (file)
--- a/go/cm/sign/spx/kp.go
+++ b/go/cm/sign/spx/kp.go
@@ -29,7 +29,7 @@ const (
 
 var Params = spxParams.MakeSphincsPlusSHAKE256256sRobust(false)
 
-func NewKeypair(algo string) (signer *Signer, prv, pub []byte, err error) {
+func NewKeypair(algo string) (prv, pub []byte, err error) {
        sk, pk := spx.Spx_keygen(Params)
        pub, err = pk.SerializePK()
        if err != nil {
@@ -40,6 +40,5 @@ func NewKeypair(algo string) (signer *Signer, prv, pub []byte, err error) {
                return
        }
        prv = append(prv, pub...)
-       signer, _, err = NewSigner(prv)
        return
 }