From dec8352745aad09ca641ba6bbb28e80fdf400b6a Mon Sep 17 00:00:00 2001 From: "dusan.drabik" Date: Tue, 12 Mar 2019 19:42:24 +0100 Subject: [PATCH 1/2] Fix DW-519 signing nonce to buffer fix --- package.json | 2 +- src/ecc/src/ecdsa.js | 8 ++++---- src/serializer/src/FastParser.js | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index c0b8df3..ccbb131 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "ReconnectingWebSocket": "git+https://github.com/bitshares/reconnecting-websocket.git", "bigi": "^1.4.1", "bs58": "^3.1.0", - "bytebuffer": "^5.0.0", + "bytebuffer": "^5.0.1", "create-hash": "^1.1.2", "create-hmac": "^1.1.4", "crypto-js": "^3.1.9-1", diff --git a/src/ecc/src/ecdsa.js b/src/ecc/src/ecdsa.js index 762f94e..68e5858 100644 --- a/src/ecc/src/ecdsa.js +++ b/src/ecc/src/ecdsa.js @@ -12,7 +12,7 @@ function deterministicGenerateK(curve, hash, d, checkSig, nonce) { enforceType(BigInteger, d); if (nonce) { - hash = sha256(Buffer.concat([hash, Buffer.from(nonce)])) + hash = sha256(Buffer.concat([hash, Buffer.from([nonce+''])])) } // sanity check @@ -29,13 +29,13 @@ function deterministicGenerateK(curve, hash, d, checkSig, nonce) { k.fill(0); // Step D - k = HmacSHA256(Buffer.concat([v, Buffer.from([0]), x, hash]), k); + k = HmacSHA256(Buffer.concat([v, Buffer.from([0+'']), x, hash]), k); // Step E v = HmacSHA256(v, k); // Step F - k = HmacSHA256(Buffer.concat([v, Buffer.from([1]), x, hash]), k); + k = HmacSHA256(Buffer.concat([v, Buffer.from([1+'']), x, hash]), k); // Step G v = HmacSHA256(v, k); @@ -48,7 +48,7 @@ function deterministicGenerateK(curve, hash, d, checkSig, nonce) { // Step H3, repeat until T is within the interval [1, n - 1] while ((T.signum() <= 0) || (T.compareTo(curve.n) >= 0) || !checkSig(T)) { - k = HmacSHA256(Buffer.concat([v, Buffer.from([0])]), k); + k = HmacSHA256(Buffer.concat([v, Buffer.from([0+''])]), k); v = HmacSHA256(v, k); // Step H1/H2a, again, ignored as tlen === qlen (256 bit) diff --git a/src/serializer/src/FastParser.js b/src/serializer/src/FastParser.js index e6ca24c..23cb971 100644 --- a/src/serializer/src/FastParser.js +++ b/src/serializer/src/FastParser.js @@ -28,7 +28,7 @@ class FastParser { let buffer = public_key.toBuffer(); b.append(buffer.toString('binary'), 'binary'); } else { - buffer = FastParser.fixed_data(b, 33); + let buffer = FastParser.fixed_data(b, 33); return PublicKey.fromBuffer(buffer); } } From 65d0709c1e29d3c34d565e20f998333edeb9326f Mon Sep 17 00:00:00 2001 From: "dusan.drabik" Date: Thu, 21 Mar 2019 22:00:57 +0100 Subject: [PATCH 2/2] 1.6.1 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index c624204..f068fb3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "dcorejs-lib", - "version": "1.6.0", + "version": "1.6.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index ccbb131..c4fda13 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dcorejs-lib", - "version": "1.6.0", + "version": "1.6.1", "description": "Low level javascript library for Decent blockchain", "browser": { "ws": false,