From 3922b1b4ab6aa954603f55ae352107802006b911 Mon Sep 17 00:00:00 2001 From: Chad Engler Date: Thu, 28 May 2015 06:57:06 -0700 Subject: [PATCH] move ecdh load into try{}; add fallback override env var --- .travis.yml | 2 ++ index.js | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ee9f5fd..48ab839 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,8 @@ node_js: - "0.10" addons: firefox: "34.0" +env: + - ECCRYPTO_NO_FALLBACK=1 notifications: email: on_success: never diff --git a/index.js b/index.js index 501311c..017a646 100644 --- a/index.js +++ b/index.js @@ -12,10 +12,14 @@ var crypto = require("crypto"); // try to use secp256k1, fallback to browser implementation try { var secp256k1 = require("secp256k1"); + var ecdh = require("./build/Release/ecdh"); } catch (e) { - return (module.exports = require("./browser")); + if (process.env.ECCRYPTO_NO_FALLBACK) { + throw e; + } else { + return (module.exports = require("./browser")); + } } -var ecdh = require("./build/Release/ecdh"); function assert(condition, message) { if (!condition) {