ecdsa: moved all signature encoding to ECSignature

This commit is contained in:
Daniel Cousens 2014-06-15 16:44:52 +10:00
parent c5252fc509
commit eb3d9a25f7
9 changed files with 350 additions and 297 deletions

View file

@ -5,6 +5,7 @@ var message = require('../src/message')
var networks = require('../src/networks')
var BigInteger = require('bigi')
var ECSignature = require('../src/ecsignature')
var ecurve = require('ecurve')
var curve = ecurve.getCurveByName('secp256k1')
@ -35,7 +36,7 @@ describe('ecdsa', function() {
}
var h1 = crypto.sha256(f.message)
var e = BigInteger.fromBuffer(h1)
var Qprime = ecdsa.recoverPubKey(curve, e, signature, f.compact.i)
var Qprime = ecdsa.recoverPubKey(curve, e, signature, f.i)
assert(Qprime.equals(Q))
})
@ -45,8 +46,8 @@ describe('ecdsa', function() {
var hash = message.magicHash('1111', networks.bitcoin)
var e = BigInteger.fromBuffer(hash)
var signature = new Buffer('INcvXVVEFyIfHLbDX+xoxlKFn3Wzj9g0UbhObXdMq+YMKC252o5RHFr0/cKdQe1WsBLUBi4morhgZ77obDJVuV0=', 'base64')
var parsed = ecdsa.parseSigCompact(signature)
var signatureBuffer = new Buffer('INcvXVVEFyIfHLbDX+xoxlKFn3Wzj9g0UbhObXdMq+YMKC252o5RHFr0/cKdQe1WsBLUBi4morhgZ77obDJVuV0=', 'base64')
var signature = ECSignature.fromCompact(signatureBuffer).signature
var points = [
'03e3a8c44a8bf712f1fbacee274fb19c0239b1a9e877eff0075ea335f2be8ff380',
'0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798',
@ -56,7 +57,7 @@ describe('ecdsa', function() {
points.forEach(function(expectedHex, i) {
it('recovers an expected point for i of ' + i, function() {
var Qprime = ecdsa.recoverPubKey(curve, e, parsed.signature, i)
var Qprime = ecdsa.recoverPubKey(curve, e, signature, i)
var QprimeHex = Qprime.getEncoded().toString('hex')
assert.equal(QprimeHex, expectedHex)
@ -67,10 +68,7 @@ describe('ecdsa', function() {
fixtures.invalid.recoverPubKey.forEach(function(f) {
it('throws on ' + f.description, function() {
var e = BigInteger.fromHex(f.e)
var signature = {
r: new BigInteger(f.signature.r),
s: new BigInteger(f.signature.s)
}
var signature = new ECSignature(new BigInteger(f.signature.r), new BigInteger(f.signature.s))
assert.throws(function() {
ecdsa.recoverPubKey(curve, e, signature, f.i)
@ -105,13 +103,12 @@ describe('ecdsa', function() {
fixtures.valid.forEach(function(f) {
it('verifies a valid signature for \"' + f.message + '\"', function() {
var d = BigInteger.fromHex(f.d)
var Q = curve.params.G.multiply(d)
var signature = {
r: new BigInteger(f.signature.r),
s: new BigInteger(f.signature.s)
}
var e = BigInteger.fromBuffer(crypto.sha256(f.message))
var signature = new ECSignature(
new BigInteger(f.signature.r),
new BigInteger(f.signature.s)
)
var Q = curve.params.G.multiply(d)
assert(ecdsa.verifyRaw(curve, e, signature, Q))
})
@ -121,90 +118,14 @@ describe('ecdsa', function() {
it('fails to verify with ' + f.description, function() {
var d = BigInteger.fromHex(f.d)
var e = BigInteger.fromHex(f.e)
var signature = {
r: new BigInteger(f.signature.r),
s: new BigInteger(f.signature.s)
}
var signature = new ECSignature(
new BigInteger(f.signature.r),
new BigInteger(f.signature.s)
)
var Q = curve.params.G.multiply(d)
assert.equal(ecdsa.verifyRaw(curve, e, signature, Q), false)
})
})
})
describe('serializeSig', function() {
it('encodes a DER signature', function() {
fixtures.valid.forEach(function(f) {
var signature = {
r: new BigInteger(f.signature.r),
s: new BigInteger(f.signature.s)
}
var signature = new Buffer(ecdsa.serializeSig(signature))
assert.equal(signature.toString('hex'), f.DER)
})
})
})
describe('parseSig', function() {
it('decodes the correct signature', function() {
fixtures.valid.forEach(function(f) {
var buffer = new Buffer(f.DER, 'hex')
var signature = ecdsa.parseSig(buffer)
assert.equal(signature.r.toString(), f.signature.r)
assert.equal(signature.s.toString(), f.signature.s)
})
})
fixtures.invalid.DER.forEach(function(f) {
it('throws on ' + f.hex, function() {
var buffer = new Buffer(f.hex, 'hex')
assert.throws(function() {
ecdsa.parseSig(buffer)
}, new RegExp(f.exception))
})
})
})
describe('serializeSigCompact', function() {
fixtures.valid.forEach(function(f) {
it('encodes ' + f.compact.hex + ' correctly', function() {
var signature = {
r: new BigInteger(f.signature.r),
s: new BigInteger(f.signature.s)
}
var i = f.compact.i
var compressed = f.compact.compressed
var signature = ecdsa.serializeSigCompact(signature, i, compressed)
assert.equal(signature.toString('hex'), f.compact.hex)
})
})
})
describe('parseSigCompact', function() {
fixtures.valid.forEach(function(f) {
it('decodes ' + f.compact.hex + ' correctly', function() {
var buffer = new Buffer(f.compact.hex, 'hex')
var parsed = ecdsa.parseSigCompact(buffer)
assert.equal(parsed.signature.r.toString(), f.signature.r)
assert.equal(parsed.signature.s.toString(), f.signature.s)
assert.equal(parsed.i, f.compact.i)
assert.equal(parsed.compressed, f.compact.compressed)
})
})
fixtures.invalid.compact.forEach(function(f) {
it('throws on ' + f.hex, function() {
var buffer = new Buffer(f.hex, 'hex')
assert.throws(function() {
ecdsa.parseSigCompact(buffer)
}, new RegExp(f.exception))
})
})
})
})