7 files changed, 10 insertions, 10 deletions
diff --git a/src/crypto/primitives/kdf.ts b/src/crypto/primitives/kdf.ts
index e1baed408..03deb3727 100644
--- a/src/crypto/primitives/kdf.ts
+++ b/src/crypto/primitives/kdf.ts
@@ -14,7 +14,7 @@
  GNU Taler; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
  */
 
-import nacl = require("./nacl-fast");
+import * as nacl from "./nacl-fast";
 import { sha256 } from "./sha256";
 
 export function sha512(data: Uint8Array): Uint8Array {
diff --git a/src/crypto/primitives/nacl-fast.ts b/src/crypto/primitives/nacl-fast.ts
index 14cf569db..23d8378b4 100644
--- a/src/crypto/primitives/nacl-fast.ts
+++ b/src/crypto/primitives/nacl-fast.ts
@@ -3078,16 +3078,16 @@ export function sign_ed25519_pk_to_curve25519(
 (function () {
   // Initialize PRNG if environment provides CSPRNG.
   // If not, methods calling randombytes will throw.
-  const crypto =
+  const cr =
     typeof self !== "undefined" ? self.crypto || (self as any).msCrypto : null;
-  if (crypto && crypto.getRandomValues) {
+  if (cr && cr.getRandomValues) {
     // Browsers.
     var QUOTA = 65536;
     setPRNG(function (x: Uint8Array, n: number) {
       var i,
         v = new Uint8Array(n);
       for (i = 0; i < n; i += QUOTA) {
-        crypto.getRandomValues(v.subarray(i, i + Math.min(n - i, QUOTA)));
+        cr.getRandomValues(v.subarray(i, i + Math.min(n - i, QUOTA)));
       }
       for (i = 0; i < n; i++) x[i] = v[i];
       cleanup(v);
diff --git a/src/crypto/talerCrypto-test.ts b/src/crypto/talerCrypto-test.ts
index 85c22d608..11068f7d4 100644
--- a/src/crypto/talerCrypto-test.ts
+++ b/src/crypto/talerCrypto-test.ts
@@ -30,7 +30,7 @@ import {
   rsaVerify,
 } from "./talerCrypto";
 import { sha512, kdf } from "./primitives/kdf";
-import nacl = require("./primitives/nacl-fast");
+import * as nacl from "./primitives/nacl-fast";
 
 function hexToBytes(hex: string) {
   for (var bytes = [], c = 0; c < hex.length; c += 2)
diff --git a/src/crypto/talerCrypto.ts b/src/crypto/talerCrypto.ts
index 317b1af55..3da4f4a47 100644
--- a/src/crypto/talerCrypto.ts
+++ b/src/crypto/talerCrypto.ts
@@ -18,7 +18,7 @@
  * Native implementation of GNU Taler crypto.
  */
 
-import nacl = require("./primitives/nacl-fast");
+import * as nacl from "./primitives/nacl-fast";
 import bigint from "big-integer";
 import { kdf } from "./primitives/kdf";
 
diff --git a/src/crypto/workers/cryptoApi.ts b/src/crypto/workers/cryptoApi.ts
index d3b12e26d..46dc7dfaf 100644
--- a/src/crypto/workers/cryptoApi.ts
+++ b/src/crypto/workers/cryptoApi.ts
@@ -110,7 +110,7 @@ export interface CryptoWorkerFactory {
 export class BrowserCryptoWorkerFactory implements CryptoWorkerFactory {
   startWorker(): CryptoWorker {
     const workerCtor = Worker;
-    const workerPath = "/dist/cryptoWorker-bundle.js";
+    const workerPath = "/dist/webextension/browserWorkerEntry.js";
     return new workerCtor(workerPath) as CryptoWorker;
   }
 
@@ -206,7 +206,7 @@ export class CryptoApi {
     };
     this.resetWorkerTimeout(ws);
     work.startTime = timer.performanceNow();
-    setImmediate(() => ws.w!.postMessage(msg));
+    setTimeout(() => ws.w!.postMessage(msg), 0);
   }
 
   resetWorkerTimeout(ws: WorkerState) {
diff --git a/src/crypto/workers/nodeThreadWorker.ts b/src/crypto/workers/nodeThreadWorker.ts
index 1247900f9..d289c14b2 100644
--- a/src/crypto/workers/nodeThreadWorker.ts
+++ b/src/crypto/workers/nodeThreadWorker.ts
@@ -19,7 +19,7 @@ import { CryptoWorkerFactory } from "./cryptoApi";
 // tslint:disable:no-var-requires
 
 import { CryptoWorker } from "./cryptoWorker";
-import os = require("os");
+import os from "os";
 import { CryptoImplementation } from "./cryptoImplementation";
 
 const f = __filename;
diff --git a/src/crypto/workers/synchronousWorker.ts b/src/crypto/workers/synchronousWorker.ts
index b453468d5..f4bcf396c 100644
--- a/src/crypto/workers/synchronousWorker.ts
+++ b/src/crypto/workers/synchronousWorker.ts
@@ -93,7 +93,7 @@ export class SynchronousCryptoWorker {
     }
 
     try {
-      setImmediate(() => this.dispatchMessage({ result, id }));
+      setTimeout(() => this.dispatchMessage({ result, id }), 0);
     } catch (e) {
       console.log("got error during dispatch", e);
     }