Skip to content

Commit 5b5ae3e

Browse files
binghaiwangPeterRao
authored andcommitted
fix: issues #386 (#390)
1 parent 59e245e commit 5b5ae3e

File tree

8 files changed

+471
-6
lines changed

8 files changed

+471
-6
lines changed

browser-build.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ function build(options, callback) {
3434
"global": true,
3535
"presets": ["es2015"],
3636
"plugins": ["transform-runtime"],
37-
"only": ['lib/*', 'node_modules/co-gather/*', 'shims/*'],
37+
"only": ['lib/*', 'node_modules/co-gather/*', 'shims/*', 'shims/crypto/*'],
3838
}).transform(aliasify, {
3939
global: true,
4040
aliases: {
4141
'zlib': false,
4242
'iconv-lite': false,
43-
'crypto': './shims/crypto.js',
43+
'crypto': './shims/crypto/crypto.js',
4444
},
4545
verbose: false
4646
}).bundle(function(err, data) {

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"mime": "./shims/mime.js",
1414
"urllib": "./shims/xhr.js",
1515
"utility": "./shims/utility.js",
16-
"crypto": "./shims/crypto.js",
16+
"crypto": "./shims/crypto/crypto.js",
1717
"fs": false,
1818
"child_process": false
1919
},
@@ -66,7 +66,6 @@
6666
"browserify": "^13.3.0",
6767
"co-fs": "^1.2.0",
6868
"co-mocha": "^1.2.1",
69-
"crypto-browserify": "^1.0.9",
7069
"crypto-js": "^3.1.9-1",
7170
"filereader": "^0.10.3",
7271
"git-pre-hooks": "^1.2.0",

shims/crypto.js

Lines changed: 0 additions & 2 deletions
This file was deleted.

shims/crypto/crypto.js

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
2+
var Buffer = require('buffer').Buffer;
3+
var sha = require('./sha');
4+
var sha256 = require('./sha256');
5+
var md5 = require('./md5');
6+
7+
var algorithms = {
8+
sha1: sha,
9+
sha256: sha256,
10+
md5: md5
11+
};
12+
13+
var blocksize = 64;
14+
var zeroBuffer = new Buffer(blocksize);
15+
zeroBuffer.fill(0);
16+
17+
function hmac(fn, key, data) {
18+
if(!Buffer.isBuffer(key)) key = new Buffer(key);
19+
if(!Buffer.isBuffer(data)) data = new Buffer(data);
20+
21+
if(key.length > blocksize) {
22+
key = fn(key)
23+
} else if(key.length < blocksize) {
24+
key = Buffer.concat([key, zeroBuffer], blocksize)
25+
}
26+
27+
var ipad = new Buffer(blocksize), opad = new Buffer(blocksize);
28+
for(var i = 0; i < blocksize; i++) {
29+
ipad[i] = key[i] ^ 0x36
30+
opad[i] = key[i] ^ 0x5C
31+
}
32+
33+
var hash = fn(Buffer.concat([ipad, data]))
34+
return fn(Buffer.concat([opad, hash]))
35+
}
36+
37+
function hash(alg, key) {
38+
alg = alg || 'sha1';
39+
var fn = algorithms[alg];
40+
var bufs = [];
41+
var length = 0;
42+
if(!fn) error('algorithm:', alg, 'is not yet supported');
43+
return {
44+
update: function (data) {
45+
if(!Buffer.isBuffer(data)) data = new Buffer(data);
46+
47+
bufs.push(data);
48+
length += data.length;
49+
return this
50+
},
51+
digest: function (enc) {
52+
var buf = Buffer.concat(bufs);
53+
var r = key ? hmac(fn, key, buf) : fn(buf);
54+
bufs = null;
55+
return enc ? r.toString(enc) : r
56+
}
57+
}
58+
}
59+
60+
function error () {
61+
var m = [].slice.call(arguments).join(' ')
62+
throw new Error([
63+
m,
64+
'we accept pull requests',
65+
'http://github.com/dominictarr/crypto-browserify'
66+
].join('\n'))
67+
}
68+
69+
exports.createHash = function (alg) { return hash(alg) };
70+
exports.createHmac = function (alg, key) { return hash(alg, key) };
71+
72+
function each(a, f) {
73+
for(var i in a)
74+
f(a[i], i)
75+
}
76+
77+
// the least I can do is make error messages for the rest of the node.js/crypto api.
78+
each(['createCredentials'
79+
, 'createCipher'
80+
, 'createCipheriv'
81+
, 'createDecipher'
82+
, 'createDecipheriv'
83+
, 'createSign'
84+
, 'createVerify'
85+
, 'createDiffieHellman'
86+
, 'pbkdf2'], function (name) {
87+
exports[name] = function () {
88+
error('sorry,', name, 'is not implemented yet')
89+
}
90+
});

shims/crypto/helpers.js

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
var Buffer = require('buffer').Buffer;
2+
var intSize = 4;
3+
var zeroBuffer = new Buffer(intSize); zeroBuffer.fill(0);
4+
var chrsz = 8;
5+
6+
function toArray(buf, bigEndian) {
7+
if ((buf.length % intSize) !== 0) {
8+
var len = buf.length + (intSize - (buf.length % intSize));
9+
buf = Buffer.concat([buf, zeroBuffer], len);
10+
}
11+
12+
var arr = [];
13+
var fn = bigEndian ? buf.readInt32BE : buf.readInt32LE;
14+
for (var i = 0; i < buf.length; i += intSize) {
15+
arr.push(fn.call(buf, i));
16+
}
17+
return arr;
18+
}
19+
20+
function toBuffer(arr, size, bigEndian) {
21+
var buf = new Buffer(size);
22+
var fn = bigEndian ? buf.writeInt32BE : buf.writeInt32LE;
23+
for (var i = 0; i < arr.length; i++) {
24+
fn.call(buf, arr[i], i * 4, true);
25+
}
26+
return buf;
27+
}
28+
29+
function hash(buf, fn, hashSize, bigEndian) {
30+
if (!Buffer.isBuffer(buf)) buf = new Buffer(buf);
31+
var arr = fn(toArray(buf, bigEndian), buf.length * chrsz);
32+
return toBuffer(arr, hashSize, bigEndian);
33+
}
34+
35+
module.exports = { hash: hash };

shims/crypto/md5.js

Lines changed: 163 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,163 @@
1+
/*
2+
* A JavaScript implementation of the RSA Data Security, Inc. MD5 Message
3+
* Digest Algorithm, as defined in RFC 1321.
4+
* Version 2.1 Copyright (C) Paul Johnston 1999 - 2002.
5+
* Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet
6+
* Distributed under the BSD License
7+
* See http://pajhome.org.uk/crypt/md5 for more info.
8+
*/
9+
10+
var helpers = require('./helpers');
11+
12+
/*
13+
* Perform a simple self-test to see if the VM is working
14+
*/
15+
function md5_vm_test()
16+
{
17+
return hex_md5("abc") == "900150983cd24fb0d6963f7d28e17f72";
18+
}
19+
20+
/*
21+
* Calculate the MD5 of an array of little-endian words, and a bit length
22+
*/
23+
function core_md5(x, len)
24+
{
25+
/* append padding */
26+
x[len >> 5] |= 0x80 << ((len) % 32);
27+
x[(((len + 64) >>> 9) << 4) + 14] = len;
28+
29+
var a = 1732584193;
30+
var b = -271733879;
31+
var c = -1732584194;
32+
var d = 271733878;
33+
34+
for(var i = 0; i < x.length; i += 16)
35+
{
36+
var olda = a;
37+
var oldb = b;
38+
var oldc = c;
39+
var oldd = d;
40+
41+
a = md5_ff(a, b, c, d, x[i+ 0], 7 , -680876936);
42+
d = md5_ff(d, a, b, c, x[i+ 1], 12, -389564586);
43+
c = md5_ff(c, d, a, b, x[i+ 2], 17, 606105819);
44+
b = md5_ff(b, c, d, a, x[i+ 3], 22, -1044525330);
45+
a = md5_ff(a, b, c, d, x[i+ 4], 7 , -176418897);
46+
d = md5_ff(d, a, b, c, x[i+ 5], 12, 1200080426);
47+
c = md5_ff(c, d, a, b, x[i+ 6], 17, -1473231341);
48+
b = md5_ff(b, c, d, a, x[i+ 7], 22, -45705983);
49+
a = md5_ff(a, b, c, d, x[i+ 8], 7 , 1770035416);
50+
d = md5_ff(d, a, b, c, x[i+ 9], 12, -1958414417);
51+
c = md5_ff(c, d, a, b, x[i+10], 17, -42063);
52+
b = md5_ff(b, c, d, a, x[i+11], 22, -1990404162);
53+
a = md5_ff(a, b, c, d, x[i+12], 7 , 1804603682);
54+
d = md5_ff(d, a, b, c, x[i+13], 12, -40341101);
55+
c = md5_ff(c, d, a, b, x[i+14], 17, -1502002290);
56+
b = md5_ff(b, c, d, a, x[i+15], 22, 1236535329);
57+
58+
a = md5_gg(a, b, c, d, x[i+ 1], 5 , -165796510);
59+
d = md5_gg(d, a, b, c, x[i+ 6], 9 , -1069501632);
60+
c = md5_gg(c, d, a, b, x[i+11], 14, 643717713);
61+
b = md5_gg(b, c, d, a, x[i+ 0], 20, -373897302);
62+
a = md5_gg(a, b, c, d, x[i+ 5], 5 , -701558691);
63+
d = md5_gg(d, a, b, c, x[i+10], 9 , 38016083);
64+
c = md5_gg(c, d, a, b, x[i+15], 14, -660478335);
65+
b = md5_gg(b, c, d, a, x[i+ 4], 20, -405537848);
66+
a = md5_gg(a, b, c, d, x[i+ 9], 5 , 568446438);
67+
d = md5_gg(d, a, b, c, x[i+14], 9 , -1019803690);
68+
c = md5_gg(c, d, a, b, x[i+ 3], 14, -187363961);
69+
b = md5_gg(b, c, d, a, x[i+ 8], 20, 1163531501);
70+
a = md5_gg(a, b, c, d, x[i+13], 5 , -1444681467);
71+
d = md5_gg(d, a, b, c, x[i+ 2], 9 , -51403784);
72+
c = md5_gg(c, d, a, b, x[i+ 7], 14, 1735328473);
73+
b = md5_gg(b, c, d, a, x[i+12], 20, -1926607734);
74+
75+
a = md5_hh(a, b, c, d, x[i+ 5], 4 , -378558);
76+
d = md5_hh(d, a, b, c, x[i+ 8], 11, -2022574463);
77+
c = md5_hh(c, d, a, b, x[i+11], 16, 1839030562);
78+
b = md5_hh(b, c, d, a, x[i+14], 23, -35309556);
79+
a = md5_hh(a, b, c, d, x[i+ 1], 4 , -1530992060);
80+
d = md5_hh(d, a, b, c, x[i+ 4], 11, 1272893353);
81+
c = md5_hh(c, d, a, b, x[i+ 7], 16, -155497632);
82+
b = md5_hh(b, c, d, a, x[i+10], 23, -1094730640);
83+
a = md5_hh(a, b, c, d, x[i+13], 4 , 681279174);
84+
d = md5_hh(d, a, b, c, x[i+ 0], 11, -358537222);
85+
c = md5_hh(c, d, a, b, x[i+ 3], 16, -722521979);
86+
b = md5_hh(b, c, d, a, x[i+ 6], 23, 76029189);
87+
a = md5_hh(a, b, c, d, x[i+ 9], 4 , -640364487);
88+
d = md5_hh(d, a, b, c, x[i+12], 11, -421815835);
89+
c = md5_hh(c, d, a, b, x[i+15], 16, 530742520);
90+
b = md5_hh(b, c, d, a, x[i+ 2], 23, -995338651);
91+
92+
a = md5_ii(a, b, c, d, x[i+ 0], 6 , -198630844);
93+
d = md5_ii(d, a, b, c, x[i+ 7], 10, 1126891415);
94+
c = md5_ii(c, d, a, b, x[i+14], 15, -1416354905);
95+
b = md5_ii(b, c, d, a, x[i+ 5], 21, -57434055);
96+
a = md5_ii(a, b, c, d, x[i+12], 6 , 1700485571);
97+
d = md5_ii(d, a, b, c, x[i+ 3], 10, -1894986606);
98+
c = md5_ii(c, d, a, b, x[i+10], 15, -1051523);
99+
b = md5_ii(b, c, d, a, x[i+ 1], 21, -2054922799);
100+
a = md5_ii(a, b, c, d, x[i+ 8], 6 , 1873313359);
101+
d = md5_ii(d, a, b, c, x[i+15], 10, -30611744);
102+
c = md5_ii(c, d, a, b, x[i+ 6], 15, -1560198380);
103+
b = md5_ii(b, c, d, a, x[i+13], 21, 1309151649);
104+
a = md5_ii(a, b, c, d, x[i+ 4], 6 , -145523070);
105+
d = md5_ii(d, a, b, c, x[i+11], 10, -1120210379);
106+
c = md5_ii(c, d, a, b, x[i+ 2], 15, 718787259);
107+
b = md5_ii(b, c, d, a, x[i+ 9], 21, -343485551);
108+
109+
a = safe_add(a, olda);
110+
b = safe_add(b, oldb);
111+
c = safe_add(c, oldc);
112+
d = safe_add(d, oldd);
113+
}
114+
return Array(a, b, c, d);
115+
116+
}
117+
118+
/*
119+
* These functions implement the four basic operations the algorithm uses.
120+
*/
121+
function md5_cmn(q, a, b, x, s, t)
122+
{
123+
return safe_add(bit_rol(safe_add(safe_add(a, q), safe_add(x, t)), s),b);
124+
}
125+
function md5_ff(a, b, c, d, x, s, t)
126+
{
127+
return md5_cmn((b & c) | ((~b) & d), a, b, x, s, t);
128+
}
129+
function md5_gg(a, b, c, d, x, s, t)
130+
{
131+
return md5_cmn((b & d) | (c & (~d)), a, b, x, s, t);
132+
}
133+
function md5_hh(a, b, c, d, x, s, t)
134+
{
135+
return md5_cmn(b ^ c ^ d, a, b, x, s, t);
136+
}
137+
function md5_ii(a, b, c, d, x, s, t)
138+
{
139+
return md5_cmn(c ^ (b | (~d)), a, b, x, s, t);
140+
}
141+
142+
/*
143+
* Add integers, wrapping at 2^32. This uses 16-bit operations internally
144+
* to work around bugs in some JS interpreters.
145+
*/
146+
function safe_add(x, y)
147+
{
148+
var lsw = (x & 0xFFFF) + (y & 0xFFFF);
149+
var msw = (x >> 16) + (y >> 16) + (lsw >> 16);
150+
return (msw << 16) | (lsw & 0xFFFF);
151+
}
152+
153+
/*
154+
* Bitwise rotate a 32-bit number to the left.
155+
*/
156+
function bit_rol(num, cnt)
157+
{
158+
return (num << cnt) | (num >>> (32 - cnt));
159+
}
160+
161+
module.exports = function md5(buf) {
162+
return helpers.hash(buf, core_md5, 16);
163+
};

0 commit comments

Comments
 (0)