Apply mixed code review thanks to webstorm inspector
This commit is contained in:
parent
85efb463cf
commit
9589fa0b52
|
@ -176,7 +176,7 @@ function verifyHeaders(headers, packetlist) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
};
|
||||||
var oneHeader = null;
|
var oneHeader = null;
|
||||||
var hashAlgos = [];
|
var hashAlgos = [];
|
||||||
for (var i = 0; i < headers.length; i++) {
|
for (var i = 0; i < headers.length; i++) {
|
||||||
|
|
|
@ -101,8 +101,8 @@ function des(keys, message, encrypt, mode, iv, padding) {
|
||||||
}
|
}
|
||||||
|
|
||||||
//store the result here
|
//store the result here
|
||||||
result = "";
|
var result = "";
|
||||||
tempresult = "";
|
var tempresult = "";
|
||||||
|
|
||||||
if (mode == 1) { //CBC mode
|
if (mode == 1) { //CBC mode
|
||||||
cbcleft = (iv.charCodeAt(m++) << 24) | (iv.charCodeAt(m++) << 16) | (iv.charCodeAt(m++) << 8) | iv.charCodeAt(m++);
|
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) {
|
function des_createKeys(key) {
|
||||||
//declaring this locally speeds things up a bit
|
//declaring this locally speeds things up a bit
|
||||||
|
var pc2bytes0;
|
||||||
pc2bytes0 = new Array(0, 0x4, 0x20000000, 0x20000004, 0x10000, 0x10004, 0x20010000, 0x20010004, 0x200, 0x204,
|
pc2bytes0 = new Array(0, 0x4, 0x20000000, 0x20000004, 0x10000, 0x10004, 0x20010000, 0x20010004, 0x200, 0x204,
|
||||||
0x20000200, 0x20000204, 0x10200, 0x10204, 0x20010200, 0x20010204);
|
0x20000200, 0x20000204, 0x10200, 0x10204, 0x20010200, 0x20010204);
|
||||||
pc2bytes1 = new Array(0, 0x1, 0x100000, 0x100001, 0x4000000, 0x4000001, 0x4100000, 0x4100001, 0x100, 0x101, 0x100100,
|
pc2bytes1 = new Array(0, 0x1, 0x100000, 0x100001, 0x4000000, 0x4000001, 0x4100000, 0x4100001, 0x100, 0x101, 0x100100,
|
||||||
|
@ -271,8 +272,8 @@ function des_createKeys(key) {
|
||||||
temp;
|
temp;
|
||||||
|
|
||||||
for (var j = 0; j < iterations; j++) { //either 1 or 3 iterations
|
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++);
|
var 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 right = (key.charCodeAt(m++) << 24) | (key.charCodeAt(m++) << 16) | (key.charCodeAt(m++) << 8) | key.charCodeAt(m++);
|
||||||
|
|
||||||
temp = ((left >>> 4) ^ right) & 0x0f0f0f0f;
|
temp = ((left >>> 4) ^ right) & 0x0f0f0f0f;
|
||||||
right ^= temp;
|
right ^= temp;
|
||||||
|
|
|
@ -145,8 +145,8 @@ var indexes = [
|
||||||
];
|
];
|
||||||
|
|
||||||
function compress(MDbuf, X) {
|
function compress(MDbuf, X) {
|
||||||
blockA = [];
|
var blockA = [];
|
||||||
blockB = [];
|
var blockB = [];
|
||||||
|
|
||||||
var retBlock;
|
var retBlock;
|
||||||
|
|
||||||
|
|
|
@ -151,7 +151,7 @@ function RSA() {
|
||||||
keyGenOpt = {
|
keyGenOpt = {
|
||||||
name: 'RSA-OAEP',
|
name: 'RSA-OAEP',
|
||||||
modulusLength: B, // the specified keysize in bits
|
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']);
|
keys = webCrypto.generateKey(keyGenOpt, true, ['encrypt', 'decrypt']);
|
||||||
}
|
}
|
||||||
|
@ -214,10 +214,10 @@ function RSA() {
|
||||||
return new Promise(function(resolve, reject) {
|
return new Promise(function(resolve, reject) {
|
||||||
keyop.onerror = function (err) {
|
keyop.onerror = function (err) {
|
||||||
reject(new Error(errmsg));
|
reject(new Error(errmsg));
|
||||||
}
|
};
|
||||||
keyop.oncomplete = function (e) {
|
keyop.oncomplete = function (e) {
|
||||||
resolve(e.target.result);
|
resolve(e.target.result);
|
||||||
}
|
};
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -241,7 +241,7 @@ function splitHeaders(text) {
|
||||||
function verifyHeaders(headers) {
|
function verifyHeaders(headers) {
|
||||||
for (var i = 0; i < headers.length; i++) {
|
for (var i = 0; i < headers.length; i++) {
|
||||||
if (!headers[i].match(/^(Version|Comment|MessageID|Hash|Charset): .+$/)) {
|
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]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -345,8 +345,7 @@ function readArmored(armoredText) {
|
||||||
var input = armor.decode(armoredText).data;
|
var input = armor.decode(armoredText).data;
|
||||||
var packetlist = new packet.List();
|
var packetlist = new packet.List();
|
||||||
packetlist.read(input);
|
packetlist.read(input);
|
||||||
var newMessage = new Message(packetlist);
|
return new Message(packetlist);
|
||||||
return newMessage;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -361,8 +360,7 @@ function readSignedContent(content, detachedSignature) {
|
||||||
packetlist.push(literalDataPacket);
|
packetlist.push(literalDataPacket);
|
||||||
var input = armor.decode(detachedSignature).data;
|
var input = armor.decode(detachedSignature).data;
|
||||||
packetlist.read(input);
|
packetlist.read(input);
|
||||||
var newMessage = new Message(packetlist);
|
return new Message(packetlist);
|
||||||
return newMessage;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -377,8 +375,7 @@ function fromText(text) {
|
||||||
literalDataPacket.setText(text);
|
literalDataPacket.setText(text);
|
||||||
var literalDataPacketlist = new packet.List();
|
var literalDataPacketlist = new packet.List();
|
||||||
literalDataPacketlist.push(literalDataPacket);
|
literalDataPacketlist.push(literalDataPacket);
|
||||||
var newMessage = new Message(literalDataPacketlist);
|
return new Message(literalDataPacketlist);
|
||||||
return newMessage;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -392,8 +389,7 @@ function fromBinary(bytes) {
|
||||||
literalDataPacket.setBytes(bytes, enums.read(enums.literal, enums.literal.binary));
|
literalDataPacket.setBytes(bytes, enums.read(enums.literal, enums.literal.binary));
|
||||||
var literalDataPacketlist = new packet.List();
|
var literalDataPacketlist = new packet.List();
|
||||||
literalDataPacketlist.push(literalDataPacket);
|
literalDataPacketlist.push(literalDataPacket);
|
||||||
var newMessage = new Message(literalDataPacketlist);
|
return new Message(literalDataPacketlist);
|
||||||
return newMessage;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
exports.Message = Message;
|
exports.Message = Message;
|
||||||
|
|
|
@ -54,7 +54,7 @@ module.exports = {
|
||||||
* @returns {Object} new packet object with data from packet clone
|
* @returns {Object} new packet object with data from packet clone
|
||||||
*/
|
*/
|
||||||
fromStructuredClone: function(packetClone) {
|
fromStructuredClone: function(packetClone) {
|
||||||
var tagName = enums.read(enums.packet, packetClone.tag)
|
var tagName = enums.read(enums.packet, packetClone.tag);
|
||||||
var packet = this.newPacketFromTag(tagName);
|
var packet = this.newPacketFromTag(tagName);
|
||||||
for (var attr in packetClone) {
|
for (var attr in packetClone) {
|
||||||
if (packetClone.hasOwnProperty(attr)) {
|
if (packetClone.hasOwnProperty(attr)) {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user