diff --git a/sea/verify.js b/sea/verify.js index 1946f6b5..f55d122a 100644 --- a/sea/verify.js +++ b/sea/verify.js @@ -9,7 +9,7 @@ SEA.verify = SEA.verify || (async (data, pair, cb, opt) => { try { const json = parse(data) if(false === pair){ // don't verify! - const raw = (json !== data)? + const raw = (json !== data)? (json.s && json.m)? parse(json.m) : data : json; if(cb){ try{ cb(raw) }catch(e){console.log(e)} } @@ -22,9 +22,18 @@ const jwk = S.jwk(pub) const key = await (shim.ossl || shim.subtle).importKey('jwk', jwk, S.ecdsa.pair, false, ['verify']) const hash = await sha256hash(json.m) - const sig = new Uint8Array(shim.Buffer.from(json.s, 'utf8')) - const check = await (shim.ossl || shim.subtle).verify(S.ecdsa.sign, key, sig, new Uint8Array(hash)) - if(!check){ throw "Signature did not match." } + var buf; var sig; var check; try{ + buf = shim.Buffer.from(json.s, opt.encode || 'base64') // NEW DEFAULT! + sig = new Uint8Array(buf) + check = await (shim.ossl || shim.subtle).verify(S.ecdsa.sign, key, sig, new Uint8Array(hash)) + if(!check){ throw "Signature did not match." } + }catch(e){ + buf = shim.Buffer.from(json.s, 'utf8') // AUTO BACKWARD OLD UTF8 DATA! + sig = new Uint8Array(buf) + check = await (shim.ossl || shim.subtle).verify(S.ecdsa.sign, key, sig, new Uint8Array(hash)) + if(!check){ throw "Signature did not match." } + } + const r = check? parse(json.m) : u; if(cb){ try{ cb(r) }catch(e){console.log(e)} } @@ -32,9 +41,9 @@ } catch(e) { console.log(e); // mismatched owner FOR MARTTI SEA.err = e; + if(SEA.throw){ throw e } if(cb){ cb() } return; }}); module.exports = SEA.verify; - \ No newline at end of file