From 9589fa0b524a80fe26b34e46da57285ea08564d0 Mon Sep 17 00:00:00 2001 From: evilaliv3 Date: Fri, 25 Dec 2015 01:19:59 +0100 Subject: [PATCH] Apply mixed code review thanks to webstorm inspector --- src/cleartext.js | 2 +- src/crypto/cipher/des.js | 9 +++++---- src/crypto/hash/ripe-md.js | 4 ++-- src/crypto/public_key/rsa.js | 6 +++--- src/encoding/armor.js | 2 +- src/message.js | 12 ++++-------- src/packet/all_packets.js | 2 +- 7 files changed, 17 insertions(+), 20 deletions(-) diff --git a/src/cleartext.js b/src/cleartext.js index ed8e4746..489b1d2c 100644 --- a/src/cleartext.js +++ b/src/cleartext.js @@ -176,7 +176,7 @@ function verifyHeaders(headers, packetlist) { } } return true; - } + }; var oneHeader = null; var hashAlgos = []; for (var i = 0; i < headers.length; i++) { diff --git a/src/crypto/cipher/des.js b/src/crypto/cipher/des.js index 6ce3ba47..3110131c 100644 --- a/src/crypto/cipher/des.js +++ b/src/crypto/cipher/des.js @@ -101,8 +101,8 @@ function des(keys, message, encrypt, mode, iv, padding) { } //store the result here - result = ""; - tempresult = ""; + var result = ""; + var tempresult = ""; if (mode == 1) { //CBC mode cbcleft = (iv.charCodeAt(m++) << 24) | (iv.charCodeAt(m++) << 16) | (iv.charCodeAt(m++) << 8) | iv.charCodeAt(m++); @@ -231,6 +231,7 @@ function des(keys, message, encrypt, mode, iv, padding) { function des_createKeys(key) { //declaring this locally speeds things up a bit + var pc2bytes0; pc2bytes0 = new Array(0, 0x4, 0x20000000, 0x20000004, 0x10000, 0x10004, 0x20010000, 0x20010004, 0x200, 0x204, 0x20000200, 0x20000204, 0x10200, 0x10204, 0x20010200, 0x20010204); pc2bytes1 = new Array(0, 0x1, 0x100000, 0x100001, 0x4000000, 0x4000001, 0x4100000, 0x4100001, 0x100, 0x101, 0x100100, @@ -271,8 +272,8 @@ function des_createKeys(key) { temp; for (var j = 0; j < iterations; j++) { //either 1 or 3 iterations - left = (key.charCodeAt(m++) << 24) | (key.charCodeAt(m++) << 16) | (key.charCodeAt(m++) << 8) | key.charCodeAt(m++); - right = (key.charCodeAt(m++) << 24) | (key.charCodeAt(m++) << 16) | (key.charCodeAt(m++) << 8) | key.charCodeAt(m++); + var left = (key.charCodeAt(m++) << 24) | (key.charCodeAt(m++) << 16) | (key.charCodeAt(m++) << 8) | key.charCodeAt(m++); + var right = (key.charCodeAt(m++) << 24) | (key.charCodeAt(m++) << 16) | (key.charCodeAt(m++) << 8) | key.charCodeAt(m++); temp = ((left >>> 4) ^ right) & 0x0f0f0f0f; right ^= temp; diff --git a/src/crypto/hash/ripe-md.js b/src/crypto/hash/ripe-md.js index c6275588..7322e9f1 100644 --- a/src/crypto/hash/ripe-md.js +++ b/src/crypto/hash/ripe-md.js @@ -145,8 +145,8 @@ var indexes = [ ]; function compress(MDbuf, X) { - blockA = []; - blockB = []; + var blockA = []; + var blockB = []; var retBlock; diff --git a/src/crypto/public_key/rsa.js b/src/crypto/public_key/rsa.js index b8e5518e..8f6c1d5c 100644 --- a/src/crypto/public_key/rsa.js +++ b/src/crypto/public_key/rsa.js @@ -151,7 +151,7 @@ function RSA() { keyGenOpt = { name: 'RSA-OAEP', modulusLength: B, // the specified keysize in bits - publicExponent: Euint8.subarray(0, 3), // take three bytes (max 65537) + publicExponent: Euint8.subarray(0, 3) // take three bytes (max 65537) }; keys = webCrypto.generateKey(keyGenOpt, true, ['encrypt', 'decrypt']); } @@ -214,10 +214,10 @@ function RSA() { return new Promise(function(resolve, reject) { keyop.onerror = function (err) { reject(new Error(errmsg)); - } + }; keyop.oncomplete = function (e) { resolve(e.target.result); - } + }; }); } diff --git a/src/encoding/armor.js b/src/encoding/armor.js index 567a8a1c..ca59bbab 100644 --- a/src/encoding/armor.js +++ b/src/encoding/armor.js @@ -241,7 +241,7 @@ function splitHeaders(text) { function verifyHeaders(headers) { for (var i = 0; i < headers.length; i++) { if (!headers[i].match(/^(Version|Comment|MessageID|Hash|Charset): .+$/)) { - throw new Error('Improperly formatted armor header: ' + headers[i]);; + throw new Error('Improperly formatted armor header: ' + headers[i]); } } } diff --git a/src/message.js b/src/message.js index 2f73f969..aa41ec92 100644 --- a/src/message.js +++ b/src/message.js @@ -345,8 +345,7 @@ function readArmored(armoredText) { var input = armor.decode(armoredText).data; var packetlist = new packet.List(); packetlist.read(input); - var newMessage = new Message(packetlist); - return newMessage; + return new Message(packetlist); } /** @@ -361,8 +360,7 @@ function readSignedContent(content, detachedSignature) { packetlist.push(literalDataPacket); var input = armor.decode(detachedSignature).data; packetlist.read(input); - var newMessage = new Message(packetlist); - return newMessage; + return new Message(packetlist); } /** @@ -377,8 +375,7 @@ function fromText(text) { literalDataPacket.setText(text); var literalDataPacketlist = new packet.List(); literalDataPacketlist.push(literalDataPacket); - var newMessage = new Message(literalDataPacketlist); - return newMessage; + return new Message(literalDataPacketlist); } /** @@ -392,8 +389,7 @@ function fromBinary(bytes) { literalDataPacket.setBytes(bytes, enums.read(enums.literal, enums.literal.binary)); var literalDataPacketlist = new packet.List(); literalDataPacketlist.push(literalDataPacket); - var newMessage = new Message(literalDataPacketlist); - return newMessage; + return new Message(literalDataPacketlist); } exports.Message = Message; diff --git a/src/packet/all_packets.js b/src/packet/all_packets.js index bf8a6c94..37921a00 100644 --- a/src/packet/all_packets.js +++ b/src/packet/all_packets.js @@ -54,7 +54,7 @@ module.exports = { * @returns {Object} new packet object with data from packet clone */ fromStructuredClone: function(packetClone) { - var tagName = enums.read(enums.packet, packetClone.tag) + var tagName = enums.read(enums.packet, packetClone.tag); var packet = this.newPacketFromTag(tagName); for (var attr in packetClone) { if (packetClone.hasOwnProperty(attr)) {