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

Update ChangeLog & make style

Browse source
This commit is contained in:
Philippe Teuwen 2013-03-12 17:07:09 +01:00
parent 20e51e9752
commit e70a3314bf
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -20,10 +20,15 @@ Fixes:
- Fixed the suppression of the auto-fixup for linking against MS built libs - Fixed the suppression of the auto-fixup for linking against MS built libs
- Fixed all the formatting warnings by shifting to inttypes.h specifiers - Fixed all the formatting warnings by shifting to inttypes.h specifiers
- shifted to %lu for DWORD printf - shifted to %lu for DWORD printf
- nfc-anticol: fix ATS length
- nfc-mfclassic: fix reporting of processed blocks total
- nfc-mfclassic: detect MIFARE Plus 2K as 2K instead of 1K
Improvements: Improvements:
- Devels HACKING file: introduce clang/scan-build & cppcheck for better code - Devels HACKING file: introduce clang/scan-build & cppcheck for better code
- Windows: logging via OutputDebugString(), ease debugging - Windows: logging via OutputDebugString(), ease debugging
- nfc-mfclassic: use smaller files for cards < 4k
- nfc-mfclassic: by defaut don't authorise wrong keyfile, use "f" to force
Changes: Changes:
- Upon malloc error, nfc_init() doesn't force exit() anymore - Upon malloc error, nfc_init() doesn't force exit() anymore

6
utils/nfc-mfclassic.c
View file

@ -492,7 +492,7 @@ main(int argc, const char *argv[])
bUseKeyA = tolower((int)((unsigned char) * (argv[2]))) == 'a'; bUseKeyA = tolower((int)((unsigned char) * (argv[2]))) == 'a';
bTolerateFailures = tolower((int)((unsigned char) * (argv[2]))) != (int)((unsigned char) * (argv[2])); bTolerateFailures = tolower((int)((unsigned char) * (argv[2]))) != (int)((unsigned char) * (argv[2]));
bUseKeyFile = (argc > 4); bUseKeyFile = (argc > 4);
bForceKeyFile = ((argc > 5) && (strcmp((char*)argv[5], "f") == 0)); bForceKeyFile = ((argc > 5) && (strcmp((char *)argv[5], "f") == 0));
} }
if (atAction == ACTION_USAGE) { if (atAction == ACTION_USAGE) {
@ -595,8 +595,8 @@ main(int argc, const char *argv[])
int res; int res;
if ((res = get_rats()) > 0) { if ((res = get_rats()) > 0) {
if ((res >= 10) && (abtRx[5] == 0xc1) && (abtRx[6] == 0x05) if ((res >= 10) && (abtRx[5] == 0xc1) && (abtRx[6] == 0x05)
&& (abtRx[7] == 0x2f) && (abtRx[8] == 0x2f) && (abtRx[7] == 0x2f) && (abtRx[8] == 0x2f)
&& ((nt.nti.nai.abtAtqa[1] & 0x02) == 0x00)) { && ((nt.nti.nai.abtAtqa[1] & 0x02) == 0x00)) {
// MIFARE Plus 2K // MIFARE Plus 2K
uiBlocks = 0x7f; uiBlocks = 0x7f;
} }