X-Git-Url: http://git.squeep.com/?p=squeep-mystery-box;a=blobdiff_plain;f=lib%2Fmystery-box.js;fp=lib%2Fmystery-box.js;h=55967ee2269f00bc97057f7139269ba1491157bb;hp=05fe28f72c872ac80b0604af4d15bbe8f52e069f;hb=1cbcff24343426923a4329a1d1ecb797050fee9c;hpb=e132bd4b4189689eb5901e6507b4a1a1896182bd diff --git a/lib/mystery-box.js b/lib/mystery-box.js index 05fe28f..55967ee 100644 --- a/lib/mystery-box.js +++ b/lib/mystery-box.js @@ -3,7 +3,6 @@ const crypto = require('crypto'); const zlib = require('zlib'); const { promisify } = require('util'); -const { base64ToBase64URL, base64URLToBase64 } = require('@squeep/base64url'); const common = require('./common'); const allVersions = require('./version-parameters'); const { performance } = require('perf_hooks'); @@ -221,8 +220,7 @@ class MysteryBox { const final = cipher.final(); const tag = cipher.getAuthTag(); - const merged = Buffer.concat([versionBuffer, flagsBuffer, iv, salt, tag, encrypted, final]).toString('base64'); - const result = base64ToBase64URL(merged); + const result = Buffer.concat([versionBuffer, flagsBuffer, iv, salt, tag, encrypted, final]).toString('base64url'); timingsMs.end = timingsMs.postCrypt = performance.now(); this.logger.debug(_scope, 'statistics', { version, flags: this._prettyFlags(flags), serialized: contents.length, compressed: payload.length, encoded: result.length, ...MysteryBox._timingsLog(timingsMs) }); @@ -251,7 +249,7 @@ class MysteryBox { throw new RangeError('nothing to unpack'); } - const raw = Buffer.from(base64URLToBase64(box), 'base64'); + const raw = Buffer.from(box, 'base64url'); let offset = 0; const version = raw.subarray(offset, 1).readUInt8(0);