fix non-generation of btcec keys in signer
This commit is contained in:
@@ -21,7 +21,7 @@ type Signer struct {
|
|||||||
var _ signer.I = &Signer{}
|
var _ signer.I = &Signer{}
|
||||||
|
|
||||||
// Generate creates a new Signer.
|
// Generate creates a new Signer.
|
||||||
func (s *Signer) Generate() (err error) {
|
func (s *Signer) Generate(nobtcec ...bool) (err error) {
|
||||||
if s.SecretKey, err = ec.NewSecretKey(); chk.E(err) {
|
if s.SecretKey, err = ec.NewSecretKey(); chk.E(err) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -33,7 +33,7 @@ func (s *Signer) Generate() (err error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// InitSec initialises a Signer using raw secret key bytes.
|
// InitSec initialises a Signer using raw secret key bytes.
|
||||||
func (s *Signer) InitSec(sec []byte) (err error) {
|
func (s *Signer) InitSec(sec []byte, nobtcec ...bool) (err error) {
|
||||||
if len(sec) != secp256k1.SecKeyBytesLen {
|
if len(sec) != secp256k1.SecKeyBytesLen {
|
||||||
err = errorf.E("sec key must be %d bytes", secp256k1.SecKeyBytesLen)
|
err = errorf.E("sec key must be %d bytes", secp256k1.SecKeyBytesLen)
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -44,7 +44,8 @@ func (s *Signer) Generate(nobtcec ...bool) (err error) {
|
|||||||
}
|
}
|
||||||
s.SecretKey = &cs.Key
|
s.SecretKey = &cs.Key
|
||||||
s.PublicKey = cx.Key
|
s.PublicKey = cx.Key
|
||||||
if len(nobtcec) > 0 && nobtcec[0] == false {
|
if len(nobtcec) > 0 && nobtcec[0] != true {
|
||||||
|
} else {
|
||||||
s.BTCECSec, _ = btcec.PrivKeyFromBytes(s.skb)
|
s.BTCECSec, _ = btcec.PrivKeyFromBytes(s.skb)
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
@@ -65,7 +66,8 @@ func (s *Signer) InitSec(skb []byte, nobtcec ...bool) (err error) {
|
|||||||
s.PublicKey = cx.Key
|
s.PublicKey = cx.Key
|
||||||
// s.ECPublicKey = cp.Key
|
// s.ECPublicKey = cp.Key
|
||||||
// needed for ecdh
|
// needed for ecdh
|
||||||
if len(nobtcec) > 0 && nobtcec[0] == false {
|
if len(nobtcec) > 0 && nobtcec[0] != true {
|
||||||
|
} else {
|
||||||
s.BTCECSec, _ = btcec.PrivKeyFromBytes(s.skb)
|
s.BTCECSec, _ = btcec.PrivKeyFromBytes(s.skb)
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
|
|||||||
Reference in New Issue
Block a user