X-Git-Url: http://git.squeep.com/?p=squeep-mystery-box;a=blobdiff_plain;f=lib%2Fmystery-box.js;h=2343c5e164f79f9d04629a97c366a1fbd0f58595;hp=6198cc816484b406804cf4a4cdd3c84685bce60e;hb=b9782b5dfca21a6da610eebf8bd7207f10256fbf;hpb=66aef7be7b8e05e9ea0de1a904e1f66a86006e6d diff --git a/lib/mystery-box.js b/lib/mystery-box.js index 6198cc8..2343c5e 100644 --- a/lib/mystery-box.js +++ b/lib/mystery-box.js @@ -3,6 +3,7 @@ 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'); @@ -183,7 +184,7 @@ class MysteryBox { const tag = cipher.getAuthTag(); const merged = Buffer.concat([versionBuffer, flagsBuffer, iv, salt, tag, encrypted, final]).toString('base64'); - const result = common.base64ToBase64URL(merged); + const result = base64ToBase64URL(merged); 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) }); @@ -212,7 +213,7 @@ class MysteryBox { throw new RangeError('nothing to unpack'); } - const raw = Buffer.from(common.base64URLToBase64(box), 'base64'); + const raw = Buffer.from(base64URLToBase64(box), 'base64'); let offset = 0; const version = raw.slice(offset, 1).readUInt8(0);