From 98a52690159ee1529f5d9054eb415c74e0fe64b3 Mon Sep 17 00:00:00 2001 From: Samo Fortuna Date: Wed, 22 Feb 2017 12:25:00 +0100 Subject: [PATCH 1/4] cardreader: allow 0 as a valid protocol value --- lib/pcsclite.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/pcsclite.js b/lib/pcsclite.js index d3f0cbe..09cc4ad 100644 --- a/lib/pcsclite.js +++ b/lib/pcsclite.js @@ -88,7 +88,10 @@ CardReader.prototype.connect = function(options, cb) { options = options || {}; options.share_mode = options.share_mode || this.SCARD_SHARE_EXCLUSIVE; - options.protocol = options.protocol || this.SCARD_PROTOCOL_T0 | this.SCARD_PROTOCOL_T1; + + if (typeof options.protocol === 'undefined' || options.protocol === null) { + options.protocol = this.SCARD_PROTOCOL_T0 | this.SCARD_PROTOCOL_T1; + } if (!this.connected) { this._connect(options.share_mode, options.protocol, cb); From 1a369f0fad0f2e008f6abb7a4b7a7844133c733b Mon Sep 17 00:00:00 2001 From: Samo Fortuna Date: Wed, 22 Feb 2017 12:20:53 +0100 Subject: [PATCH 2/4] cardreader: add SCARD_CTL_CODE js implementation --- lib/pcsclite.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lib/pcsclite.js b/lib/pcsclite.js index 09cc4ad..869105c 100644 --- a/lib/pcsclite.js +++ b/lib/pcsclite.js @@ -140,6 +140,15 @@ CardReader.prototype.control = function(data, control_code, res_len, cb) { }); }; +CardReader.prototype.SCARD_CTL_CODE = function(code) { + var isWin = /^win/.test(process.platform); + if (isWin) { + return (0x31 << 16 | (code) << 2); + } else { + return 0x42000000 + (code); + } +}; + // extend prototype function inherits(target, source) { for (var k in source.prototype) { From 41727718f5b6419851502204ca6c1b1d2a27d625 Mon Sep 17 00:00:00 2001 From: Santiago Gimeno Date: Wed, 22 Feb 2017 14:39:04 +0100 Subject: [PATCH 3/4] pkg: fix engines.node entry So it allows node.js versions greater than 0.8.0. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 378254e..45f1eea 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "pcsclite", "version": "0.4.11", "engines": { - "node": ">=0.8.0 < 4" + "node": ">=0.8.0" }, "description": "Bindings over PC/SC to access Smart Cards", "main": "index.js", From fb6b219d6681d52c1bde8712243daa0a1103f641 Mon Sep 17 00:00:00 2001 From: Santiago Gimeno Date: Wed, 22 Feb 2017 14:48:05 +0100 Subject: [PATCH 4/4] Version 0.5.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 45f1eea..4095d63 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pcsclite", - "version": "0.4.11", + "version": "0.5.0", "engines": { "node": ">=0.8.0" },