Merge pull request #591 from FeitianSmartcardReader/master
Update readme and add Feitian R502 and bR500 support into pcsc driver
This commit is contained in:
Adam Laurie
GitHub
commit
61e93c1cdf
2 changed files with 129 additions and 16 deletions
72
README.md
72
README.md
|
|
@ -35,12 +35,15 @@ Requirements
|
|||
Some NFC drivers depend on third party software:
|
||||
|
||||
* pn53x_usb & acr122_usb:
|
||||
|
||||
- libusb-0.1 http://libusb.sf.net
|
||||
|
||||
- libusb-0.1 http://libusb.sf.net
|
||||
|
||||
* acr122_pcsc:
|
||||
|
||||
- pcsc-lite http://pcsclite.alioth.debian.org/
|
||||
|
||||
- pcsc-lite http://pcsclite.alioth.debian.org/
|
||||
- pcsc:
|
||||
|
||||
- Support build with pcsc driver, which can be using all compatible readers, Feitian R502 and bR500 already passed the test.
|
||||
|
||||
The regression test suite depends on the cutter framework:
|
||||
http://cutter.sf.net
|
||||
|
|
@ -97,32 +100,36 @@ Please make sure to include:
|
|||
* The version of libnfc
|
||||
|
||||
* Information about your system. For instance:
|
||||
|
||||
- What operating system and version
|
||||
- For Linux, what version of the C library
|
||||
|
||||
|
||||
- What operating system and version
|
||||
- For Linux, what version of the C library
|
||||
|
||||
And anything else you think is relevant.
|
||||
|
||||
* A trace with debug activated.
|
||||
|
||||
|
||||
Reproduce the bug with debug, e.g. if it was:
|
||||
|
||||
|
||||
$ nfc-list -v
|
||||
|
||||
|
||||
run it as:
|
||||
|
||||
|
||||
$ LIBNFC_LOG_LEVEL=3 nfc-list -v
|
||||
|
||||
* How to reproduce the bug.
|
||||
|
||||
|
||||
Please include a short test program that exhibits the behavior.
|
||||
|
||||
As a last resort, you can also provide a pointer to a larger piece
|
||||
|
||||
of software that can be downloaded.
|
||||
|
||||
* If the bug was a crash, the exact text that was printed out
|
||||
|
||||
when the crash occured.
|
||||
|
||||
* Further information such as stack traces may be useful, but
|
||||
|
||||
is not necessary.
|
||||
|
||||
Patches
|
||||
|
|
@ -136,16 +143,27 @@ all the information described in "How to Report Bugs".
|
|||
Building
|
||||
========
|
||||
|
||||
It should be as simple as running these two commands:
|
||||
It should be as simple as running these three commands:
|
||||
|
||||
autoreconf -vis
|
||||
./configure
|
||||
make
|
||||
|
||||
Build with specific driver, like pcsc driver for compatible readers, go with below commands, tested on linux and macOS:
|
||||
|
||||
```
|
||||
git clone --recursive https://github.com/nfc-tools/libnfc
|
||||
autoreconf -vis
|
||||
./configure --with-drivers=pcsc
|
||||
make
|
||||
```
|
||||
|
||||
Troubleshooting
|
||||
===============
|
||||
|
||||
Touchatag/ACR122:
|
||||
-----------------
|
||||
|
||||
If your Touchatag or ACR122 device fails being detected by libnfc, make sure
|
||||
that PCSC-lite daemon (`pcscd`) is installed and is running.
|
||||
|
||||
|
|
@ -158,6 +176,7 @@ pcscd daemon.
|
|||
|
||||
ACR122:
|
||||
-------
|
||||
|
||||
Using an ACR122 device with libnfc and without tag (e.g. to use NFCIP modes or
|
||||
card emulation) needs yet another PCSC-lite tweak: You need to allow usage of
|
||||
CCID Exchange command. To do this, edit `libccid_Info.plist` configuration file
|
||||
|
|
@ -171,13 +190,16 @@ in something like: `/usr/lib/pcsc/drivers/ifd-acsccid.bundle/Contents/Info.plist
|
|||
|
||||
SCL3711:
|
||||
--------
|
||||
|
||||
Libnfc cannot be used concurrently with the PCSC proprietary driver of SCL3711.
|
||||
Two possible solutions:
|
||||
|
||||
* Either you don't install SCL3711 driver at all
|
||||
* Or you stop the PCSC daemon when you want to use libnfc-based tools
|
||||
|
||||
PN533 USB device on Linux >= 3.1:
|
||||
---------------------------------
|
||||
|
||||
Since Linux kernel version 3.1, a few kernel-modules must not be loaded in order
|
||||
to use libnfc : "nfc", "pn533" and "pn533_usb".
|
||||
To prevent kernel from loading automatically these modules, you can blacklist
|
||||
|
|
@ -185,9 +207,29 @@ them in a modprobe conf file. This file is provided within libnfc archive:
|
|||
|
||||
sudo cp contrib/linux/blacklist-libnfc.conf /etc/modprobe.d/blacklist-libnfc.conf
|
||||
|
||||
## FEITIAN bR500 and R502:
|
||||
|
||||
Libnfc can work with PCSC proprietary driver of bR500 and R502 through USB port, most linux already installed PCSC proprietary, then just plug in play, to have pcsc driver support, you may need build with "--with-drivers=pcsc" to re-build libnfc, below reader tested:
|
||||
|
||||
- Feitian bR500
|
||||
- Feitian R502 Dual interface reader
|
||||
- Feitian R502 CL(Contactless) reader
|
||||
|
||||
These reader support by CCID from 1.4.25, make sure your CCID driver version higher than 1.4.25.
|
||||
|
||||
Using macOS, use below command check your version, to install latest CCID driver from [https://github.com/martinpaljak/osx-ccid-installer/releases](https://github.com/martinpaljak/osx-ccid-installer/releases)
|
||||
|
||||
```
|
||||
grep -A 1 CFBundleShortVersionString /usr/local/libexec/SmartCardServices/drivers/ifd-ccid.bundle/Contents/Info.plist
|
||||
```
|
||||
|
||||
Using linux, use below command check your version, to install latest CCID driver from [https://ccid.apdu.fr/](https://ccid.apdu.fr/)
|
||||
|
||||
```
|
||||
grep -A 1 CFBundleShortVersionString /usr/lib/pcsc/drivers/ifd-ccid.bundle/Contents/Info.plist
|
||||
```
|
||||
Proprietary Notes
|
||||
=================
|
||||
|
||||
FeliCa is a registered trademark of the Sony Corporation.
|
||||
MIFARE is a trademark of NXP Semiconductors.
|
||||
Jewel Topaz is a trademark of Innovision Research & Technology.
|
||||
|
|
|
|||
|
|
@ -76,6 +76,18 @@ struct pcsc_data {
|
|||
|
||||
#define DRIVER_DATA(pnd) ((struct pcsc_data*)(pnd->driver_data))
|
||||
|
||||
//Doesn't have define in macOS, so define from reader.h
|
||||
#define SCARD_ATTR_VALUE(Class, Tag) ((((ULONG)(Class)) << 16) | ((ULONG)(Tag)))
|
||||
#define SCARD_CLASS_VENDOR_INFO 1
|
||||
#define SCARD_ATTR_VENDOR_NAME SCARD_ATTR_VALUE(SCARD_CLASS_VENDOR_INFO, 0x0100)
|
||||
#define SCARD_ATTR_ICC_TYPE_PER_ATR SCARD_ATTR_VALUE(SCARD_CLASS_ICC_STATE, 0x0304)
|
||||
#define SCARD_CLASS_ICC_STATE 9
|
||||
#define SCARD_AUTOALLOCATE (DWORD)(-1)
|
||||
#define SCARD_ATTR_VENDOR_NAME SCARD_ATTR_VALUE(SCARD_CLASS_VENDOR_INFO, 0x0100)
|
||||
#define SCARD_ATTR_VENDOR_IFD_TYPE SCARD_ATTR_VALUE(SCARD_CLASS_VENDOR_INFO, 0x0101)
|
||||
#define SCARD_ATTR_VENDOR_IFD_VERSION SCARD_ATTR_VALUE(SCARD_CLASS_VENDOR_INFO, 0x0102)
|
||||
#define SCARD_ATTR_VENDOR_IFD_SERIAL_NO SCARD_ATTR_VALUE(SCARD_CLASS_VENDOR_INFO, 0x0103)
|
||||
|
||||
static SCARDCONTEXT _SCardContext;
|
||||
static int _iSCardContextRefCount = 0;
|
||||
|
||||
|
|
@ -291,6 +303,40 @@ pcsc_scan(const nfc_context *context, nfc_connstring connstrings[], const size_t
|
|||
int l = strlen(supported_devices[i]);
|
||||
bSupported = 0 == !strncmp(supported_devices[i], acDeviceNames + szPos, l);
|
||||
}
|
||||
// Supported Feitian Contactless Reader
|
||||
#if defined (__APPLE__)
|
||||
// Feitian R502
|
||||
if (strstr(acDeviceNames + szPos, "Feitian R502") != NULL)
|
||||
{
|
||||
bSupported = true;
|
||||
}
|
||||
// Feitian 502-CL
|
||||
if (strstr(acDeviceNames + szPos, "Feitian 502-CL") != NULL)
|
||||
{
|
||||
bSupported = true;
|
||||
}
|
||||
// Feitian bR500
|
||||
if (strstr(acDeviceNames + szPos, "Feitian bR500") != NULL)
|
||||
{
|
||||
bSupported = true;
|
||||
}
|
||||
#else
|
||||
// Feitian R502
|
||||
if (strstr(acDeviceNames + szPos, "Feitian R502 [R502 Contact Reader]") != NULL)
|
||||
{
|
||||
bSupported = true;
|
||||
}
|
||||
// Feitian 502-CL
|
||||
if (strstr(acDeviceNames + szPos, "Feitian 502-CL [R502 Contactless Reader]") != NULL)
|
||||
{
|
||||
bSupported = true;
|
||||
}
|
||||
// Feitian bR500
|
||||
if (strstr(acDeviceNames + szPos, "Feitian bR500") != NULL)
|
||||
{
|
||||
bSupported = true;
|
||||
}
|
||||
#endif
|
||||
|
||||
if (bSupported) {
|
||||
// Supported non-ACR122 device found
|
||||
|
|
@ -382,7 +428,8 @@ pcsc_open(const nfc_context *context, const nfc_connstring connstring)
|
|||
// Test if context succeeded
|
||||
if (!(pscc = pcsc_get_scardcontext()))
|
||||
goto error;
|
||||
DRIVER_DATA(pnd)->last_error = SCardConnect(*pscc, ndd.pcsc_device_name, SCARD_SHARE_DIRECT, 0, &(DRIVER_DATA(pnd)->hCard), (void *) & (DRIVER_DATA(pnd)->ioCard.dwProtocol));
|
||||
// T1 or T0 protocol.
|
||||
DRIVER_DATA(pnd)->last_error = SCardConnect(*pscc, ndd.pcsc_device_name, SCARD_SHARE_DIRECT, SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1, &(DRIVER_DATA(pnd)->hCard), (void *) & (DRIVER_DATA(pnd)->ioCard.dwProtocol));
|
||||
if (DRIVER_DATA(pnd)->last_error != SCARD_S_SUCCESS) {
|
||||
// We can not connect to this device.
|
||||
log_put(LOG_GROUP, LOG_CATEGORY, NFC_LOG_PRIORITY_DEBUG, "%s", "PCSC connect failed");
|
||||
|
|
@ -760,10 +807,34 @@ pcsc_get_information_about(nfc_device *pnd, char **pbuf)
|
|||
? "\nserial: " : "", serial_len > 0 ? (char *)serial : "");
|
||||
|
||||
error:
|
||||
// SCardFreeMemory function not supported in macOS.
|
||||
#if defined(__APPLE__)
|
||||
if (name != NULL){
|
||||
free(name);
|
||||
name = NULL;
|
||||
}
|
||||
if (type != NULL){
|
||||
free(type);
|
||||
type = NULL;
|
||||
}
|
||||
if (version != NULL){
|
||||
free(version);
|
||||
version = NULL;
|
||||
}
|
||||
if (serial != NULL){
|
||||
free(serial);
|
||||
serial = NULL;
|
||||
}
|
||||
if (pscc != NULL){
|
||||
SCardReleaseContext(pscc);
|
||||
}
|
||||
#else
|
||||
SCardFreeMemory(*pscc, name);
|
||||
SCardFreeMemory(*pscc, type);
|
||||
SCardFreeMemory(*pscc, version);
|
||||
SCardFreeMemory(*pscc, serial);
|
||||
#endif
|
||||
|
||||
|
||||
pnd->last_error = res;
|
||||
return pnd->last_error;
|
||||
|
|
|
|||
Loading…
Reference in a new issue