From 72fcc4a727e37462e1bcef9442725eeebe656084 Mon Sep 17 00:00:00 2001 From: Simon Woolf Date: Tue, 8 Sep 2015 12:08:32 +0100 Subject: [PATCH] Remove cipherParams instanceof check --- browser/lib/util/crypto.js | 5 +---- nodejs/lib/util/crypto.js | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/browser/lib/util/crypto.js b/browser/lib/util/crypto.js index 7410ac683c..5c4d18a108 100644 --- a/browser/lib/util/crypto.js +++ b/browser/lib/util/crypto.js @@ -159,10 +159,7 @@ var Crypto = (function() { Crypto.getCipher = function(channelOpts, callback) { var params = channelOpts && channelOpts.cipherParams; if(params) { - if(params instanceof CipherParams) - callback(null, new CBCCipher(params)); - else - callback(new Error("ChannelOptions not supported")); + callback(null, new CBCCipher(params)); return; } Crypto.getDefaultParams(function(err, params) { diff --git a/nodejs/lib/util/crypto.js b/nodejs/lib/util/crypto.js index 924df15fd0..5d35fd30a7 100644 --- a/nodejs/lib/util/crypto.js +++ b/nodejs/lib/util/crypto.js @@ -134,10 +134,7 @@ var Crypto = (function() { Crypto.getCipher = function(channelOpts, callback) { var params = channelOpts && channelOpts.cipherParams; if(params) { - if(params instanceof CipherParams) - callback(null, new CBCCipher(params)); - else - callback(new Error("ChannelOptions not supported")); + callback(null, new CBCCipher(params)); return; } Crypto.getDefaultParams(function(err, params) {