From 5f6fb1755917851a40249db7d834da4265ed5950 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= Date: Wed, 3 Jan 2018 21:22:04 +0100 Subject: [PATCH] [Tests] log when openssl doesn't support cipher This fixes #37. --- .eslintrc | 7 ++++++- test/index.js | 21 ++++++++++++++++++--- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/.eslintrc b/.eslintrc index dd38ab0..f573f80 100644 --- a/.eslintrc +++ b/.eslintrc @@ -33,12 +33,17 @@ "files": "browser/sign.js", "rules": { "max-params": "off", - // "max-statements": "off", "max-statements-per-line": "off", "no-param-reassign": "warn", "no-plusplus": "warn", "no-use-before-define": "warn", } }, + { + "files": "test/*.js", + "rules": { + "max-lines-per-function": "off", + }, + }, ], } diff --git a/test/index.js b/test/index.js index 302e41a..30e246a 100644 --- a/test/index.js +++ b/test/index.js @@ -28,7 +28,6 @@ fixtures.valid.rsa.forEach(function (f) { priv = Buffer.from(f['private'], 'base64'); } - console.log(nCrypto.getHashes()); (nCrypto.getHashes().indexOf(f.scheme) >= 0 ? test : test.skip)(f.message, function (t) { var bSign; try { @@ -82,8 +81,23 @@ fixtures.valid.ec.forEach(function (f) { } (nCrypto.getHashes().indexOf(f.scheme) >= 0 ? test : test.skip)(f.message, function (t) { - var nSign = nCrypto.createSign(f.scheme); - var bSign = bCrypto.createSign(f.scheme); + var nSign; + try { + nSign = nCrypto.createSign(f.scheme); + } catch (e) { + console.info('skipping unsupported browserify-sign scheme', f.scheme); + t.end(); + return; + } + + var bSign; + try { + bSign = bCrypto.createSign(f.scheme); + } catch (e) { + console.info('skipping unsupported node scheme', f.scheme); + t.end(); + return; + } var bSig = bSign.update(message).sign(priv); var nSig = nSign.update(message).sign(priv); @@ -98,6 +112,7 @@ fixtures.valid.ec.forEach(function (f) { t.end(); }); + if (f.scheme !== 'DSA' && f.scheme.toLowerCase().indexOf('dsa') === -1) { test(f.message + ' named rsa through', function (t) { var scheme = 'RSA-' + f.scheme.toUpperCase();