Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Modify code to support PC/SC reader #126

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Modify code to support PC/SC reader #126

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aed6249
Modify code to support PC/SC reader
FeitianSmartcardReader May 28, 2020
cf35084
Init data with SW1SW2 before use
FeitianSmartcardReader May 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Modify code to support PC/SC reader 
1. Fix bug of disconnect event  in demo code(mifare classic format and
write ndef)
2. Improve the compatibility for PC/SC reader
  • Loading branch information
@FeitianSmartcardReader
FeitianSmartcardReader committed May 28, 2020
commit aed62497185869f35f8f558d1aa10fc8b71d42ec
49 changes: 28 additions & 21 deletions examples/mifare-classic-format.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,28 +83,35 @@ try_format_sector(FreefareTag tag, MifareClassicSectorNumber sector)
{
display_progress();
for (size_t i = 0; i < (sizeof(default_keys) / sizeof(MifareClassicKey)); i++) {
MifareClassicBlockNumber block = mifare_classic_sector_last_block(sector);
if ((0 == mifare_classic_connect(tag)) && (0 == mifare_classic_authenticate(tag, block, default_keys[i], MFC_KEY_A))) {
if (0 == mifare_classic_format_sector(tag, sector)) {
mifare_classic_disconnect(tag);
return 1;
} else if (EIO == errno) {
err(EXIT_FAILURE, "sector %d", sector);
}
mifare_classic_disconnect(tag);
}

if ((0 == mifare_classic_connect(tag)) && (0 == mifare_classic_authenticate(tag, block, default_keys[i], MFC_KEY_B))) {
if (0 == mifare_classic_format_sector(tag, sector)) {
mifare_classic_disconnect(tag);
return 1;
} else if (EIO == errno) {
err(EXIT_FAILURE, "sector %d", sector);
}
mifare_classic_disconnect(tag);
}
MifareClassicBlockNumber block = mifare_classic_sector_last_block(sector);
// The disconnect event only execute after connected
if (0 == mifare_classic_connect(tag)) {
int ret = mifare_classic_authenticate(tag, block, default_keys[i], MFC_KEY_A);
if ((0x00 == ret) || (0x90 == ret)) {
if (0 == mifare_classic_format_sector(tag, sector)) {
mifare_classic_disconnect(tag);
return 1;
} else if (EIO == errno) {
err(EXIT_FAILURE, "sector %d", sector);
}
}
mifare_classic_disconnect(tag);
}
//With PC/SC reader, it has SW1SW2
if (0 == mifare_classic_connect(tag)) {
int ret = mifare_classic_authenticate(tag, block, default_keys[i], MFC_KEY_B);
if ((0x00 == ret) || (0x90 == ret)) {
if (0 == mifare_classic_format_sector(tag, sector)) {
mifare_classic_disconnect(tag);
return 1;
} else if (EIO == errno) {
err(EXIT_FAILURE, "sector %d", sector);
}
}
mifare_classic_disconnect(tag);
}
}

warnx("No known authentication key for sector %d", sector);
return 0;
}
Expand Down
52 changes: 30 additions & 22 deletions examples/mifare-classic-write-ndef.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,29 +62,37 @@ search_sector_key(FreefareTag tag, MifareClassicSectorNumber sector, MifareClass
*/
mifare_classic_disconnect(tag);
for (size_t i = 0; i < (sizeof(default_keys) / sizeof(MifareClassicKey)); i++) {
if ((0 == mifare_classic_connect(tag)) && (0 == mifare_classic_authenticate(tag, block, default_keys[i], MFC_KEY_A))) {
if ((1 == mifare_classic_get_trailer_block_permission(tag, block, MCAB_WRITE_KEYA, MFC_KEY_A)) &&
(1 == mifare_classic_get_trailer_block_permission(tag, block, MCAB_WRITE_ACCESS_BITS, MFC_KEY_A)) &&
(1 == mifare_classic_get_trailer_block_permission(tag, block, MCAB_WRITE_KEYB, MFC_KEY_A))) {
memcpy(key, &default_keys[i], sizeof(MifareClassicKey));
*key_type = MFC_KEY_A;
return 1;
}
}
mifare_classic_disconnect(tag);

if ((0 == mifare_classic_connect(tag)) && (0 == mifare_classic_authenticate(tag, block, default_keys[i], MFC_KEY_B))) {
if ((1 == mifare_classic_get_trailer_block_permission(tag, block, MCAB_WRITE_KEYA, MFC_KEY_B)) &&
(1 == mifare_classic_get_trailer_block_permission(tag, block, MCAB_WRITE_ACCESS_BITS, MFC_KEY_B)) &&
(1 == mifare_classic_get_trailer_block_permission(tag, block, MCAB_WRITE_KEYB, MFC_KEY_B))) {
memcpy(key, &default_keys[i], sizeof(MifareClassicKey));
*key_type = MFC_KEY_B;
return 1;
}
}
mifare_classic_disconnect(tag);
//The disconnect event only execute after connected
if (0 == mifare_classic_connect(tag)){
int ret = mifare_classic_authenticate(tag, block, default_keys[i], MFC_KEY_A);
if (0x00 == ret || 0x90 == ret) {
if ((1 == mifare_classic_get_trailer_block_permission(tag, block, MCAB_WRITE_KEYA, MFC_KEY_A)) &&
(1 == mifare_classic_get_trailer_block_permission(tag, block, MCAB_WRITE_ACCESS_BITS, MFC_KEY_A)) &&
(1 == mifare_classic_get_trailer_block_permission(tag, block, MCAB_WRITE_KEYB, MFC_KEY_A))) {
memcpy(key, &default_keys[i], sizeof(MifareClassicKey));
*key_type = MFC_KEY_A;
return 1;
}
}
mifare_classic_disconnect(tag);
}

//With PC/SC reader, it has SW1SW2
if (0 == mifare_classic_connect(tag)) {
int ret = mifare_classic_authenticate(tag, block, default_keys[i], MFC_KEY_B);
if (0x00 == ret || 0x90 == ret) {
if ((1 == mifare_classic_get_trailer_block_permission(tag, block, MCAB_WRITE_KEYA, MFC_KEY_B)) &&
(1 == mifare_classic_get_trailer_block_permission(tag, block, MCAB_WRITE_ACCESS_BITS, MFC_KEY_B)) &&
(1 == mifare_classic_get_trailer_block_permission(tag, block, MCAB_WRITE_KEYB, MFC_KEY_B))) {
memcpy(key, &default_keys[i], sizeof(MifareClassicKey));
*key_type = MFC_KEY_B;
return 1;
}
}
mifare_classic_disconnect(tag);
}

}

warnx("No known authentication key for sector 0x%02x\n", sector);
return 0;
}
Expand Down
7 changes: 4 additions & 3 deletions libfreefare/mifare_classic.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,13 +355,14 @@ mifare_classic_read(FreefareTag tag, const MifareClassicBlockNumber block, Mifar
ASSERT_ACTIVE(tag);

BUFFER_INIT(cmd, 2);
BUFFER_ALIAS(res, data, sizeof(MifareClassicBlock));

//For PC/SC reader, need give SW1SW2
BUFFER_ALIAS(res, data, sizeof(MifareClassicBlock)+2);

BUFFER_APPEND(cmd, MC_READ);
BUFFER_APPEND(cmd, block);

CLASSIC_TRANSCEIVE(tag, cmd, res);

return 0;
}

Expand Down