Merge branch 'dangerpriv' of github.com:dcousens/bitcoinjs-lib into dcousens-dangerpriv
This commit is contained in:
Wei Lu
commit
06b6112d58
1 changed files with 81 additions and 75 deletions
156
src/eckey.js
156
src/eckey.js
|
|
@ -1,62 +1,68 @@
|
|||
var BigInteger = require('./jsbn/jsbn');
|
||||
var sec = require('./jsbn/sec');
|
||||
var base58 = require('./base58');
|
||||
var util = require('./util');
|
||||
var convert = require('./convert');
|
||||
var Address = require('./address');
|
||||
var ecdsa = require('./ecdsa');
|
||||
var ECPointFp = require('./jsbn/ec').ECPointFp;
|
||||
var Address = require('./address')
|
||||
var assert = require('assert')
|
||||
var convert = require('./convert')
|
||||
var base58 = require('./base58')
|
||||
var BigInteger = require('./jsbn/jsbn')
|
||||
var ecdsa = require('./ecdsa')
|
||||
var ECPointFp = require('./jsbn/ec').ECPointFp
|
||||
var sec = require('./jsbn/sec')
|
||||
var Network = require('./network')
|
||||
var util = require('./util')
|
||||
|
||||
var ecparams = sec("secp256k1");
|
||||
var ecparams = sec("secp256k1")
|
||||
|
||||
// input can be nothing, array of bytes, hex string, or base58 string
|
||||
var ECKey = function (input, compressed) {
|
||||
if (!(this instanceof ECKey)) { return new ECKey(input, compressed); }
|
||||
if (!input) {
|
||||
// Generate new key
|
||||
var n = ecparams.getN();
|
||||
this.priv = ecdsa.getBigRandom(n);
|
||||
this.compressed = compressed || false;
|
||||
}
|
||||
else this.import(input,compressed)
|
||||
};
|
||||
if (!(this instanceof ECKey)) { return new ECKey(input, compressed) }
|
||||
if (!input) {
|
||||
// Generate new key
|
||||
var n = ecparams.getN()
|
||||
this.priv = ecdsa.getBigRandom(n)
|
||||
this.compressed = compressed || false
|
||||
}
|
||||
else this.import(input,compressed)
|
||||
}
|
||||
|
||||
ECKey.prototype.import = function (input,compressed) {
|
||||
function has(li,v) { return li.indexOf(v) >= 0 }
|
||||
function fromBin(x) { return BigInteger.fromByteArrayUnsigned(x) }
|
||||
this.priv =
|
||||
input instanceof ECKey ? input.priv
|
||||
: input instanceof BigInteger ? input.mod(ecparams.getN())
|
||||
: Array.isArray(input) ? fromBin(input.slice(0,32))
|
||||
: typeof input != "string" ? null
|
||||
: input.length == 44 ? fromBin(convert.base64ToBytes(input))
|
||||
: input.length == 51 && input[0] == '5' ? fromBin(base58.checkDecode(input))
|
||||
: input.length == 51 && input[0] == '9' ? fromBin(base58.checkDecode(input))
|
||||
: input.length == 52 && has('LK',input[0]) ? fromBin(base58.checkDecode(input).slice(0,32))
|
||||
: input.length == 52 && input[0] == 'c' ? fromBin(base58.checkDecode(input).slice(0,32))
|
||||
: has([64,65],input.length) ? fromBin(convert.hexToBytes(input.slice(0,64)))
|
||||
: null
|
||||
ECKey.prototype.import = function (input, compressed) {
|
||||
function has(li, v) { return li.indexOf(v) >= 0 }
|
||||
function fromBin(x) { return BigInteger.fromByteArrayUnsigned(x) }
|
||||
|
||||
this.compressed =
|
||||
compressed !== undefined ? compressed
|
||||
: input instanceof ECKey ? input.compressed
|
||||
: input instanceof BigInteger ? false
|
||||
: Array.isArray(input) ? false
|
||||
: typeof input != "string" ? null
|
||||
: input.length == 44 ? false
|
||||
: input.length == 51 && input[0] == '5' ? false
|
||||
: input.length == 51 && input[0] == '9' ? false
|
||||
: input.length == 52 && has('LK',input[0]) ? true
|
||||
: input.length == 52 && input[0] == 'c' ? true
|
||||
: input.length == 64 ? false
|
||||
: input.length == 65 ? true
|
||||
: null
|
||||
};
|
||||
this.priv =
|
||||
input instanceof ECKey ? input.priv
|
||||
: input instanceof BigInteger ? input.mod(ecparams.getN())
|
||||
: Array.isArray(input) ? fromBin(input.slice(0, 32))
|
||||
: typeof input != "string" ? null
|
||||
: input.length == 44 ? fromBin(convert.base64ToBytes(input))
|
||||
: input.length == 51 && input[0] == '5' ? fromBin(base58.checkDecode(input))
|
||||
: input.length == 51 && input[0] == '9' ? fromBin(base58.checkDecode(input))
|
||||
: input.length == 52 && has('LK', input[0]) ? fromBin(base58.checkDecode(input).slice(0, 32))
|
||||
: input.length == 52 && input[0] == 'c' ? fromBin(base58.checkDecode(input).slice(0, 32))
|
||||
: has([64,65],input.length) ? fromBin(convert.hexToBytes(input.slice(0, 64)))
|
||||
: null
|
||||
|
||||
assert(this.priv !== null)
|
||||
|
||||
this.compressed =
|
||||
compressed !== undefined ? compressed
|
||||
: input instanceof ECKey ? input.compressed
|
||||
: input instanceof BigInteger ? false
|
||||
: Array.isArray(input) ? false
|
||||
: typeof input != "string" ? null
|
||||
: input.length == 44 ? false
|
||||
: input.length == 51 && input[0] == '5' ? false
|
||||
: input.length == 51 && input[0] == '9' ? false
|
||||
: input.length == 52 && has('LK', input[0]) ? true
|
||||
: input.length == 52 && input[0] == 'c' ? true
|
||||
: input.length == 64 ? false
|
||||
: input.length == 65 ? true
|
||||
: null
|
||||
|
||||
assert(this.compressed !== null)
|
||||
}
|
||||
|
||||
ECKey.prototype.getPub = function(compressed) {
|
||||
if (compressed === undefined) compressed = this.compressed
|
||||
return ECPubKey(ecparams.getG().multiply(this.priv),compressed)
|
||||
return ECPubKey(ecparams.getG().multiply(this.priv), compressed)
|
||||
}
|
||||
|
||||
ECKey.prototype.toBin = function() {
|
||||
|
|
@ -95,11 +101,11 @@ ECKey.prototype.getAddress = function(version) {
|
|||
}
|
||||
|
||||
ECKey.prototype.add = function(key) {
|
||||
return ECKey(this.priv.add(ECKey(key).priv),this.compressed)
|
||||
return ECKey(this.priv.add(ECKey(key).priv), this.compressed)
|
||||
}
|
||||
|
||||
ECKey.prototype.multiply = function(key) {
|
||||
return ECKey(this.priv.multiply(ECKey(key).priv),this.compressed)
|
||||
return ECKey(this.priv.multiply(ECKey(key).priv), this.compressed)
|
||||
}
|
||||
|
||||
ECKey.prototype.sign = function(hash) {
|
||||
|
|
@ -111,39 +117,39 @@ ECKey.prototype.verify = function(hash, sig) {
|
|||
}
|
||||
|
||||
var ECPubKey = function(input, compressed) {
|
||||
if (!(this instanceof ECPubKey)) { return new ECPubKey(input, compressed); }
|
||||
if (!input) {
|
||||
// Generate new key
|
||||
var n = ecparams.getN();
|
||||
this.pub = ecparams.getG().multiply(ecdsa.getBigRandom(n))
|
||||
this.compressed = compressed || false;
|
||||
}
|
||||
else this.import(input,compressed)
|
||||
if (!(this instanceof ECPubKey)) {
|
||||
return new ECPubKey(input, compressed)
|
||||
}
|
||||
|
||||
this.import(input, compressed)
|
||||
}
|
||||
|
||||
ECPubKey.prototype.import = function(input,compressed) {
|
||||
var decode = function(x) { return ECPointFp.decodeFrom(ecparams.getCurve(), x) }
|
||||
this.pub =
|
||||
input instanceof ECPointFp ? input
|
||||
: input instanceof ECKey ? ecparams.getG().multiply(input.priv)
|
||||
: input instanceof ECPubKey ? input.pub
|
||||
: typeof input == "string" ? decode(convert.hexToBytes(input))
|
||||
: Array.isArray(input) ? decode(input)
|
||||
: ecparams.getG().multiply(ecdsa.getBigRandom(ecparams.getN()))
|
||||
ECPubKey.prototype.import = function(input, compressed) {
|
||||
var decode = function(x) { return ECPointFp.decodeFrom(ecparams.getCurve(), x) }
|
||||
|
||||
this.compressed =
|
||||
compressed ? compressed
|
||||
: input instanceof ECPointFp ? input.compressed
|
||||
: input instanceof ECPubKey ? input.compressed
|
||||
: (this.pub[0] < 4)
|
||||
this.pub =
|
||||
input instanceof ECPointFp ? input
|
||||
: input instanceof ECKey ? ecparams.getG().multiply(input.priv)
|
||||
: input instanceof ECPubKey ? input.pub
|
||||
: typeof input == "string" ? decode(convert.hexToBytes(input))
|
||||
: Array.isArray(input) ? decode(input)
|
||||
: null
|
||||
|
||||
assert(this.pub !== null)
|
||||
|
||||
this.compressed =
|
||||
compressed ? compressed
|
||||
: input instanceof ECPointFp ? input.compressed
|
||||
: input instanceof ECPubKey ? input.compressed
|
||||
: (this.pub[0] < 4)
|
||||
}
|
||||
|
||||
ECPubKey.prototype.add = function(key) {
|
||||
return ECPubKey(this.pub.add(ECPubKey(key).pub),this.compressed)
|
||||
return ECPubKey(this.pub.add(ECPubKey(key).pub), this.compressed)
|
||||
}
|
||||
|
||||
ECPubKey.prototype.multiply = function(key) {
|
||||
return ECPubKey(this.pub.multiply(ECKey(key).priv),this.compressed)
|
||||
return ECPubKey(this.pub.multiply(ECKey(key).priv), this.compressed)
|
||||
}
|
||||
|
||||
ECPubKey.prototype.toBytes = function(compressed) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue