diff --git a/package.json b/package.json index c1bf949a8a05aba32cba092a7433f35c5c6f2a2b..24a3bdf1e613fdced528e5c488f7be92f699ae34 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "express": "2.5.0", "iconv": "1.1.3", "mustache": "0.3.1-dev", - "jwcrypto": "0.2.2", + "jwcrypto": "0.3.2", "mysql": "0.9.5", "node-gettext": "0.1.1", "node-statsd": "https://github.com/downloads/lloyd/node-statsd/0509f85.tgz", diff --git a/resources/static/common/js/network.js b/resources/static/common/js/network.js index 752ce427df57ff8903fea6a742ccd7b795b97703..d423f12d32fa4ee7694d5730643c95e17bf64b68 100644 --- a/resources/static/common/js/network.js +++ b/resources/static/common/js/network.js @@ -6,7 +6,8 @@ BrowserID.Network = (function() { "use strict"; - var bid = BrowserID, + var jwcrypto = require("./lib/jwcrypto"), + bid = BrowserID, complete = bid.Helpers.complete, context, server_time, @@ -45,10 +46,7 @@ BrowserID.Network = (function() { setUserID(result.userid); // seed the PRNG - // FIXME: properly abstract this out, probably by exposing a jwcrypto - // interface for randomness - // require("./libs/all").sjcl.random.addEntropy(result.random_seed); - // FIXME: this wasn't doing anything for real, so commenting this out for now + jwcrypto.addEntropy(result.random_seed); } function withContext(cb, onFailure) {