From eae044badea213c8ae5f25465d35ee3bb47e53f1 Mon Sep 17 00:00:00 2001 From: Micooz Date: Thu, 14 Sep 2017 13:43:41 +0800 Subject: [PATCH] presets: minor fixes --- src/presets/aead-random-cipher.js | 2 +- src/presets/exp-base-auth-stream.js | 2 +- src/presets/ss-stream-cipher.js | 2 +- src/presets/stats.js | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/presets/aead-random-cipher.js b/src/presets/aead-random-cipher.js index 551604a..cd1a3f5 100644 --- a/src/presets/aead-random-cipher.js +++ b/src/presets/aead-random-cipher.js @@ -31,7 +31,7 @@ const HKDF_HASH_ALGORITHM = 'sha1'; * * @params * method: The encryption/decryption method. - * info: An info for HKDF. + * info(optional): An info for HKDF. * factor(optional): Expand random padding length(0-255) by factor times. It must be in [1, 10]. Default is 2. * * @examples diff --git a/src/presets/exp-base-auth-stream.js b/src/presets/exp-base-auth-stream.js index a22c875..01629f6 100644 --- a/src/presets/exp-base-auth-stream.js +++ b/src/presets/exp-base-auth-stream.js @@ -104,7 +104,7 @@ export default class ExpBaseAuthStreamPreset extends IPreset { // prepare const iv = crypto.randomBytes(IV_LEN); const secretKey = ExpBaseAuthStreamPreset.key; - const keyForHMAC = xor(iv, keyForEncryption.slice(0, IV_LEN)); + const keyForHMAC = xor(iv, secretKey.slice(0, IV_LEN)); // initialize cipher/decipher this._cipher = crypto.createCipheriv(ExpBaseAuthStreamPreset.cipherName, secretKey, iv); diff --git a/src/presets/ss-stream-cipher.js b/src/presets/ss-stream-cipher.js index 0969a3c..5b81c15 100644 --- a/src/presets/ss-stream-cipher.js +++ b/src/presets/ss-stream-cipher.js @@ -94,7 +94,7 @@ export default class SsStreamCipherPreset extends IPreset { beforeIn({buffer, fail}) { if (!this._decipher) { if (buffer.length < IV_LEN) { - return fail(`cannot get iv, buffer is too short(${buffer.length}bytes): ${buffer.toString('hex')}`); + return fail(`buffer is too short ${buffer.length} bytes to get iv, dump=${buffer.toString('hex')}`); } const iv = buffer.slice(0, IV_LEN); this._decipher = crypto.createDecipheriv(SsStreamCipherPreset.cipherName, SsStreamCipherPreset.key, iv); diff --git a/src/presets/stats.js b/src/presets/stats.js index 814eaac..333eeb4 100644 --- a/src/presets/stats.js +++ b/src/presets/stats.js @@ -100,8 +100,8 @@ export default class StatsPreset extends IPresetStatic { if (!Number.isSafeInteger(save_interval)) { throw Error('\'save_interval\' must be an integer'); } - if (save_interval < 5) { - throw Error('\'save_interval\' must be greater than 5'); + if (save_interval < 1) { + throw Error('\'save_interval\' must be greater than 0'); } }