[Pkg-javascript-commits] [node-create-hash] 23/40: adhere to standard
Bastien Roucariès
rouca at moszumanska.debian.org
Sat May 27 14:10:35 UTC 2017
This is an automated email from the git hooks/post-receive script.
rouca pushed a commit to branch master
in repository node-create-hash.
commit c713c6aa345147594c63c8dddf7debf3a70b3b99
Author: Daniel Cousens <github at dcousens.com>
Date: Mon Sep 28 09:10:21 2015 +1000
adhere to standard
---
.travis.yml | 11 ++-
browser.js | 10 +--
helpers.js | 49 +++++++------
md5.js | 231 +++++++++++++++++++++++++++++------------------------------
package.json | 5 +-
test.js | 27 +++----
6 files changed, 174 insertions(+), 159 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 1416d60..7fda1a1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,13 @@
+sudo: false
language: node_js
+before_install:
+ - "npm install npm -g"
node_js:
- "0.10"
- - "0.11"
\ No newline at end of file
+ - "0.12"
+ - "4.0.0"
+env:
+ - TEST_SUITE=standard
+ - TEST_SUITE=unit
+script: "npm run-script $TEST_SUITE"
+
diff --git a/browser.js b/browser.js
index e9add1e..1642270 100644
--- a/browser.js
+++ b/browser.js
@@ -1,4 +1,4 @@
-'use strict';
+'use strict'
var inherits = require('inherits')
var md5 = require('./md5')
var rmd160 = require('ripemd160')
@@ -6,7 +6,7 @@ var sha = require('sha.js')
var Base = require('cipher-base')
-function HashNoConstructor(hash) {
+function HashNoConstructor (hash) {
Base.call(this, 'digest')
this._hash = hash
@@ -27,7 +27,7 @@ HashNoConstructor.prototype._final = function () {
return r
}
-function Hash(hash) {
+function Hash (hash) {
Base.call(this, 'digest')
this._hash = hash
@@ -45,8 +45,8 @@ Hash.prototype._final = function () {
module.exports = function createHash (alg) {
alg = alg.toLowerCase()
- if ('md5' === alg) return new HashNoConstructor(md5)
- if ('rmd160' === alg || 'ripemd160' === alg) return new HashNoConstructor(rmd160)
+ if (alg === 'md5') return new HashNoConstructor(md5)
+ if (alg === 'rmd160' || alg === 'ripemd160') return new HashNoConstructor(rmd160)
return new Hash(sha(alg))
}
diff --git a/helpers.js b/helpers.js
index 33b463d..429f68a 100644
--- a/helpers.js
+++ b/helpers.js
@@ -1,34 +1,41 @@
-'use strict';
-var intSize = 4;
-var zeroBuffer = new Buffer(intSize); zeroBuffer.fill(0);
-var chrsz = 8;
+'use strict'
+var intSize = 4
+var zeroBuffer = new Buffer(intSize)
+zeroBuffer.fill(0)
-function toArray(buf, bigEndian) {
+var charSize = 8
+
+function toArray (buf, bigEndian) {
if ((buf.length % intSize) !== 0) {
- var len = buf.length + (intSize - (buf.length % intSize));
- buf = Buffer.concat([buf, zeroBuffer], len);
+ var len = buf.length + (intSize - (buf.length % intSize))
+ buf = Buffer.concat([buf, zeroBuffer], len)
}
- var arr = [];
- var fn = bigEndian ? buf.readInt32BE : buf.readInt32LE;
+ var arr = []
+ var fn = bigEndian ? buf.readInt32BE : buf.readInt32LE
for (var i = 0; i < buf.length; i += intSize) {
- arr.push(fn.call(buf, i));
+ arr.push(fn.call(buf, i))
}
- return arr;
+
+ return arr
}
-function toBuffer(arr, size, bigEndian) {
- var buf = new Buffer(size);
- var fn = bigEndian ? buf.writeInt32BE : buf.writeInt32LE;
+function toBuffer (arr, size, bigEndian) {
+ var buf = new Buffer(size)
+ var fn = bigEndian ? buf.writeInt32BE : buf.writeInt32LE
+
for (var i = 0; i < arr.length; i++) {
- fn.call(buf, arr[i], i * 4, true);
+ fn.call(buf, arr[i], i * 4, true)
}
- return buf;
+
+ return buf
}
-function hash(buf, fn, hashSize, bigEndian) {
- if (!Buffer.isBuffer(buf)) buf = new Buffer(buf);
- var arr = fn(toArray(buf, bigEndian), buf.length * chrsz);
- return toBuffer(arr, hashSize, bigEndian);
+function hash (buf, fn, hashSize, bigEndian) {
+ if (!Buffer.isBuffer(buf)) buf = new Buffer(buf)
+
+ var arr = fn(toArray(buf, bigEndian), buf.length * charSize)
+ return toBuffer(arr, hashSize, bigEndian)
}
-exports.hash = hash;
\ No newline at end of file
+
+exports.hash = hash
diff --git a/md5.js b/md5.js
index d2135f4..6ef16ea 100644
--- a/md5.js
+++ b/md5.js
@@ -1,4 +1,4 @@
-'use strict';
+'use strict'
/*
* A JavaScript implementation of the RSA Data Security, Inc. MD5 Message
* Digest Algorithm, as defined in RFC 1321.
@@ -8,149 +8,144 @@
* See http://pajhome.org.uk/crypt/md5 for more info.
*/
-var helpers = require('./helpers');
+var helpers = require('./helpers')
/*
* Calculate the MD5 of an array of little-endian words, and a bit length
*/
-function core_md5(x, len)
-{
+function core_md5 (x, len) {
/* append padding */
- x[len >> 5] |= 0x80 << ((len) % 32);
- x[(((len + 64) >>> 9) << 4) + 14] = len;
-
- var a = 1732584193;
- var b = -271733879;
- var c = -1732584194;
- var d = 271733878;
-
- for(var i = 0; i < x.length; i += 16)
- {
- var olda = a;
- var oldb = b;
- var oldc = c;
- var oldd = d;
-
- a = md5_ff(a, b, c, d, x[i+ 0], 7 , -680876936);
- d = md5_ff(d, a, b, c, x[i+ 1], 12, -389564586);
- c = md5_ff(c, d, a, b, x[i+ 2], 17, 606105819);
- b = md5_ff(b, c, d, a, x[i+ 3], 22, -1044525330);
- a = md5_ff(a, b, c, d, x[i+ 4], 7 , -176418897);
- d = md5_ff(d, a, b, c, x[i+ 5], 12, 1200080426);
- c = md5_ff(c, d, a, b, x[i+ 6], 17, -1473231341);
- b = md5_ff(b, c, d, a, x[i+ 7], 22, -45705983);
- a = md5_ff(a, b, c, d, x[i+ 8], 7 , 1770035416);
- d = md5_ff(d, a, b, c, x[i+ 9], 12, -1958414417);
- c = md5_ff(c, d, a, b, x[i+10], 17, -42063);
- b = md5_ff(b, c, d, a, x[i+11], 22, -1990404162);
- a = md5_ff(a, b, c, d, x[i+12], 7 , 1804603682);
- d = md5_ff(d, a, b, c, x[i+13], 12, -40341101);
- c = md5_ff(c, d, a, b, x[i+14], 17, -1502002290);
- b = md5_ff(b, c, d, a, x[i+15], 22, 1236535329);
-
- a = md5_gg(a, b, c, d, x[i+ 1], 5 , -165796510);
- d = md5_gg(d, a, b, c, x[i+ 6], 9 , -1069501632);
- c = md5_gg(c, d, a, b, x[i+11], 14, 643717713);
- b = md5_gg(b, c, d, a, x[i+ 0], 20, -373897302);
- a = md5_gg(a, b, c, d, x[i+ 5], 5 , -701558691);
- d = md5_gg(d, a, b, c, x[i+10], 9 , 38016083);
- c = md5_gg(c, d, a, b, x[i+15], 14, -660478335);
- b = md5_gg(b, c, d, a, x[i+ 4], 20, -405537848);
- a = md5_gg(a, b, c, d, x[i+ 9], 5 , 568446438);
- d = md5_gg(d, a, b, c, x[i+14], 9 , -1019803690);
- c = md5_gg(c, d, a, b, x[i+ 3], 14, -187363961);
- b = md5_gg(b, c, d, a, x[i+ 8], 20, 1163531501);
- a = md5_gg(a, b, c, d, x[i+13], 5 , -1444681467);
- d = md5_gg(d, a, b, c, x[i+ 2], 9 , -51403784);
- c = md5_gg(c, d, a, b, x[i+ 7], 14, 1735328473);
- b = md5_gg(b, c, d, a, x[i+12], 20, -1926607734);
-
- a = md5_hh(a, b, c, d, x[i+ 5], 4 , -378558);
- d = md5_hh(d, a, b, c, x[i+ 8], 11, -2022574463);
- c = md5_hh(c, d, a, b, x[i+11], 16, 1839030562);
- b = md5_hh(b, c, d, a, x[i+14], 23, -35309556);
- a = md5_hh(a, b, c, d, x[i+ 1], 4 , -1530992060);
- d = md5_hh(d, a, b, c, x[i+ 4], 11, 1272893353);
- c = md5_hh(c, d, a, b, x[i+ 7], 16, -155497632);
- b = md5_hh(b, c, d, a, x[i+10], 23, -1094730640);
- a = md5_hh(a, b, c, d, x[i+13], 4 , 681279174);
- d = md5_hh(d, a, b, c, x[i+ 0], 11, -358537222);
- c = md5_hh(c, d, a, b, x[i+ 3], 16, -722521979);
- b = md5_hh(b, c, d, a, x[i+ 6], 23, 76029189);
- a = md5_hh(a, b, c, d, x[i+ 9], 4 , -640364487);
- d = md5_hh(d, a, b, c, x[i+12], 11, -421815835);
- c = md5_hh(c, d, a, b, x[i+15], 16, 530742520);
- b = md5_hh(b, c, d, a, x[i+ 2], 23, -995338651);
-
- a = md5_ii(a, b, c, d, x[i+ 0], 6 , -198630844);
- d = md5_ii(d, a, b, c, x[i+ 7], 10, 1126891415);
- c = md5_ii(c, d, a, b, x[i+14], 15, -1416354905);
- b = md5_ii(b, c, d, a, x[i+ 5], 21, -57434055);
- a = md5_ii(a, b, c, d, x[i+12], 6 , 1700485571);
- d = md5_ii(d, a, b, c, x[i+ 3], 10, -1894986606);
- c = md5_ii(c, d, a, b, x[i+10], 15, -1051523);
- b = md5_ii(b, c, d, a, x[i+ 1], 21, -2054922799);
- a = md5_ii(a, b, c, d, x[i+ 8], 6 , 1873313359);
- d = md5_ii(d, a, b, c, x[i+15], 10, -30611744);
- c = md5_ii(c, d, a, b, x[i+ 6], 15, -1560198380);
- b = md5_ii(b, c, d, a, x[i+13], 21, 1309151649);
- a = md5_ii(a, b, c, d, x[i+ 4], 6 , -145523070);
- d = md5_ii(d, a, b, c, x[i+11], 10, -1120210379);
- c = md5_ii(c, d, a, b, x[i+ 2], 15, 718787259);
- b = md5_ii(b, c, d, a, x[i+ 9], 21, -343485551);
-
- a = safe_add(a, olda);
- b = safe_add(b, oldb);
- c = safe_add(c, oldc);
- d = safe_add(d, oldd);
+ x[len >> 5] |= 0x80 << ((len) % 32)
+ x[(((len + 64) >>> 9) << 4) + 14] = len
+
+ var a = 1732584193
+ var b = -271733879
+ var c = -1732584194
+ var d = 271733878
+
+ for (var i = 0; i < x.length; i += 16) {
+ var olda = a
+ var oldb = b
+ var oldc = c
+ var oldd = d
+
+ a = md5_ff(a, b, c, d, x[i + 0], 7, -680876936)
+ d = md5_ff(d, a, b, c, x[i + 1], 12, -389564586)
+ c = md5_ff(c, d, a, b, x[i + 2], 17, 606105819)
+ b = md5_ff(b, c, d, a, x[i + 3], 22, -1044525330)
+ a = md5_ff(a, b, c, d, x[i + 4], 7, -176418897)
+ d = md5_ff(d, a, b, c, x[i + 5], 12, 1200080426)
+ c = md5_ff(c, d, a, b, x[i + 6], 17, -1473231341)
+ b = md5_ff(b, c, d, a, x[i + 7], 22, -45705983)
+ a = md5_ff(a, b, c, d, x[i + 8], 7, 1770035416)
+ d = md5_ff(d, a, b, c, x[i + 9], 12, -1958414417)
+ c = md5_ff(c, d, a, b, x[i + 10], 17, -42063)
+ b = md5_ff(b, c, d, a, x[i + 11], 22, -1990404162)
+ a = md5_ff(a, b, c, d, x[i + 12], 7, 1804603682)
+ d = md5_ff(d, a, b, c, x[i + 13], 12, -40341101)
+ c = md5_ff(c, d, a, b, x[i + 14], 17, -1502002290)
+ b = md5_ff(b, c, d, a, x[i + 15], 22, 1236535329)
+
+ a = md5_gg(a, b, c, d, x[i + 1], 5, -165796510)
+ d = md5_gg(d, a, b, c, x[i + 6], 9, -1069501632)
+ c = md5_gg(c, d, a, b, x[i + 11], 14, 643717713)
+ b = md5_gg(b, c, d, a, x[i + 0], 20, -373897302)
+ a = md5_gg(a, b, c, d, x[i + 5], 5, -701558691)
+ d = md5_gg(d, a, b, c, x[i + 10], 9, 38016083)
+ c = md5_gg(c, d, a, b, x[i + 15], 14, -660478335)
+ b = md5_gg(b, c, d, a, x[i + 4], 20, -405537848)
+ a = md5_gg(a, b, c, d, x[i + 9], 5, 568446438)
+ d = md5_gg(d, a, b, c, x[i + 14], 9, -1019803690)
+ c = md5_gg(c, d, a, b, x[i + 3], 14, -187363961)
+ b = md5_gg(b, c, d, a, x[i + 8], 20, 1163531501)
+ a = md5_gg(a, b, c, d, x[i + 13], 5, -1444681467)
+ d = md5_gg(d, a, b, c, x[i + 2], 9, -51403784)
+ c = md5_gg(c, d, a, b, x[i + 7], 14, 1735328473)
+ b = md5_gg(b, c, d, a, x[i + 12], 20, -1926607734)
+
+ a = md5_hh(a, b, c, d, x[i + 5], 4, -378558)
+ d = md5_hh(d, a, b, c, x[i + 8], 11, -2022574463)
+ c = md5_hh(c, d, a, b, x[i + 11], 16, 1839030562)
+ b = md5_hh(b, c, d, a, x[i + 14], 23, -35309556)
+ a = md5_hh(a, b, c, d, x[i + 1], 4, -1530992060)
+ d = md5_hh(d, a, b, c, x[i + 4], 11, 1272893353)
+ c = md5_hh(c, d, a, b, x[i + 7], 16, -155497632)
+ b = md5_hh(b, c, d, a, x[i + 10], 23, -1094730640)
+ a = md5_hh(a, b, c, d, x[i + 13], 4, 681279174)
+ d = md5_hh(d, a, b, c, x[i + 0], 11, -358537222)
+ c = md5_hh(c, d, a, b, x[i + 3], 16, -722521979)
+ b = md5_hh(b, c, d, a, x[i + 6], 23, 76029189)
+ a = md5_hh(a, b, c, d, x[i + 9], 4, -640364487)
+ d = md5_hh(d, a, b, c, x[i + 12], 11, -421815835)
+ c = md5_hh(c, d, a, b, x[i + 15], 16, 530742520)
+ b = md5_hh(b, c, d, a, x[i + 2], 23, -995338651)
+
+ a = md5_ii(a, b, c, d, x[i + 0], 6, -198630844)
+ d = md5_ii(d, a, b, c, x[i + 7], 10, 1126891415)
+ c = md5_ii(c, d, a, b, x[i + 14], 15, -1416354905)
+ b = md5_ii(b, c, d, a, x[i + 5], 21, -57434055)
+ a = md5_ii(a, b, c, d, x[i + 12], 6, 1700485571)
+ d = md5_ii(d, a, b, c, x[i + 3], 10, -1894986606)
+ c = md5_ii(c, d, a, b, x[i + 10], 15, -1051523)
+ b = md5_ii(b, c, d, a, x[i + 1], 21, -2054922799)
+ a = md5_ii(a, b, c, d, x[i + 8], 6, 1873313359)
+ d = md5_ii(d, a, b, c, x[i + 15], 10, -30611744)
+ c = md5_ii(c, d, a, b, x[i + 6], 15, -1560198380)
+ b = md5_ii(b, c, d, a, x[i + 13], 21, 1309151649)
+ a = md5_ii(a, b, c, d, x[i + 4], 6, -145523070)
+ d = md5_ii(d, a, b, c, x[i + 11], 10, -1120210379)
+ c = md5_ii(c, d, a, b, x[i + 2], 15, 718787259)
+ b = md5_ii(b, c, d, a, x[i + 9], 21, -343485551)
+
+ a = safe_add(a, olda)
+ b = safe_add(b, oldb)
+ c = safe_add(c, oldc)
+ d = safe_add(d, oldd)
}
- return Array(a, b, c, d);
+ return [a, b, c, d]
}
/*
* These functions implement the four basic operations the algorithm uses.
*/
-function md5_cmn(q, a, b, x, s, t)
-{
- return safe_add(bit_rol(safe_add(safe_add(a, q), safe_add(x, t)), s),b);
+function md5_cmn (q, a, b, x, s, t) {
+ return safe_add(bit_rol(safe_add(safe_add(a, q), safe_add(x, t)), s), b)
}
-function md5_ff(a, b, c, d, x, s, t)
-{
- return md5_cmn((b & c) | ((~b) & d), a, b, x, s, t);
+
+function md5_ff (a, b, c, d, x, s, t) {
+ return md5_cmn((b & c) | ((~b) & d), a, b, x, s, t)
}
-function md5_gg(a, b, c, d, x, s, t)
-{
- return md5_cmn((b & d) | (c & (~d)), a, b, x, s, t);
+
+function md5_gg (a, b, c, d, x, s, t) {
+ return md5_cmn((b & d) | (c & (~d)), a, b, x, s, t)
}
-function md5_hh(a, b, c, d, x, s, t)
-{
- return md5_cmn(b ^ c ^ d, a, b, x, s, t);
+
+function md5_hh (a, b, c, d, x, s, t) {
+ return md5_cmn(b ^ c ^ d, a, b, x, s, t)
}
-function md5_ii(a, b, c, d, x, s, t)
-{
- return md5_cmn(c ^ (b | (~d)), a, b, x, s, t);
+
+function md5_ii (a, b, c, d, x, s, t) {
+ return md5_cmn(c ^ (b | (~d)), a, b, x, s, t)
}
/*
* Add integers, wrapping at 2^32. This uses 16-bit operations internally
* to work around bugs in some JS interpreters.
*/
-function safe_add(x, y)
-{
- var lsw = (x & 0xFFFF) + (y & 0xFFFF);
- var msw = (x >> 16) + (y >> 16) + (lsw >> 16);
- return (msw << 16) | (lsw & 0xFFFF);
+function safe_add (x, y) {
+ var lsw = (x & 0xFFFF) + (y & 0xFFFF)
+ var msw = (x >> 16) + (y >> 16) + (lsw >> 16)
+ return (msw << 16) | (lsw & 0xFFFF)
}
/*
* Bitwise rotate a 32-bit number to the left.
*/
-function bit_rol(num, cnt)
-{
- return (num << cnt) | (num >>> (32 - cnt));
+function bit_rol (num, cnt) {
+ return (num << cnt) | (num >>> (32 - cnt))
}
-module.exports = function md5(buf) {
- return helpers.hash(buf, core_md5, 16);
-};
\ No newline at end of file
+module.exports = function md5 (buf) {
+ return helpers.hash(buf, core_md5, 16)
+}
diff --git a/package.json b/package.json
index 3a4dbfb..7ba2de7 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,9 @@
"browser": "browser.js",
"main": "index.js",
"scripts": {
- "test": "node test.js | tspec"
+ "standard": "standard",
+ "test": "npm run-script standard && npm run-script unit",
+ "unit": "node test.js | tspec"
},
"repository": {
"type": "git",
@@ -22,6 +24,7 @@
"homepage": "https://github.com/crypto-browserify/createHash",
"devDependencies": {
"hash-test-vectors": "^1.3.2",
+ "standard": "^5.3.1",
"tap-spec": "^2.1.2",
"tape": "^3.0.3"
},
diff --git a/test.js b/test.js
index 0c6bd88..3928d66 100644
--- a/test.js
+++ b/test.js
@@ -1,8 +1,7 @@
-var fs = require('fs')
var test = require('tape')
var algorithms = ['sha1', 'sha224', 'sha256', 'sha384', 'sha512', 'md5', 'rmd160', 'ripemd160']
-var encodings = [/*'binary',*/ 'hex', 'base64'];
+var encodings = ['hex', 'base64'] // ignore binary
var vectors = require('hash-test-vectors')
vectors.forEach(function (vector) {
vector.ripemd160 = vector.rmd160
@@ -15,25 +14,27 @@ algorithms.forEach(function (algorithm) {
var input = new Buffer(obj.input, 'base64')
var node = obj[algorithm]
var js = createHash(algorithm).update(input).digest('hex')
- t.equal(js, node, algorithm + '(testVector['+i+']) == ' + node)
+ t.equal(js, node, algorithm + '(testVector[' + i + ']) == ' + node)
})
encodings.forEach(function (encoding) {
- vectors.forEach(function (obj, i) {
- var input = new Buffer(obj.input, 'base64').toString(encoding)
- var node = obj[algorithm]
- var js = createHash(algorithm).update(input, encoding).digest('hex')
- t.equal(js, node, algorithm + '(testVector['+i+'], '+encoding+') == ' + node)
- })
- });
+ vectors.forEach(function (obj, i) {
+ var input = new Buffer(obj.input, 'base64').toString(encoding)
+ var node = obj[algorithm]
+ var js = createHash(algorithm).update(input, encoding).digest('hex')
+ t.equal(js, node, algorithm + '(testVector[' + i + '], ' + encoding + ') == ' + node)
+ })
+ })
+
vectors.forEach(function (obj, i) {
var input = new Buffer(obj.input, 'base64')
var node = obj[algorithm]
- var hash = createHash(algorithm);
+ var hash = createHash(algorithm)
hash.end(input)
var js = hash.read().toString('hex')
- t.equal(js, node, algorithm + '(testVector['+i+']) == ' + node)
+ t.equal(js, node, algorithm + '(testVector[' + i + ']) == ' + node)
})
+
t.end()
})
-});
+})
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-create-hash.git
More information about the Pkg-javascript-commits
mailing list