LBRYCommunity/lbcd
1
0
Fork 0
Code Issues 17 Pull requests 4 Packages Projects Releases 28 Wiki Activity

RecoverCompact and SignCompact now use the btcec.PrivateKey and btcec.PublicKey types.

Browse source 
btcwallet/rpcserver.go needs a corresponding change or else that will break.

This closes #6
This commit is contained in:
Jimmy Song 2014-09-27 13:33:45 -05:00
parent d69442834c
commit d312d47298
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
signature.go
View file

@ -7,7 +7,6 @@ package btcec
import ( import (
"crypto/ecdsa" "crypto/ecdsa"
"crypto/elliptic" "crypto/elliptic"
"crypto/rand"
"errors" "errors"
"fmt" "fmt"
"math/big" "math/big"
@ -263,7 +262,7 @@ func hashToInt(hash []byte, c elliptic.Curve) *big.Int {
// case in step 1.6. This counter is used in the bitcoin compressed signature // case in step 1.6. This counter is used in the bitcoin compressed signature
// format and thus we match bitcoind's behaviour here. // format and thus we match bitcoind's behaviour here.
func recoverKeyFromSignature(curve *KoblitzCurve, sig *Signature, msg []byte, func recoverKeyFromSignature(curve *KoblitzCurve, sig *Signature, msg []byte,
iter int, doChecks bool) (*ecdsa.PublicKey, error) { iter int, doChecks bool) (*PublicKey, error) {
// 1.1 x = (n * i) + r // 1.1 x = (n * i) + r
Rx := new(big.Int).Mul(curve.Params().N, Rx := new(big.Int).Mul(curve.Params().N,
new(big.Int).SetInt64(int64(iter/2))) new(big.Int).SetInt64(int64(iter/2)))
@ -314,7 +313,7 @@ func recoverKeyFromSignature(curve *KoblitzCurve, sig *Signature, msg []byte,
// step to prevent the jacobian conversion back and forth. // step to prevent the jacobian conversion back and forth.
Qx, Qy := curve.Add(sRx, sRy, minuseGx, minuseGy) Qx, Qy := curve.Add(sRx, sRy, minuseGx, minuseGy)
return &ecdsa.PublicKey{ return &PublicKey{
Curve: curve, Curve: curve,
X: Qx, X: Qx,
Y: Qy, Y: Qy,
@ -328,14 +327,13 @@ func recoverKeyFromSignature(curve *KoblitzCurve, sig *Signature, msg []byte,
// returned in the format: // returned in the format:
// <(byte of 27+public key solution)+4 if compressed >< padded bytes for signature R><padded bytes for signature S> // <(byte of 27+public key solution)+4 if compressed >< padded bytes for signature R><padded bytes for signature S>
// where the R and S parameters are padde up to the bitlengh of the curve. // where the R and S parameters are padde up to the bitlengh of the curve.
func SignCompact(curve *KoblitzCurve, key *ecdsa.PrivateKey, func SignCompact(curve *KoblitzCurve, key *PrivateKey,
hash []byte, isCompressedKey bool) ([]byte, error) { hash []byte, isCompressedKey bool) ([]byte, error) {
r, s, err := ecdsa.Sign(rand.Reader, key, hash) sig, err := key.Sign(hash)
if err != nil { if err != nil {
return nil, err return nil, err
} }
sig := &Signature{R: r, S: s}
// bitcoind checks the bit length of R and S here. The ecdsa signature // bitcoind checks the bit length of R and S here. The ecdsa signature
// algorithm returns R and S mod N therefore they will be the bitsize of // algorithm returns R and S mod N therefore they will be the bitsize of
// the curve, and thus correctly sized. // the curve, and thus correctly sized.
@ -377,7 +375,7 @@ func SignCompact(curve *KoblitzCurve, key *ecdsa.PrivateKey,
// key will be returned as well as a boolen if the original key was compressed // key will be returned as well as a boolen if the original key was compressed
// or not, else an error will be returned. // or not, else an error will be returned.
func RecoverCompact(curve *KoblitzCurve, signature, func RecoverCompact(curve *KoblitzCurve, signature,
hash []byte) (*ecdsa.PublicKey, bool, error) { hash []byte) (*PublicKey, bool, error) {
bitlen := (curve.BitSize + 7) / 8 bitlen := (curve.BitSize + 7) / 8
if len(signature) != 1+bitlen*2 { if len(signature) != 1+bitlen*2 {
return nil, false, errors.New("invalid compact signature size") return nil, false, errors.New("invalid compact signature size")

3
signature_test.go
View file

@ -427,7 +427,8 @@ func TestSignatureSerialize(t *testing.T) {
func testSignCompact(t *testing.T, tag string, curve *btcec.KoblitzCurve, func testSignCompact(t *testing.T, tag string, curve *btcec.KoblitzCurve,
data []byte, isCompressed bool) { data []byte, isCompressed bool) {
priv, _ := ecdsa.GenerateKey(curve, rand.Reader) tmp, _ := ecdsa.GenerateKey(curve, rand.Reader)
priv := (*btcec.PrivateKey)(tmp)
hashed := []byte("testing") hashed := []byte("testing")
sig, err := btcec.SignCompact(curve, priv, hashed, isCompressed) sig, err := btcec.SignCompact(curve, priv, hashed, isCompressed)