From 038425682670a1e9cc2fd5773f77dc4a58eca12e Mon Sep 17 00:00:00 2001
From: Simon Eisenmann <simon@longsleep.org>
Date: Mon, 28 Apr 2014 00:46:29 +0200
Subject: [PATCH] Incorporate browser int local key generation.

---
 static/js/services/mediastream.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/static/js/services/mediastream.js b/static/js/services/mediastream.js
index cd541e89..0b9e43c3 100644
--- a/static/js/services/mediastream.js
+++ b/static/js/services/mediastream.js
@@ -21,12 +21,13 @@
 define([
     'jquery',
     'underscore',
+    'ua-parser',
     'mediastream/connector',
     'mediastream/api',
     'mediastream/webrtc',
     'mediastream/tokens'
 
-], function($, _, Connector, Api, WebRTC, tokens) {
+], function($, _, uaparser, Connector, Api, WebRTC, tokens) {
 
     return ["globalContext", "$route", "$location", "$window", "visibility", "alertify", "$http", "safeApply", "$timeout", "$sce", function(context, $route, $location, $window, visibility, alertify, $http, safeApply, $timeout, $sce) {
 
@@ -40,8 +41,8 @@ define([
         var api = new Api(connector);
         var webrtc = new WebRTC(api);
 
-        // TODO(longsleep): Add client side part into this key.
-        var secureKey = context.Cfg.Token;
+        // Create encryption key from server token and browser name.
+        var secureKey = sjcl.codec.base64.fromBits(sjcl.hash.sha256.hash(context.Cfg.Token + uaparser().browser.name));
 
         var mediaStream = {
             version: version,