Merge pull request #398 from uProxy/trevj-node-crypto

replace crypto npm with calls to node crypto module

Author: trevj

package.json

@@ -31,7 +31,6 @@
     "browserify-istanbul": "^0.2.0",
     "browserify-zlib": "^0.1.4",
     "circular-json": "^0.3.0",
-    "crypto": "^0.0.3",
     "es6-promise": "^3.0.2",
     "forge-min": "^0.6.20",
     "freedom": "^0.6.25",

src/cloud/social/provider.ts

@@ -1,16 +1,14 @@
 /// <reference path='../../../../third_party/typings/browser.d.ts' />
-/// <reference path='../../../../third_party/sha1/sha1.d.ts' />
 
 require('../social/monkey/process');
 
 import arraybuffers = require('../../arraybuffers/arraybuffers');
+import crypto = require('crypto');
 import linefeeder = require('../../net/linefeeder');
 import logging = require('../../logging/logging');
 import promises = require('../../promises/promises');
 import queue = require('../../handler/queue');
 
-import sha1 = require('crypto/sha1');
-
 // https://github.com/borisyankov/DefinitelyTyped/blob/master/ssh2/ssh2-tests.ts
 import * as ssh2 from 'ssh2';
 var Client = require('ssh2').Client;
@@ -483,7 +481,7 @@ class Connection {
     if (this.invite_.hostKey) {
       connectConfig.hostHash = 'sha1';
       let keyBuffer = new Buffer(this.invite_.hostKey, 'base64');
-      let expectedHash = sha1.hex_sha1(keyBuffer.toString('binary'));
+      let expectedHash = crypto.createHash('sha1').update(keyBuffer).digest('hex');
       connectConfig.hostVerifier = (keyHash :string) => {
         return keyHash === expectedHash;
       };

src/turn/messages.ts

@@ -1,11 +1,9 @@
-/// <reference path='../../../third_party/sha1/sha1.d.ts' />
+/// <reference path='../../../third_party/typings/browser.d.ts' />
 
 import arraybuffers = require('../arraybuffers/arraybuffers');
-
+import crypto = require('crypto');
 import net = require('../net/net.types');
 
-import sha1 = require('crypto/sha1');
-
 /**
  * Utilities for decoding and encoding STUN messages.
  * TURN uses STUN messages, adding some methods and attributes.
@@ -125,9 +123,7 @@ export var REALM = 'myrealm';
  * supply our crypto library with a UTF-8 string generated from the 16 bytes.
  */
  // TODO: dynamic username/password would be pretty easy to implement
- // TODO: would be nice to run uint8array -> string on boot but the files
- //       don't seem to load in the right order...might be a typescript bug
- var HMAC_KEY = new Uint8Array([
+ const HMAC_KEY = new Buffer([
    0xbd, 0x8a, 0xdb, 0x31,
    0x7d, 0x5d, 0x54, 0x2e,
    0x5e, 0x2a, 0xba, 0x5b,
@@ -328,25 +324,10 @@ export function formatStunMessageWithIntegrity(message:StunMessage) : Uint8Array
  * supplied byte array.
  */
 export function computeHash(bytes:Uint8Array) : Uint8Array {
-  var keyAsString = arraybuffers.arrayBufferToString(HMAC_KEY.buffer);
   // MESSAGE-INTEGRITY attributes are always 24 bytes long:
   // 4 bytes header + 20 bytes hash
-  var bytesToBeHashed = bytes.subarray(0, bytes.byteLength - 24);
-  // Think of the next few lines as uint8ArrayToString().
-  // This is necessary because, depending on how b is constructed,
-  // b.buffer is not guaranteed to equal a, where b is a Uint8Array
-  // view on an ArrayBuffer a (in particular, views created with
-  // subarray will share the same parent ArrayBuffer).
-  // TODO: add uint8ArrayToString to uproxy-build-tools
-  var a :string[] = [];
-  for (var i = 0; i < bytesToBeHashed.length; ++i) {
-    a.push(String.fromCharCode(bytes[i]));
-  }
-  var bytesToBeHashedAsString = a.join('');
-
-  var hashAsString = sha1.str_hmac_sha1(keyAsString,
-      bytesToBeHashedAsString);
-  return new Uint8Array(arraybuffers.stringToArrayBuffer(hashAsString));
+  const bytesToBeHashed = bytes.subarray(0, bytes.byteLength - 24);
+  return crypto.createHmac('sha1', HMAC_KEY).update(bytesToBeHashed).digest();
 }
 
 /**