From 6d8844a50a6f5475566d2a300cd46fa98ffed78d Mon Sep 17 00:00:00 2001
From: Ben Adida <ben@adida.net>
Date: Mon, 18 Jun 2012 15:32:29 -0700
Subject: [PATCH] upgraded jwcrypto and start mixing in server-side entropy
---
package.json | 2 +-
resources/static/common/js/network.js | 8 +++-----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/package.json b/package.json
index c1bf949a8..ffdc41666 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.1",
"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 752ce427d..d423f12d3 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) {
--
GitLab