Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

removes md5.js file.

Use built in crypto hash instead.
  • Loading branch information...
commit 47adb13c2e3b5be424722c48651a6d0734ca61dd 1 parent cf5d49f
CrypticSwarm authored May 08, 2012
381  lib/wheat/md5.js
... ...
@@ -1,381 +0,0 @@
1  
-/*
2  
- * A JavaScript implementation of the RSA Data Security, Inc. MD5 Message
3  
- * Digest Algorithm, as defined in RFC 1321.
4  
- * Version 2.2 Copyright (C) Paul Johnston 1999 - 2009
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  
-/*
11  
- * Configurable variables. You may need to tweak these to be compatible with
12  
- * the server-side, but the defaults work in most cases.
13  
- */
14  
-var hexcase = 0;   /* hex output format. 0 - lowercase; 1 - uppercase        */
15  
-var b64pad  = "";  /* base-64 pad character. "=" for strict RFC compliance   */
16  
-
17  
-/*
18  
- * These are the functions you'll usually want to call
19  
- * They take string arguments and return either hex or base-64 encoded strings
20  
- */
21  
-function hex_md5(s)    { return rstr2hex(rstr_md5(str2rstr_utf8(s))); }
22  
-function b64_md5(s)    { return rstr2b64(rstr_md5(str2rstr_utf8(s))); }
23  
-function any_md5(s, e) { return rstr2any(rstr_md5(str2rstr_utf8(s)), e); }
24  
-function hex_hmac_md5(k, d)
25  
-  { return rstr2hex(rstr_hmac_md5(str2rstr_utf8(k), str2rstr_utf8(d))); }
26  
-function b64_hmac_md5(k, d)
27  
-  { return rstr2b64(rstr_hmac_md5(str2rstr_utf8(k), str2rstr_utf8(d))); }
28  
-function any_hmac_md5(k, d, e)
29  
-  { return rstr2any(rstr_hmac_md5(str2rstr_utf8(k), str2rstr_utf8(d)), e); }
30  
-
31  
-exports.md5 = function (s)    { return rstr2hex(rstr_md5(s)); }
32  
-
33  
-/*
34  
- * Perform a simple self-test to see if the VM is working
35  
- */
36  
-function md5_vm_test()
37  
-{
38  
-  return hex_md5("abc").toLowerCase() == "900150983cd24fb0d6963f7d28e17f72";
39  
-}
40  
-
41  
-/*
42  
- * Calculate the MD5 of a raw string
43  
- */
44  
-function rstr_md5(s)
45  
-{
46  
-  return binl2rstr(binl_md5(rstr2binl(s), s.length * 8));
47  
-}
48  
-
49  
-/*
50  
- * Calculate the HMAC-MD5, of a key and some data (raw strings)
51  
- */
52  
-function rstr_hmac_md5(key, data)
53  
-{
54  
-  var bkey = rstr2binl(key);
55  
-  if(bkey.length > 16) bkey = binl_md5(bkey, key.length * 8);
56  
-
57  
-  var ipad = Array(16), opad = Array(16);
58  
-  for(var i = 0; i < 16; i++)
59  
-  {
60  
-    ipad[i] = bkey[i] ^ 0x36363636;
61  
-    opad[i] = bkey[i] ^ 0x5C5C5C5C;
62  
-  }
63  
-
64  
-  var hash = binl_md5(ipad.concat(rstr2binl(data)), 512 + data.length * 8);
65  
-  return binl2rstr(binl_md5(opad.concat(hash), 512 + 128));
66  
-}
67  
-
68  
-/*
69  
- * Convert a raw string to a hex string
70  
- */
71  
-function rstr2hex(input)
72  
-{
73  
-  try { hexcase } catch(e) { hexcase=0; }
74  
-  var hex_tab = hexcase ? "0123456789ABCDEF" : "0123456789abcdef";
75  
-  var output = "";
76  
-  var x;
77  
-  for(var i = 0; i < input.length; i++)
78  
-  {
79  
-    x = input.charCodeAt(i);
80  
-    output += hex_tab.charAt((x >>> 4) & 0x0F)
81  
-           +  hex_tab.charAt( x        & 0x0F);
82  
-  }
83  
-  return output;
84  
-}
85  
-
86  
-/*
87  
- * Convert a raw string to a base-64 string
88  
- */
89  
-function rstr2b64(input)
90  
-{
91  
-  try { b64pad } catch(e) { b64pad=''; }
92  
-  var tab = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
93  
-  var output = "";
94  
-  var len = input.length;
95  
-  for(var i = 0; i < len; i += 3)
96  
-  {
97  
-    var triplet = (input.charCodeAt(i) << 16)
98  
-                | (i + 1 < len ? input.charCodeAt(i+1) << 8 : 0)
99  
-                | (i + 2 < len ? input.charCodeAt(i+2)      : 0);
100  
-    for(var j = 0; j < 4; j++)
101  
-    {
102  
-      if(i * 8 + j * 6 > input.length * 8) output += b64pad;
103  
-      else output += tab.charAt((triplet >>> 6*(3-j)) & 0x3F);
104  
-    }
105  
-  }
106  
-  return output;
107  
-}
108  
-
109  
-/*
110  
- * Convert a raw string to an arbitrary string encoding
111  
- */
112  
-function rstr2any(input, encoding)
113  
-{
114  
-  var divisor = encoding.length;
115  
-  var i, j, q, x, quotient;
116  
-
117  
-  /* Convert to an array of 16-bit big-endian values, forming the dividend */
118  
-  var dividend = Array(Math.ceil(input.length / 2));
119  
-  for(i = 0; i < dividend.length; i++)
120  
-  {
121  
-    dividend[i] = (input.charCodeAt(i * 2) << 8) | input.charCodeAt(i * 2 + 1);
122  
-  }
123  
-
124  
-  /*
125  
-   * Repeatedly perform a long division. The binary array forms the dividend,
126  
-   * the length of the encoding is the divisor. Once computed, the quotient
127  
-   * forms the dividend for the next step. All remainders are stored for later
128  
-   * use.
129  
-   */
130  
-  var full_length = Math.ceil(input.length * 8 /
131  
-                                    (Math.log(encoding.length) / Math.log(2)));
132  
-  var remainders = Array(full_length);
133  
-  for(j = 0; j < full_length; j++)
134  
-  {
135  
-    quotient = Array();
136  
-    x = 0;
137  
-    for(i = 0; i < dividend.length; i++)
138  
-    {
139  
-      x = (x << 16) + dividend[i];
140  
-      q = Math.floor(x / divisor);
141  
-      x -= q * divisor;
142  
-      if(quotient.length > 0 || q > 0)
143  
-        quotient[quotient.length] = q;
144  
-    }
145  
-    remainders[j] = x;
146  
-    dividend = quotient;
147  
-  }
148  
-
149  
-  /* Convert the remainders to the output string */
150  
-  var output = "";
151  
-  for(i = remainders.length - 1; i >= 0; i--)
152  
-    output += encoding.charAt(remainders[i]);
153  
-
154  
-  return output;
155  
-}
156  
-
157  
-/*
158  
- * Encode a string as utf-8.
159  
- * For efficiency, this assumes the input is valid utf-16.
160  
- */
161  
-function str2rstr_utf8(input)
162  
-{
163  
-  var output = "";
164  
-  var i = -1;
165  
-  var x, y;
166  
-
167  
-  while(++i < input.length)
168  
-  {
169  
-    /* Decode utf-16 surrogate pairs */
170  
-    x = input.charCodeAt(i);
171  
-    y = i + 1 < input.length ? input.charCodeAt(i + 1) : 0;
172  
-    if(0xD800 <= x && x <= 0xDBFF && 0xDC00 <= y && y <= 0xDFFF)
173  
-    {
174  
-      x = 0x10000 + ((x & 0x03FF) << 10) + (y & 0x03FF);
175  
-      i++;
176  
-    }
177  
-
178  
-    /* Encode output as utf-8 */
179  
-    if(x <= 0x7F)
180  
-      output += String.fromCharCode(x);
181  
-    else if(x <= 0x7FF)
182  
-      output += String.fromCharCode(0xC0 | ((x >>> 6 ) & 0x1F),
183  
-                                    0x80 | ( x         & 0x3F));
184  
-    else if(x <= 0xFFFF)
185  
-      output += String.fromCharCode(0xE0 | ((x >>> 12) & 0x0F),
186  
-                                    0x80 | ((x >>> 6 ) & 0x3F),
187  
-                                    0x80 | ( x         & 0x3F));
188  
-    else if(x <= 0x1FFFFF)
189  
-      output += String.fromCharCode(0xF0 | ((x >>> 18) & 0x07),
190  
-                                    0x80 | ((x >>> 12) & 0x3F),
191  
-                                    0x80 | ((x >>> 6 ) & 0x3F),
192  
-                                    0x80 | ( x         & 0x3F));
193  
-  }
194  
-  return output;
195  
-}
196  
-
197  
-/*
198  
- * Encode a string as utf-16
199  
- */
200  
-function str2rstr_utf16le(input)
201  
-{
202  
-  var output = "";
203  
-  for(var i = 0; i < input.length; i++)
204  
-    output += String.fromCharCode( input.charCodeAt(i)        & 0xFF,
205  
-                                  (input.charCodeAt(i) >>> 8) & 0xFF);
206  
-  return output;
207  
-}
208  
-
209  
-function str2rstr_utf16be(input)
210  
-{
211  
-  var output = "";
212  
-  for(var i = 0; i < input.length; i++)
213  
-    output += String.fromCharCode((input.charCodeAt(i) >>> 8) & 0xFF,
214  
-                                   input.charCodeAt(i)        & 0xFF);
215  
-  return output;
216  
-}
217  
-
218  
-/*
219  
- * Convert a raw string to an array of little-endian words
220  
- * Characters >255 have their high-byte silently ignored.
221  
- */
222  
-function rstr2binl(input)
223  
-{
224  
-  var output = Array(input.length >> 2);
225  
-  for(var i = 0; i < output.length; i++)
226  
-    output[i] = 0;
227  
-  for(var i = 0; i < input.length * 8; i += 8)
228  
-    output[i>>5] |= (input.charCodeAt(i / 8) & 0xFF) << (i%32);
229  
-  return output;
230  
-}
231  
-
232  
-/*
233  
- * Convert an array of little-endian words to a string
234  
- */
235  
-function binl2rstr(input)
236  
-{
237  
-  var output = "";
238  
-  for(var i = 0; i < input.length * 32; i += 8)
239  
-    output += String.fromCharCode((input[i>>5] >>> (i % 32)) & 0xFF);
240  
-  return output;
241  
-}
242  
-
243  
-/*
244  
- * Calculate the MD5 of an array of little-endian words, and a bit length.
245  
- */
246  
-function binl_md5(x, len)
247  
-{
248  
-  /* append padding */
249  
-  x[len >> 5] |= 0x80 << ((len) % 32);
250  
-  x[(((len + 64) >>> 9) << 4) + 14] = len;
251  
-
252  
-  var a =  1732584193;
253  
-  var b = -271733879;
254  
-  var c = -1732584194;
255  
-  var d =  271733878;
256  
-
257  
-  for(var i = 0; i < x.length; i += 16)
258  
-  {
259  
-    var olda = a;
260  
-    var oldb = b;
261  
-    var oldc = c;
262  
-    var oldd = d;
263  
-
264  
-    a = md5_ff(a, b, c, d, x[i+ 0], 7 , -680876936);
265  
-    d = md5_ff(d, a, b, c, x[i+ 1], 12, -389564586);
266  
-    c = md5_ff(c, d, a, b, x[i+ 2], 17,  606105819);
267  
-    b = md5_ff(b, c, d, a, x[i+ 3], 22, -1044525330);
268  
-    a = md5_ff(a, b, c, d, x[i+ 4], 7 , -176418897);
269  
-    d = md5_ff(d, a, b, c, x[i+ 5], 12,  1200080426);
270  
-    c = md5_ff(c, d, a, b, x[i+ 6], 17, -1473231341);
271  
-    b = md5_ff(b, c, d, a, x[i+ 7], 22, -45705983);
272  
-    a = md5_ff(a, b, c, d, x[i+ 8], 7 ,  1770035416);
273  
-    d = md5_ff(d, a, b, c, x[i+ 9], 12, -1958414417);
274  
-    c = md5_ff(c, d, a, b, x[i+10], 17, -42063);
275  
-    b = md5_ff(b, c, d, a, x[i+11], 22, -1990404162);
276  
-    a = md5_ff(a, b, c, d, x[i+12], 7 ,  1804603682);
277  
-    d = md5_ff(d, a, b, c, x[i+13], 12, -40341101);
278  
-    c = md5_ff(c, d, a, b, x[i+14], 17, -1502002290);
279  
-    b = md5_ff(b, c, d, a, x[i+15], 22,  1236535329);
280  
-
281  
-    a = md5_gg(a, b, c, d, x[i+ 1], 5 , -165796510);
282  
-    d = md5_gg(d, a, b, c, x[i+ 6], 9 , -1069501632);
283  
-    c = md5_gg(c, d, a, b, x[i+11], 14,  643717713);
284  
-    b = md5_gg(b, c, d, a, x[i+ 0], 20, -373897302);
285  
-    a = md5_gg(a, b, c, d, x[i+ 5], 5 , -701558691);
286  
-    d = md5_gg(d, a, b, c, x[i+10], 9 ,  38016083);
287  
-    c = md5_gg(c, d, a, b, x[i+15], 14, -660478335);
288  
-    b = md5_gg(b, c, d, a, x[i+ 4], 20, -405537848);
289  
-    a = md5_gg(a, b, c, d, x[i+ 9], 5 ,  568446438);
290  
-    d = md5_gg(d, a, b, c, x[i+14], 9 , -1019803690);
291  
-    c = md5_gg(c, d, a, b, x[i+ 3], 14, -187363961);
292  
-    b = md5_gg(b, c, d, a, x[i+ 8], 20,  1163531501);
293  
-    a = md5_gg(a, b, c, d, x[i+13], 5 , -1444681467);
294  
-    d = md5_gg(d, a, b, c, x[i+ 2], 9 , -51403784);
295  
-    c = md5_gg(c, d, a, b, x[i+ 7], 14,  1735328473);
296  
-    b = md5_gg(b, c, d, a, x[i+12], 20, -1926607734);
297  
-
298  
-    a = md5_hh(a, b, c, d, x[i+ 5], 4 , -378558);
299  
-    d = md5_hh(d, a, b, c, x[i+ 8], 11, -2022574463);
300  
-    c = md5_hh(c, d, a, b, x[i+11], 16,  1839030562);
301  
-    b = md5_hh(b, c, d, a, x[i+14], 23, -35309556);
302  
-    a = md5_hh(a, b, c, d, x[i+ 1], 4 , -1530992060);
303  
-    d = md5_hh(d, a, b, c, x[i+ 4], 11,  1272893353);
304  
-    c = md5_hh(c, d, a, b, x[i+ 7], 16, -155497632);
305  
-    b = md5_hh(b, c, d, a, x[i+10], 23, -1094730640);
306  
-    a = md5_hh(a, b, c, d, x[i+13], 4 ,  681279174);
307  
-    d = md5_hh(d, a, b, c, x[i+ 0], 11, -358537222);
308  
-    c = md5_hh(c, d, a, b, x[i+ 3], 16, -722521979);
309  
-    b = md5_hh(b, c, d, a, x[i+ 6], 23,  76029189);
310  
-    a = md5_hh(a, b, c, d, x[i+ 9], 4 , -640364487);
311  
-    d = md5_hh(d, a, b, c, x[i+12], 11, -421815835);
312  
-    c = md5_hh(c, d, a, b, x[i+15], 16,  530742520);
313  
-    b = md5_hh(b, c, d, a, x[i+ 2], 23, -995338651);
314  
-
315  
-    a = md5_ii(a, b, c, d, x[i+ 0], 6 , -198630844);
316  
-    d = md5_ii(d, a, b, c, x[i+ 7], 10,  1126891415);
317  
-    c = md5_ii(c, d, a, b, x[i+14], 15, -1416354905);
318  
-    b = md5_ii(b, c, d, a, x[i+ 5], 21, -57434055);
319  
-    a = md5_ii(a, b, c, d, x[i+12], 6 ,  1700485571);
320  
-    d = md5_ii(d, a, b, c, x[i+ 3], 10, -1894986606);
321  
-    c = md5_ii(c, d, a, b, x[i+10], 15, -1051523);
322  
-    b = md5_ii(b, c, d, a, x[i+ 1], 21, -2054922799);
323  
-    a = md5_ii(a, b, c, d, x[i+ 8], 6 ,  1873313359);
324  
-    d = md5_ii(d, a, b, c, x[i+15], 10, -30611744);
325  
-    c = md5_ii(c, d, a, b, x[i+ 6], 15, -1560198380);
326  
-    b = md5_ii(b, c, d, a, x[i+13], 21,  1309151649);
327  
-    a = md5_ii(a, b, c, d, x[i+ 4], 6 , -145523070);
328  
-    d = md5_ii(d, a, b, c, x[i+11], 10, -1120210379);
329  
-    c = md5_ii(c, d, a, b, x[i+ 2], 15,  718787259);
330  
-    b = md5_ii(b, c, d, a, x[i+ 9], 21, -343485551);
331  
-
332  
-    a = safe_add(a, olda);
333  
-    b = safe_add(b, oldb);
334  
-    c = safe_add(c, oldc);
335  
-    d = safe_add(d, oldd);
336  
-  }
337  
-  return Array(a, b, c, d);
338  
-}
339  
-
340  
-/*
341  
- * These functions implement the four basic operations the algorithm uses.
342  
- */
343  
-function md5_cmn(q, a, b, x, s, t)
344  
-{
345  
-  return safe_add(bit_rol(safe_add(safe_add(a, q), safe_add(x, t)), s),b);
346  
-}
347  
-function md5_ff(a, b, c, d, x, s, t)
348  
-{
349  
-  return md5_cmn((b & c) | ((~b) & d), a, b, x, s, t);
350  
-}
351  
-function md5_gg(a, b, c, d, x, s, t)
352  
-{
353  
-  return md5_cmn((b & d) | (c & (~d)), a, b, x, s, t);
354  
-}
355  
-function md5_hh(a, b, c, d, x, s, t)
356  
-{
357  
-  return md5_cmn(b ^ c ^ d, a, b, x, s, t);
358  
-}
359  
-function md5_ii(a, b, c, d, x, s, t)
360  
-{
361  
-  return md5_cmn(c ^ (b | (~d)), a, b, x, s, t);
362  
-}
363  
-
364  
-/*
365  
- * Add integers, wrapping at 2^32. This uses 16-bit operations internally
366  
- * to work around bugs in some JS interpreters.
367  
- */
368  
-function safe_add(x, y)
369  
-{
370  
-  var lsw = (x & 0xFFFF) + (y & 0xFFFF);
371  
-  var msw = (x >> 16) + (y >> 16) + (lsw >> 16);
372  
-  return (msw << 16) | (lsw & 0xFFFF);
373  
-}
374  
-
375  
-/*
376  
- * Bitwise rotate a 32-bit number to the left.
377  
- */
378  
-function bit_rol(num, cnt)
379  
-{
380  
-  return (num << cnt) | (num >>> (32 - cnt));
381  
-}
6  lib/wheat/renderers.js
@@ -3,7 +3,7 @@ var Git = require('git-fs'),
3 3
     Tools = require('./tools'),
4 4
     Buffer = require('buffer').Buffer,
5 5
     Prettify = require('./prettify'),
6  
-    MD5 = require('./md5'),
  6
+    Crypto = require('crypto'),
7 7
     ChildProcess = require('child_process'),
8 8
     getMime = require('simple-mime')('application/octet-string'),
9 9
     Step = require('step');
@@ -58,7 +58,9 @@ function postProcess(headers, buffer, version, path, callback) {
58 58
       if (version === 'fs') {
59 59
         delete headers["Cache-Control"];
60 60
       } else {
61  
-        headers["ETag"] = MD5.md5(version + ":" + path + ":" + date);
  61
+        var hash = Crypto.createHash('md5')
  62
+        hash.update(version + ":" + path + ":" + date)
  63
+        headers["ETag"] = hash.digest('hex');
62 64
       }
63 65
 
64 66
       if (/html/.test(headers["Content-Type"])) {
6  lib/wheat/tools.js
... ...
@@ -1,7 +1,7 @@
1 1
 var Step = require('step'),
2 2
     Haml = require('haml'),
3 3
     Markdown = require('./markdown'),
4  
-    MD5 = require('./md5'),
  4
+    Crypto = require('crypto'),
5 5
     Buffer = require('buffer').Buffer,
6 6
     Git = require('git-fs'),
7 7
     datetime = require('datetime');
@@ -26,8 +26,10 @@ var Helpers = {
26 26
   },
27 27
   gravitar: function gravitar(email, size) {
28 28
     size = size || 200;
  29
+    var hash = Crypto.createHash('md5')
  30
+    hash.update((email+"").trim().toLowerCase())
29 31
     return "http://www.gravatar.com/avatar/" +
30  
-      MD5.md5((email+"").trim().toLowerCase()) +
  32
+      hash.digest('hex') +
31 33
       "?r=pg&s=" + size + ".jpg&d=identicon";
32 34
   },
33 35
   formatDate: function formatDate(val, format, tz, locale) {

0 notes on commit 47adb13

Please sign in to comment.
Something went wrong with that request. Please try again.