Static analysis fixes

This commit is contained in:
Dennis Eichhorn 2018-09-23 14:49:56 +02:00
parent 2da76b689b
commit 4dee88645a
16 changed files with 56 additions and 38 deletions

View File

@ -6,8 +6,10 @@ SHA1 = function (l)
} }
l += '€'; l += '€';
for (var n = Math, c = [1518500249, 1859775393, 2400959708, 3395469782, 1732584193, 4023233417, 2562383102, 271733878, 3285377520, 4294967295], s = n.ceil(l.length / 4) + 2, q = n.ceil(s / 16), g = [], a = 0, h = [], j, d, e, f, m, i, b, k; a < q; a++) {
for (let n = Math, c = [1518500249, 1859775393, 2400959708, 3395469782, 1732584193, 4023233417, 2562383102, 271733878, 3285377520, 4294967295], s = n.ceil(l.length / 4) + 2, q = n.ceil(s / 16), g = [], a = 0, h = [], j, d, e, f, m, i, b, k; a < q; a++) {
g[a] = []; g[a] = [];
for (k = 0; k < 16; ++k) { for (k = 0; k < 16; ++k) {
function o(b, c) function o(b, c)
{ {
@ -17,42 +19,50 @@ SHA1 = function (l)
g[a][k] = o(0, 24) | o(1, 16) | o(2, 8) | o(3, 0) g[a][k] = o(0, 24) | o(1, 16) | o(2, 8) | o(3, 0)
} }
} }
i = l.length * 8 - 8;
a = q - 1; i = l.length * 8 - 8;
a = q - 1;
g[a][14] = i / (c[9] + 1); g[a][14] = i / (c[9] + 1);
g[a][14] = n.floor(g[a][14]); g[a][14] = n.floor(g[a][14]);
g[a][15] = i & c[9]; g[a][15] = i & c[9];
for (a = 0; a < q; a++) { for (a = 0; a < q; a++) {
for (b = 0; b < 16; b++) { for (b = 0; b < 16; b++) {
h[b] = g[a][b]; h[b] = g[a][b];
} }
for (b = 16; b < 80; b++) { for (b = 16; b < 80; b++) {
h[b] = p(h[b - 3] ^ h[b - 8] ^ h[b - 14] ^ h[b - 16], 1); h[b] = p(h[b - 3] ^ h[b - 8] ^ h[b - 14] ^ h[b - 16], 1);
} }
j = c[4]; j = c[4];
d = c[5]; d = c[5];
e = c[6]; e = c[6];
f = c[7]; f = c[7];
m = c[8]; m = c[8];
for (b = 0; b < 80; b++) { for (b = 0; b < 80; b++) {
var r = n.floor(b / 20), t = p(j, 5) + (r < 1 ? d & e ^ ~d & f : r == 2 ? d & e ^ d & f ^ e & f : d ^ e ^ f) + m + c[r] + h[b] & c[9]; let r = n.floor(b / 20), t = p(j, 5) + (r < 1 ? d & e ^ ~d & f : r == 2 ? d & e ^ d & f ^ e & f : d ^ e ^ f) + m + c[r] + h[b] & c[9];
m = f; m = f;
f = e; f = e;
e = p(d, 30); e = p(d, 30);
d = j; d = j;
j = t j = t
} }
c[4] += j; c[4] += j;
c[5] += d; c[5] += d;
c[6] += e; c[6] += e;
c[7] += f; c[7] += f;
c[8] += m c[8] += m
} }
i = ""; i = "";
for (z = 4; z < 9; z++) { for (z = 4; z < 9; z++) {
for (a = 7; a >= 0; a--) { for (a = 7; a >= 0; a--) {
i += ((c[z] & c[9]) >>> a * 4 & 15).toString(16); i += ((c[z] & c[9]) >>> a * 4 & 15).toString(16);
} }
} }
return i; return i;
}; };

View File

@ -19,39 +19,42 @@ function SHA1(s)
function A(a, b) function A(a, b)
{ {
var c = (b & 0xFFFF) + (a & 0xFFFF), d = (b >>> 16) + (a >>> 16) + (c >>> 16); let c = (b & 0xFFFF) + (a & 0xFFFF), d = (b >>> 16) + (a >>> 16) + (c >>> 16);
return ((d & 0xFFFF) << 16) | (c & 0xFFFF) return ((d & 0xFFFF) << 16) | (c & 0xFFFF)
} }
var B = '0123456789abcdef'; var B = '0123456789abcdef';
return (function (a) return (function (a)
{ {
var c = [], d = a.length * 4, e; let c = [], d = a.length * 4, e;
for (var i = 0; i < d; i++) { for (let i = 0; i < d; i++) {
e = a[i >> 2] >> ((3 - (i % 4)) * 8); e = a[i >> 2] >> ((3 - (i % 4)) * 8);
c.push(B.charAt((e >> 4) & 0xF) + B.charAt(e & 0xF)) c.push(B.charAt((e >> 4) & 0xF) + B.charAt(e & 0xF))
} }
return c.join('') return c.join('')
}((function (a, b) }((function (a, b)
{ {
var c, d, e, f, g, h = a.length, v = 0x67452301, w = 0xefcdab89, x = 0x98badcfe, y = 0x10325476, z = 0xc3d2e1f0, M = []; let c, d, e, f, g, h = a.length, v = 0x67452301, w = 0xefcdab89, x = 0x98badcfe, y = 0x10325476, z = 0xc3d2e1f0, M = [];
U(M, 0x5a827999, 20); U(M, 0x5a827999, 20);
U(M, 0x6ed9eba1, 20); U(M, 0x6ed9eba1, 20);
U(M, 0x8f1bbcdc, 20); U(M, 0x8f1bbcdc, 20);
U(M, 0xca62c1d6, 20); U(M, 0xca62c1d6, 20);
a[b >> 5] |= 0x80 << (24 - (b % 32));
a[b >> 5] |= 0x80 << (24 - (b % 32));
a[(((b + 65) >> 9) << 4) + 15] = b; a[(((b + 65) >> 9) << 4) + 15] = b;
for (var i = 0; i < h; i += 16) {
for (let i = 0; i < h; i += 16) {
c = v; c = v;
d = w; d = w;
e = x; e = x;
f = y; f = y;
g = z; g = z;
for (var j = 0, O = []; j < 80; j++) {
for (let j = 0, O = []; j < 80; j++) {
O[j] = j < 16 ? a[j + i] : L(O[j - 3] ^ O[j - 8] ^ O[j - 14] ^ O[j - 16], 1); O[j] = j < 16 ? a[j + i] : L(O[j - 3] ^ O[j - 8] ^ O[j - 14] ^ O[j - 16], 1);
var k = (function (a, b, c, d, e) let k = (function (a, b, c, d, e)
{ {
var f = (e & 0xFFFF) + (a & 0xFFFF) + (b & 0xFFFF) + (c & 0xFFFF) + (d & 0xFFFF), g = (e >>> 16) + (a >>> 16) + (b >>> 16) + (c >>> 16) + (d >>> 16) + (f >>> 16); let f = (e & 0xFFFF) + (a & 0xFFFF) + (b & 0xFFFF) + (c & 0xFFFF) + (d & 0xFFFF), g = (e >>> 16) + (a >>> 16) + (b >>> 16) + (c >>> 16) + (d >>> 16) + (f >>> 16);
return ((g & 0xFFFF) << 16) | (f & 0xFFFF) return ((g & 0xFFFF) << 16) | (f & 0xFFFF)
})(j < 20 ? (function (t, a, b) })(j < 20 ? (function (t, a, b)
{ {
@ -60,25 +63,30 @@ function SHA1(s)
{ {
return (t & a) ^ (t & b) ^ (a & b) return (t & a) ^ (t & b) ^ (a & b)
}(d, e, f)) : P(d, e, f), g, M[j], O[j], L(c, 5)); }(d, e, f)) : P(d, e, f), g, M[j], O[j], L(c, 5));
g = f; g = f;
f = e; f = e;
e = L(d, 30); e = L(d, 30);
d = c; d = c;
c = k c = k
} }
v = A(v, c); v = A(v, c);
w = A(w, d); w = A(w, d);
x = A(x, e); x = A(x, e);
y = A(y, f); y = A(y, f);
z = A(z, g) z = A(z, g)
} }
return [v, w, x, y, z] return [v, w, x, y, z]
}((function (t) }((function (t)
{ {
var a = [], b = 255, c = t.length * 8; let a = [], b = 255, c = t.length * 8;
for (var i = 0; i < c; i += 8) {
for (let i = 0; i < c; i += 8) {
a[i >> 5] |= (t.charCodeAt(i / 8) & b) << (24 - (i % 32)) a[i >> 5] |= (t.charCodeAt(i / 8) & b) << (24 - (i % 32))
} }
return a return a
}(s)).slice(), s.length * 8)))) }(s)).slice(), s.length * 8))))
} }

View File

@ -136,7 +136,7 @@
static unique (url) static unique (url)
{ {
const parts = url.replace(/\?/g, '&').split('&'), const parts = url.replace(/\?/g, '&').split('&'),
full = parts[0]; full = parts[0];
if (parts.length > 1) { if (parts.length > 1) {
parts.shift(); parts.shift();