[Pkg-javascript-commits] [node-sha.js] 204/237: sha*: adhere to standard
Bastien Roucariès
rouca at moszumanska.debian.org
Fri May 5 09:04:00 UTC 2017
This is an automated email from the git hooks/post-receive script.
rouca pushed a commit to branch master
in repository node-sha.js.
commit 74f5fc4741447385f5691cb3140cf716a1288312
Author: Daniel Cousens <github at dcousens.com>
Date: Sat May 30 12:45:39 2015 +1000
sha*: adhere to standard
---
sha.js | 30 ++++++++++-----------
sha1.js | 31 +++++++++++-----------
sha224.js | 28 ++++++++++----------
sha256.js | 66 +++++++++++++++++++++++-----------------------
sha384.js | 40 ++++++++++++++--------------
sha512.js | 90 +++++++++++++++++++++++++++++++--------------------------------
6 files changed, 142 insertions(+), 143 deletions(-)
diff --git a/sha.js b/sha.js
index f7d7258..8bcb637 100644
--- a/sha.js
+++ b/sha.js
@@ -11,7 +11,7 @@ var Hash = require('./hash')
var W = new Array(80)
-function Sha() {
+function Sha () {
this.init()
this._w = W
@@ -21,11 +21,11 @@ function Sha() {
inherits(Sha, Hash)
Sha.prototype.init = function () {
- this._a = 0x67452301
- this._b = 0xefcdab89
- this._c = 0x98badcfe
- this._d = 0x10325476
- this._e = 0xc3d2e1f0
+ this._a = 0x67452301 | 0
+ this._b = 0xefcdab89 | 0
+ this._c = 0x98badcfe | 0
+ this._d = 0x10325476 | 0
+ this._e = 0xc3d2e1f0 | 0
return this
}
@@ -33,8 +33,8 @@ Sha.prototype.init = function () {
/*
* Bitwise rotate a 32-bit number to the left.
*/
-function rol(num, cnt) {
- return (num << cnt) | (num >>> (32 - cnt));
+function rol (num, cnt) {
+ return (num << cnt) | (num >>> (32 - cnt))
}
Sha.prototype._update = function (M) {
@@ -52,8 +52,8 @@ Sha.prototype._update = function (M) {
* SHA-1 has a bitwise rotate left operation. But, SHA is not
* function calcW() { return rol(W[j - 3] ^ W[j - 8] ^ W[j - 14] ^ W[j - 16], 1) }
*/
- function calcW() { return W[j - 3] ^ W[j - 8] ^ W[j - 14] ^ W[j - 16] }
- function loop(w, f) {
+ function calcW () { return W[j - 3] ^ W[j - 8] ^ W[j - 14] ^ W[j - 16] }
+ function loop (w, f) {
W[j] = w
var t = rol(a, 5) + f + e + w + k
@@ -86,11 +86,11 @@ Sha.prototype._update = function (M) {
Sha.prototype._hash = function () {
var H = new Buffer(20)
- H.writeInt32BE(this._a|0, 0)
- H.writeInt32BE(this._b|0, 4)
- H.writeInt32BE(this._c|0, 8)
- H.writeInt32BE(this._d|0, 12)
- H.writeInt32BE(this._e|0, 16)
+ H.writeInt32BE(this._a | 0, 0)
+ H.writeInt32BE(this._b | 0, 4)
+ H.writeInt32BE(this._c | 0, 8)
+ H.writeInt32BE(this._d | 0, 12)
+ H.writeInt32BE(this._e | 0, 16)
return H
}
diff --git a/sha1.js b/sha1.js
index 42c2a8c..16f1266 100644
--- a/sha1.js
+++ b/sha1.js
@@ -12,7 +12,7 @@ var Hash = require('./hash')
var W = new Array(80)
-function Sha1() {
+function Sha1 () {
this.init()
this._w = W
@@ -22,11 +22,11 @@ function Sha1() {
inherits(Sha1, Hash)
Sha1.prototype.init = function () {
- this._a = 0x67452301
- this._b = 0xefcdab89
- this._c = 0x98badcfe
- this._d = 0x10325476
- this._e = 0xc3d2e1f0
+ this._a = 0x67452301 | 0
+ this._b = 0xefcdab89 | 0
+ this._c = 0x98badcfe | 0
+ this._d = 0x10325476 | 0
+ this._e = 0xc3d2e1f0 | 0
return this
}
@@ -34,8 +34,8 @@ Sha1.prototype.init = function () {
/*
* Bitwise rotate a 32-bit number to the left.
*/
-function rol(num, cnt) {
- return (num << cnt) | (num >>> (32 - cnt));
+function rol (num, cnt) {
+ return (num << cnt) | (num >>> (32 - cnt))
}
Sha1.prototype._update = function (M) {
@@ -49,8 +49,8 @@ Sha1.prototype._update = function (M) {
var j = 0, k
- function calcW() { return rol(W[j - 3] ^ W[j - 8] ^ W[j - 14] ^ W[j - 16], 1) }
- function loop(w, f) {
+ function calcW () { return rol(W[j - 3] ^ W[j - 8] ^ W[j - 14] ^ W[j - 16], 1) }
+ function loop (w, f) {
W[j] = w
var t = rol(a, 5) + f + e + w + k
@@ -83,14 +83,13 @@ Sha1.prototype._update = function (M) {
Sha1.prototype._hash = function () {
var H = new Buffer(20)
- H.writeInt32BE(this._a|0, 0)
- H.writeInt32BE(this._b|0, 4)
- H.writeInt32BE(this._c|0, 8)
- H.writeInt32BE(this._d|0, 12)
- H.writeInt32BE(this._e|0, 16)
+ H.writeInt32BE(this._a | 0, 0)
+ H.writeInt32BE(this._b | 0, 4)
+ H.writeInt32BE(this._c | 0, 8)
+ H.writeInt32BE(this._d | 0, 12)
+ H.writeInt32BE(this._e | 0, 16)
return H
}
module.exports = Sha1
-
diff --git a/sha224.js b/sha224.js
index b8b4426..f4e776f 100644
--- a/sha224.js
+++ b/sha224.js
@@ -7,12 +7,12 @@
*/
var inherits = require('inherits')
-var SHA256 = require('./sha256')
+var Sha256 = require('./sha256')
var Hash = require('./hash')
var W = new Array(64)
-function Sha224() {
+function Sha224 () {
this.init()
this._w = W // new Array(64)
@@ -20,17 +20,17 @@ function Sha224() {
Hash.call(this, 64, 56)
}
-inherits(Sha224, SHA256)
+inherits(Sha224, Sha256)
Sha224.prototype.init = function () {
- this._a = 0xc1059ed8|0
- this._b = 0x367cd507|0
- this._c = 0x3070dd17|0
- this._d = 0xf70e5939|0
- this._e = 0xffc00b31|0
- this._f = 0x68581511|0
- this._g = 0x64f98fa7|0
- this._h = 0xbefa4fa4|0
+ this._a = 0xc1059ed8 | 0
+ this._b = 0x367cd507 | 0
+ this._c = 0x3070dd17 | 0
+ this._d = 0xf70e5939 | 0
+ this._e = 0xffc00b31 | 0
+ this._f = 0x68581511 | 0
+ this._g = 0x64f98fa7 | 0
+ this._h = 0xbefa4fa4 | 0
return this
}
@@ -38,9 +38,9 @@ Sha224.prototype.init = function () {
Sha224.prototype._hash = function () {
var H = new Buffer(28)
- H.writeInt32BE(this._a, 0)
- H.writeInt32BE(this._b, 4)
- H.writeInt32BE(this._c, 8)
+ H.writeInt32BE(this._a, 0)
+ H.writeInt32BE(this._b, 4)
+ H.writeInt32BE(this._c, 8)
H.writeInt32BE(this._d, 12)
H.writeInt32BE(this._e, 16)
H.writeInt32BE(this._f, 20)
diff --git a/sha256.js b/sha256.js
index 5cdea6b..43ee7c1 100644
--- a/sha256.js
+++ b/sha256.js
@@ -30,7 +30,7 @@ var K = [
var W = new Array(64)
-function Sha256() {
+function Sha256 () {
this.init()
this._w = W // new Array(64)
@@ -41,51 +41,51 @@ function Sha256() {
inherits(Sha256, Hash)
Sha256.prototype.init = function () {
- this._a = 0x6a09e667|0
- this._b = 0xbb67ae85|0
- this._c = 0x3c6ef372|0
- this._d = 0xa54ff53a|0
- this._e = 0x510e527f|0
- this._f = 0x9b05688c|0
- this._g = 0x1f83d9ab|0
- this._h = 0x5be0cd19|0
+ this._a = 0x6a09e667 | 0
+ this._b = 0xbb67ae85 | 0
+ this._c = 0x3c6ef372 | 0
+ this._d = 0xa54ff53a | 0
+ this._e = 0x510e527f | 0
+ this._f = 0x9b05688c | 0
+ this._g = 0x1f83d9ab | 0
+ this._h = 0x5be0cd19 | 0
return this
}
function S (X, n) {
- return (X >>> n) | (X << (32 - n));
+ return (X >>> n) | (X << (32 - n))
}
function R (X, n) {
- return (X >>> n);
+ return (X >>> n)
}
function Ch (x, y, z) {
- return ((x & y) ^ ((~x) & z));
+ return ((x & y) ^ ((~x) & z))
}
function Maj (x, y, z) {
- return ((x & y) ^ (x & z) ^ (y & z));
+ return ((x & y) ^ (x & z) ^ (y & z))
}
function Sigma0256 (x) {
- return (S(x, 2) ^ S(x, 13) ^ S(x, 22));
+ return (S(x, 2) ^ S(x, 13) ^ S(x, 22))
}
function Sigma1256 (x) {
- return (S(x, 6) ^ S(x, 11) ^ S(x, 25));
+ return (S(x, 6) ^ S(x, 11) ^ S(x, 25))
}
function Gamma0256 (x) {
- return (S(x, 7) ^ S(x, 18) ^ R(x, 3));
+ return (S(x, 7) ^ S(x, 18) ^ R(x, 3))
}
function Gamma1256 (x) {
- return (S(x, 17) ^ S(x, 19) ^ R(x, 10));
+ return (S(x, 17) ^ S(x, 19) ^ R(x, 10))
}
-Sha256.prototype._update = function(M) {
+Sha256.prototype._update = function (M) {
var W = this._w
var a = this._a | 0
@@ -99,21 +99,21 @@ Sha256.prototype._update = function(M) {
var j = 0
- function calcW() { return Gamma1256(W[j - 2]) + W[j - 7] + Gamma0256(W[j - 15]) + W[j - 16] }
- function loop(w) {
+ function calcW () { return Gamma1256(W[j - 2]) + W[j - 7] + Gamma0256(W[j - 15]) + W[j - 16] }
+ function loop (w) {
W[j] = w
var T1 = h + Sigma1256(e) + Ch(e, f, g) + K[j] + w
- var T2 = Sigma0256(a) + Maj(a, b, c);
+ var T2 = Sigma0256(a) + Maj(a, b, c)
- h = g;
- g = f;
- f = e;
- e = d + T1;
- d = c;
- c = b;
- b = a;
- a = T1 + T2;
+ h = g
+ g = f
+ f = e
+ e = d + T1
+ d = c
+ c = b
+ b = a
+ a = T1 + T2
j++
}
@@ -129,14 +129,14 @@ Sha256.prototype._update = function(M) {
this._f = (f + this._f) | 0
this._g = (g + this._g) | 0
this._h = (h + this._h) | 0
-};
+}
Sha256.prototype._hash = function () {
var H = new Buffer(32)
- H.writeInt32BE(this._a, 0)
- H.writeInt32BE(this._b, 4)
- H.writeInt32BE(this._c, 8)
+ H.writeInt32BE(this._a, 0)
+ H.writeInt32BE(this._b, 4)
+ H.writeInt32BE(this._c, 8)
H.writeInt32BE(this._d, 12)
H.writeInt32BE(this._e, 16)
H.writeInt32BE(this._f, 20)
diff --git a/sha384.js b/sha384.js
index 5966e5d..2044e91 100644
--- a/sha384.js
+++ b/sha384.js
@@ -1,10 +1,10 @@
var inherits = require('inherits')
-var SHA512 = require('./sha512');
+var SHA512 = require('./sha512')
var Hash = require('./hash')
var W = new Array(160)
-function Sha384() {
+function Sha384 () {
this.init()
this._w = W
@@ -14,23 +14,23 @@ function Sha384() {
inherits(Sha384, SHA512)
Sha384.prototype.init = function () {
- this._a = 0xcbbb9d5d|0
- this._b = 0x629a292a|0
- this._c = 0x9159015a|0
- this._d = 0x152fecd8|0
- this._e = 0x67332667|0
- this._f = 0x8eb44a87|0
- this._g = 0xdb0c2e0d|0
- this._h = 0x47b5481d|0
-
- this._al = 0xc1059ed8|0
- this._bl = 0x367cd507|0
- this._cl = 0x3070dd17|0
- this._dl = 0xf70e5939|0
- this._el = 0xffc00b31|0
- this._fl = 0x68581511|0
- this._gl = 0x64f98fa7|0
- this._hl = 0xbefa4fa4|0
+ this._a = 0xcbbb9d5d | 0
+ this._b = 0x629a292a | 0
+ this._c = 0x9159015a | 0
+ this._d = 0x152fecd8 | 0
+ this._e = 0x67332667 | 0
+ this._f = 0x8eb44a87 | 0
+ this._g = 0xdb0c2e0d | 0
+ this._h = 0x47b5481d | 0
+
+ this._al = 0xc1059ed8 | 0
+ this._bl = 0x367cd507 | 0
+ this._cl = 0x3070dd17 | 0
+ this._dl = 0xf70e5939 | 0
+ this._el = 0xffc00b31 | 0
+ this._fl = 0x68581511 | 0
+ this._gl = 0x64f98fa7 | 0
+ this._hl = 0xbefa4fa4 | 0
return this
}
@@ -38,7 +38,7 @@ Sha384.prototype.init = function () {
Sha384.prototype._hash = function () {
var H = new Buffer(48)
- function writeInt64BE(h, l, offset) {
+ function writeInt64BE (h, l, offset) {
H.writeInt32BE(h, offset)
H.writeInt32BE(l, offset + 4)
}
diff --git a/sha512.js b/sha512.js
index 0bfa0e0..c663c63 100644
--- a/sha512.js
+++ b/sha512.js
@@ -46,7 +46,7 @@ var K = [
var W = new Array(160)
-function Sha512() {
+function Sha512 () {
this.init()
this._w = W
@@ -56,23 +56,23 @@ function Sha512() {
inherits(Sha512, Hash)
Sha512.prototype.init = function () {
- this._a = 0x6a09e667|0
- this._b = 0xbb67ae85|0
- this._c = 0x3c6ef372|0
- this._d = 0xa54ff53a|0
- this._e = 0x510e527f|0
- this._f = 0x9b05688c|0
- this._g = 0x1f83d9ab|0
- this._h = 0x5be0cd19|0
-
- this._al = 0xf3bcc908|0
- this._bl = 0x84caa73b|0
- this._cl = 0xfe94f82b|0
- this._dl = 0x5f1d36f1|0
- this._el = 0xade682d1|0
- this._fl = 0x2b3e6c1f|0
- this._gl = 0xfb41bd6b|0
- this._hl = 0x137e2179|0
+ this._a = 0x6a09e667 | 0
+ this._b = 0xbb67ae85 | 0
+ this._c = 0x3c6ef372 | 0
+ this._d = 0xa54ff53a | 0
+ this._e = 0x510e527f | 0
+ this._f = 0x9b05688c | 0
+ this._g = 0x1f83d9ab | 0
+ this._h = 0x5be0cd19 | 0
+
+ this._al = 0xf3bcc908 | 0
+ this._bl = 0x84caa73b | 0
+ this._cl = 0xfe94f82b | 0
+ this._dl = 0x5f1d36f1 | 0
+ this._el = 0xade682d1 | 0
+ this._fl = 0x2b3e6c1f | 0
+ this._gl = 0xfb41bd6b | 0
+ this._hl = 0x137e2179 | 0
return this
}
@@ -82,14 +82,14 @@ function S (X, Xl, n) {
}
function Ch (x, y, z) {
- return ((x & y) ^ ((~x) & z));
+ return ((x & y) ^ ((~x) & z))
}
function Maj (x, y, z) {
- return ((x & y) ^ (x & z) ^ (y & z));
+ return ((x & y) ^ (x & z) ^ (y & z))
}
-Sha512.prototype._update = function(M) {
+Sha512.prototype._update = function (M) {
var W = this._w
var a = this._a | 0
@@ -112,33 +112,33 @@ Sha512.prototype._update = function(M) {
var i = 0, j = 0
var Wi, Wil
- function calcW() {
- var x = W[j - 15*2]
- var xl = W[j - 15*2 + 1]
- var gamma0 = S(x, xl, 1) ^ S(x, xl, 8) ^ (x >>> 7)
+ function calcW () {
+ var x = W[j - 15 * 2]
+ var xl = W[j - 15 * 2 + 1]
+ var gamma0 = S(x, xl, 1) ^ S(x, xl, 8) ^ (x >>> 7)
var gamma0l = S(xl, x, 1) ^ S(xl, x, 8) ^ S(xl, x, 7)
- x = W[j - 2*2]
- xl = W[j - 2*2 + 1]
- var gamma1 = S(x, xl, 19) ^ S(xl, x, 29) ^ (x >>> 6)
+ x = W[j - 2 * 2]
+ xl = W[j - 2 * 2 + 1]
+ var gamma1 = S(x, xl, 19) ^ S(xl, x, 29) ^ (x >>> 6)
var gamma1l = S(xl, x, 19) ^ S(x, xl, 29) ^ S(xl, x, 6)
// W[i] = gamma0 + W[i - 7] + gamma1 + W[i - 16]
- var Wi7 = W[j - 7*2]
- var Wi7l = W[j - 7*2 + 1]
+ var Wi7 = W[j - 7 * 2]
+ var Wi7l = W[j - 7 * 2 + 1]
- var Wi16 = W[j - 16*2]
- var Wi16l = W[j - 16*2 + 1]
+ var Wi16 = W[j - 16 * 2]
+ var Wi16l = W[j - 16 * 2 + 1]
Wil = gamma0l + Wi7l
- Wi = gamma0 + Wi7 + ((Wil >>> 0) < (gamma0l >>> 0) ? 1 : 0)
+ Wi = gamma0 + Wi7 + ((Wil >>> 0) < (gamma0l >>> 0) ? 1 : 0)
Wil = Wil + gamma1l
- Wi = Wi + gamma1 + ((Wil >>> 0) < (gamma1l >>> 0) ? 1 : 0)
+ Wi = Wi + gamma1 + ((Wil >>> 0) < (gamma1l >>> 0) ? 1 : 0)
Wil = Wil + Wi16l
- Wi = Wi + Wi16 + ((Wil >>> 0) < (Wi16l >>> 0) ? 1 : 0)
+ Wi = Wi + Wi16 + ((Wil >>> 0) < (Wi16l >>> 0) ? 1 : 0)
}
- function loop() {
+ function loop () {
W[j] = Wi
W[j + 1] = Wil
@@ -170,22 +170,22 @@ Sha512.prototype._update = function(M) {
var t2l = sigma0l + majl
var t2 = sigma0h + maj + ((t2l >>> 0) < (sigma0l >>> 0) ? 1 : 0)
- h = g
+ h = g
hl = gl
- g = f
+ g = f
gl = fl
- f = e
+ f = e
fl = el
el = (dl + t1l) | 0
- e = (d + t1 + ((el >>> 0) < (dl >>> 0) ? 1 : 0)) | 0
- d = c
+ e = (d + t1 + ((el >>> 0) < (dl >>> 0) ? 1 : 0)) | 0
+ d = c
dl = cl
- c = b
+ c = b
cl = bl
- b = a
+ b = a
bl = al
al = (t1l + t2l) | 0
- a = (t1 + t2 + ((al >>> 0) < (t1l >>> 0) ? 1 : 0)) | 0
+ a = (t1 + t2 + ((al >>> 0) < (t1l >>> 0) ? 1 : 0)) | 0
i++
j += 2
@@ -225,7 +225,7 @@ Sha512.prototype._update = function(M) {
Sha512.prototype._hash = function () {
var H = new Buffer(64)
- function writeInt64BE(h, l, offset) {
+ function writeInt64BE (h, l, offset) {
H.writeInt32BE(h, offset)
H.writeInt32BE(l, offset + 4)
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-sha.js.git
More information about the Pkg-javascript-commits
mailing list