RanchiMall/fcoin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bip151: use buffer pool.

Browse Source
This commit is contained in:
Christopher Jeffrey 2017-09-04 13:00:11 -07:00
parent 7e456595de
commit a2c3e70f09
No known key found for this signature in database
GPG Key ID: 8962AB9DE6666BBD
1 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lib/net/bip151.js
View File

@ -47,7 +47,6 @@ const HIGH_WATERMARK = 1024 * (1 << 20);
* @property {Buffer} publicKey * @property {Buffer} publicKey
* @property {Buffer} privateKey * @property {Buffer} privateKey
* @property {Number} cipher * @property {Number} cipher
* @property {Buffer} prk
* @property {Buffer} k1 * @property {Buffer} k1
* @property {Buffer} k2 * @property {Buffer} k2
* @property {Buffer} sid * @property {Buffer} sid
@ -66,8 +65,6 @@ function BIP151Stream(cipher) {
this.cipher = BIP151.ciphers.CHACHAPOLY; this.cipher = BIP151.ciphers.CHACHAPOLY;
this.privateKey = secp256k1.generatePrivateKey(); this.privateKey = secp256k1.generatePrivateKey();
this.publicKey = null; this.publicKey = null;
this.secret = null;
this.prk = null;
this.k1 = null; this.k1 = null;
this.k2 = null; this.k2 = null;
this.sid = null; this.sid = null;
@ -95,18 +92,23 @@ function BIP151Stream(cipher) {
*/ */
BIP151Stream.prototype.init = function init(publicKey) { BIP151Stream.prototype.init = function init(publicKey) {
const bw = new StaticWriter(33); assert(Buffer.isBuffer(publicKey));
this.publicKey = publicKey; this.publicKey = publicKey;
this.secret = secp256k1.ecdh(this.publicKey, this.privateKey);
bw.writeBytes(this.secret); const secret = secp256k1.ecdh(this.publicKey, this.privateKey);
const bw = StaticWriter.pool(33);
bw.writeBytes(secret);
bw.writeU8(this.cipher); bw.writeU8(this.cipher);
this.prk = hkdf.extract(bw.render(), HKDF_SALT, 'sha256'); const data = bw.render();
this.k1 = hkdf.expand(this.prk, INFO_KEY1, 32, 'sha256'); const prk = hkdf.extract(data, HKDF_SALT, 'sha256');
this.k2 = hkdf.expand(this.prk, INFO_KEY2, 32, 'sha256');
this.sid = hkdf.expand(this.prk, INFO_SID, 32, 'sha256'); this.k1 = hkdf.expand(prk, INFO_KEY1, 32, 'sha256');
this.k2 = hkdf.expand(prk, INFO_KEY2, 32, 'sha256');
this.sid = hkdf.expand(prk, INFO_SID, 32, 'sha256');
this.seq = 0; this.seq = 0;
@ -146,18 +148,11 @@ BIP151Stream.prototype.shouldRekey = function shouldRekey(packet) {
*/ */
BIP151Stream.prototype.rekey = function rekey(k1, k2) { BIP151Stream.prototype.rekey = function rekey(k1, k2) {
assert(this.prk, 'Cannot rekey before initialization.'); assert(this.sid, 'Cannot rekey before initialization.');
if (!k1) { if (!k1) {
const seed = Buffer.allocUnsafe(64); this.k1 = digest.root256(this.sid, this.k1);
this.k2 = digest.root256(this.sid, this.k2);
this.sid.copy(seed, 0);
this.k1.copy(seed, 32);
this.k1 = digest.hash256(seed);
this.k2.copy(seed, 32);
this.k2 = digest.hash256(seed);
} else { } else {
this.k1 = k1; this.k1 = k1;
this.k2 = k2; this.k2 = k2;
@ -389,7 +384,7 @@ BIP151.prototype.toEncinit = function toEncinit() {
*/ */
BIP151.prototype.toEncack = function toEncack() { BIP151.prototype.toEncack = function toEncack() {
assert(this.output.prk, 'Cannot ack before init.'); assert(this.output.sid, 'Cannot ack before init.');
assert(!this.ackSent, 'Cannot ack twice.'); assert(!this.ackSent, 'Cannot ack twice.');
this.ackSent = true; this.ackSent = true;