crewID/libnfc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nfc_initiator_target_is_present(): reuse iso14443_cascade_uid()

Browse source
This commit is contained in:
Philippe Teuwen 2014-01-30 00:24:06 +01:00
parent 095f945224
commit ade71ee8a6
1 changed files with 2 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
libnfc/chips/pn53x.c
View file

@ -1809,25 +1809,8 @@ pn53x_initiator_target_is_present(struct nfc_device *pnd, const nfc_target *pnt)
// Limitation: re-select will lose authentication of already authenticated sector // Limitation: re-select will lose authentication of already authenticated sector
// TODO: buggy when card is removed on Tikitag // TODO: buggy when card is removed on Tikitag
uint8_t pbtInitiatorData[12]; uint8_t pbtInitiatorData[12];
uint8_t szInitiatorData = 0; size_t szInitiatorData = 0;
switch (CHIP_DATA(pnd)->current_target->nti.nai.szUidLen) { iso14443_cascade_uid(CHIP_DATA(pnd)->current_target->nti.nai.abtUid, CHIP_DATA(pnd)->current_target->nti.nai.szUidLen, pbtInitiatorData, &szInitiatorData);
case 4:
memcpy(pbtInitiatorData, CHIP_DATA(pnd)->current_target->nti.nai.abtUid, 4);
szInitiatorData = 4;
break;
case 7:
pbtInitiatorData[0] = 0x88;
memcpy(&pbtInitiatorData[1], CHIP_DATA(pnd)->current_target->nti.nai.abtUid, 7);
szInitiatorData = 8;
break;
case 10:
pbtInitiatorData[0] = 0x88;
memcpy(&pbtInitiatorData[1], CHIP_DATA(pnd)->current_target->nti.nai.abtUid, 3);
pbtInitiatorData[4] = 0x88;
memcpy(&pbtInitiatorData[5], &CHIP_DATA(pnd)->current_target->nti.nai.abtUid[3], 7);
szInitiatorData = 12;
break;
}
if ((ret = pn53x_initiator_select_passive_target_ext(pnd, CHIP_DATA(pnd)->current_target->nm, pbtInitiatorData, szInitiatorData, NULL, 300)) == 1) { if ((ret = pn53x_initiator_select_passive_target_ext(pnd, CHIP_DATA(pnd)->current_target->nm, pbtInitiatorData, szInitiatorData, NULL, 300)) == 1) {
ret = NFC_SUCCESS; ret = NFC_SUCCESS;
} else if ((ret == 0) || (ret == NFC_ETIMEOUT)) { } else if ((ret == 0) || (ret == NFC_ETIMEOUT)) {