Merge pull request #624 from FeitianSmartcardReader/master

Modify code to add compatibility of readers
This commit is contained in:
Adam Laurie 2020-10-24 15:28:25 +01:00 committed by GitHub
commit b5180a6a70
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -351,9 +351,15 @@ static int pcsc_props_to_target(struct nfc_device *pnd, uint8_t it, const uint8_
if (is_pcsc_reader_vendor_feitian(pnd)) { if (is_pcsc_reader_vendor_feitian(pnd)) {
uint8_t atqa[2]; uint8_t atqa[2];
pcsc_get_atqa(pnd, atqa, sizeof(atqa)); pcsc_get_atqa(pnd, atqa, sizeof(atqa));
//memcpy(pnt->nti.nai.abtAtqa,atqa,2); //ATQA Coding of NXP Contactless Card ICs
if(ataq[0] = 0x00 || atqa[0] == 0x03)
{
memcpy(pnt->nti.nai.abtAtqa,atqa,2);
}else {
pnt->nti.nai.abtAtqa[0] = atqa[1]; pnt->nti.nai.abtAtqa[0] = atqa[1];
pnt->nti.nai.abtAtqa[1] = atqa[0]; pnt->nti.nai.abtAtqa[1] = atqa[0];
}
uint8_t sak[1]; uint8_t sak[1];
pcsc_get_sak(pnd, sak, sizeof(sak)); pcsc_get_sak(pnd, sak, sizeof(sak));
pnt->nti.nai.btSak = sak[0]; pnt->nti.nai.btSak = sak[0];