From 726e4c53b66a68bc52d57e49a168615dd013cbfb Mon Sep 17 00:00:00 2001 From: Daniel Cousens Date: Tue, 5 Jun 2018 17:15:53 +1000 Subject: [PATCH] script: use ecc.isPoint for canonical public keys --- src/script.js | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/script.js b/src/script.js index 2860d66..6094589 100644 --- a/src/script.js +++ b/src/script.js @@ -1,5 +1,6 @@ var Buffer = require('safe-buffer').Buffer var bip66 = require('bip66') +let ecc = require('tiny-secp256k1') var pushdata = require('pushdata-bitcoin') var typeforce = require('typeforce') var types = require('./types') @@ -170,18 +171,7 @@ function toStack (chunks) { } function isCanonicalPubKey (buffer) { - if (!Buffer.isBuffer(buffer)) return false - if (buffer.length < 33) return false - - switch (buffer[0]) { - case 0x02: - case 0x03: - return buffer.length === 33 - case 0x04: - return buffer.length === 65 - } - - return false + return ecc.isPoint(buffer) } function isDefinedHashType (hashType) {