Merge pull request #16 from legastero/master

Match core crypto API outputs.

Author: dominictarr

.gitignore

@@ -0,0 +1 @@
+node_modules

index.js

@@ -7,36 +7,36 @@ var md5 = require('./md5')
 var algorithms = {
   sha1: {
     hex: sha.hex_sha1,
-    binary: sha.b64_sha1,
-    ascii: sha.str_sha1
+    base64: sha.b64_sha1,
+    binary: sha.str_sha1
   },
   sha256: {
     hex: sha256.hex_sha256,
-    binary: sha256.b64_sha256,
-    ascii: sha256.str_sha256
+    base64: sha256.b64_sha256,
+    binary: sha256.str_sha256
   },
   md5: {
     hex: md5.hex_md5,
-    binary: md5.b64_md5,
-    ascii: md5.any_md5
+    base64: md5.b64_md5,
+    binary: md5.bin_md5
   }
 }
 
 var algorithmsHmac = {
   sha1: {
     hex: sha.hex_hmac_sha1,
-    binary: sha.b64_hmac_sha1,
-    ascii: sha.str_hmac_sha1
+    base64: sha.b64_hmac_sha1,
+    binary: sha.str_hmac_sha1
   },
   sha256: {
     hex: sha256.hex_hmac_sha256,
-    binary: sha256.b64_hmac_sha256,
-    ascii: sha256.str_hmac_sha256
+    base64: sha256.b64_hmac_sha256,
+    binary: sha256.str_hmac_sha256
   },
   md5: {
     hex: md5.hex_hmac_md5,
-    binary: md5.b64_hmac_md5,
-    ascii: md5.any_hmac_md5
+    base64: md5.b64_hmac_md5,
+    binary: md5.bin_hmac_md5
   }
 }
 

md5.js

@@ -12,19 +12,22 @@
  * the server-side, but the defaults work in most cases.
  */
 var hexcase = 0;   /* hex output format. 0 - lowercase; 1 - uppercase        */
-var b64pad  = "";  /* base-64 pad character. "=" for strict RFC compliance   */
+var b64pad  = "="; /* base-64 pad character. "=" for strict RFC compliance   */
 
 /*
  * These are the functions you'll usually want to call
  * They take string arguments and return either hex or base-64 encoded strings
  */
 function hex_md5(s)    { return rstr2hex(rstr_md5(str2rstr_utf8(s))); }
 function b64_md5(s)    { return rstr2b64(rstr_md5(str2rstr_utf8(s))); }
+function bin_md5(s)   { return rstr_md5(str2rstr_utf8(s)); }
 function any_md5(s, e) { return rstr2any(rstr_md5(str2rstr_utf8(s)), e); }
 function hex_hmac_md5(k, d)
   { return rstr2hex(rstr_hmac_md5(str2rstr_utf8(k), str2rstr_utf8(d))); }
 function b64_hmac_md5(k, d)
   { return rstr2b64(rstr_hmac_md5(str2rstr_utf8(k), str2rstr_utf8(d))); }
+function bin_hmac_md5(k, d)
+  { return rstr_hmac_md5(str2rstr_utf8(k), str2rstr_utf8(d)); }
 function any_hmac_md5(k, d, e)
   { return rstr2any(rstr_hmac_md5(str2rstr_utf8(k), str2rstr_utf8(d)), e); }
 
@@ -381,7 +384,9 @@ function bit_rol(num, cnt)
 
 exports.hex_md5 = hex_md5;
 exports.b64_md5 = b64_md5;
+exports.bin_md5 = bin_md5;
 exports.any_md5 = any_md5;
 exports.hex_hmac_md5 = hex_hmac_md5;
 exports.b64_hmac_md5 = b64_hmac_md5;
+exports.bin_hmac_md5 = bin_hmac_md5;
 exports.any_hmac_md5 = any_hmac_md5;

package.json

@@ -16,28 +16,19 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "tape": "~0.1.5"
+    "tape": "~1.0.4"
   },
   "testling": {
     "files": "test/*.js",
-    "browsers": {
-      "ie": [
-        8,
-        9
-      ],
-      "firefox": [
-        13
-      ],
-      "chrome": [
-        20
-      ],
-      "safari": [
-        5.1
-      ],
-      "opera": [
-        12
-      ]
-    }
+    "browsers": [
+      "ie/8..latest",
+      "chrome/20..latest",
+      "firefox/10..latest",
+      "safari/latest",
+      "opera/11.0..latest",
+      "iphone/6",
+      "ipad/6"
+    ]
   },
   "optionalDependencies": {}
 }

sha.js

@@ -18,9 +18,9 @@ exports.str_hmac_sha1 = str_hmac_sha1;
  * Configurable variables. You may need to tweak these to be compatible with
  * the server-side, but the defaults work in most cases.
  */
-var hexcase = 0;  /* hex output format. 0 - lowercase; 1 - uppercase        */
-var b64pad  = ""; /* base-64 pad character. "=" for strict RFC compliance   */
-var chrsz   = 8;  /* bits per input character. 8 - ASCII; 16 - Unicode      */
+var hexcase = 0;   /* hex output format. 0 - lowercase; 1 - uppercase        */
+var b64pad  = "="; /* base-64 pad character. "=" for strict RFC compliance   */
+var chrsz   = 8;   /* bits per input character. 8 - ASCII; 16 - Unicode      */
 
 /*
  * These are the functions you'll usually want to call

sha256.js

@@ -18,9 +18,9 @@ exports.str_hmac_sha256 = str_hmac_sha256;
  * Configurable variables. You may need to tweak these to be compatible with
  * the server-side, but the defaults work in most cases.
  */
-var hexcase = 0;  /* hex output format. 0 - lowercase; 1 - uppercase        */
-var b64pad  = ""; /* base-64 pad character. "=" for strict RFC compliance   */
-var chrsz   = 8;  /* bits per input character. 8 - ASCII; 16 - Unicode      */
+var hexcase = 0;   /* hex output format. 0 - lowercase; 1 - uppercase        */
+var b64pad  = "="; /* base-64 pad character. "=" for strict RFC compliance   */
+var chrsz   = 8;   /* bits per input character. 8 - ASCII; 16 - Unicode      */
 
 /*
  * These are the functions you'll usually want to call

test/simple.js

@@ -3,8 +3,8 @@ var test = require("tape")
 var crypto = require('crypto')
 var cryptoB = require('../')
 
-function assertSame (fn) {
-  test(fn.name, function (t) {
+function assertSame(name, fn) {
+  test(name, function (t) {
     t.plan(1)
     fn(crypto, function (err, expected) {
       fn(cryptoB, function (err, actual) {
@@ -15,29 +15,23 @@ function assertSame (fn) {
   })
 }
 
-assertSame(function sha1 (crypto, cb) {
-  cb(null, crypto.createHash('sha1').update('hello', 'utf-8').digest('hex'))
-})
+var algorithms = ['sha1', 'sha256', 'md5'];
+var encodings = ['binary', 'hex', 'base64'];
 
-assertSame(function md5 (crypto, cb) {
-  cb(null, crypto.createHash('md5').update('hello', 'utf-8').digest('hex'))
-})
 
-assertSame(function sha256 (crypto, cb) {
-  cb(null, crypto.createHash('sha256').update('hello', 'utf-8').digest('hex'))
-})
+algorithms.forEach(function (algorithm) {
+    encodings.forEach(function (encoding) {
 
-assertSame(function sha1hmac (crypto, cb) {
-  cb(null, crypto.createHmac('sha1', 'secret').update('hello', 'utf-8').digest('hex'))
-})
+        assertSame(algorithm + ' hash using ' + encoding, function (crypto, cb) {
+            cb(null, crypto.createHash(algorithm).update('hello', 'utf-8').digest(encoding));
+        })
 
-assertSame(function md5hmac (crypto, cb) {
-  cb(null, crypto.createHmac('md5', 'secret').update('hello', 'utf-8').digest('hex'))
-})
+        assertSame(algorithm + ' hmac using ' + encoding, function (crypto, cb) {
+            cb(null, crypto.createHmac(algorithm, 'secret').update('hello', 'utf-8').digest(encoding))
+        })
 
-assertSame(function sha256hmac (crypto, cb) {
-  cb(null, crypto.createHmac('sha256', 'secret').update('hello', 'utf-8').digest('hex'))
-})
+    });
+});
 
 test('randomBytes', function (t) {
   t.plan(5)