diff -r 000000000000 -r 6474c204b198 security/manager/pki/resources/content/createCertInfo.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/security/manager/pki/resources/content/createCertInfo.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,36 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+var keygenThread;
+
+function onLoad()
+{
+  keygenThread = window.arguments[0].QueryInterface(Components.interfaces.nsIKeygenThread);
+  
+  if (!keygenThread) {
+    window.close();
+    return;
+  }
+  
+  setCursor("wait");
+
+  var obs = {
+    observe : function keygenListenerObserve(subject, topic, data) {
+      if (topic == "keygen-finished")
+        window.close();
+    }
+  };
+  
+  keygenThread.startKeyGeneration(obs);
+}
+
+function onClose()
+{
+  setCursor("default");
+
+  var alreadyClosed = new Object();
+  keygenThread.userCanceled(alreadyClosed);
+}