From e70a3314bf20273fc5dbbe19e55ea6a808c05e24 Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Tue, 12 Mar 2013 17:07:09 +0100 Subject: [PATCH] Update ChangeLog & make style --- ChangeLog | 5 +++++ utils/nfc-mfclassic.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 82fede0..06375ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,10 +20,15 @@ Fixes: - Fixed the suppression of the auto-fixup for linking against MS built libs - Fixed all the formatting warnings by shifting to inttypes.h specifiers - 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: - Devels HACKING file: introduce clang/scan-build & cppcheck for better code - 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: - Upon malloc error, nfc_init() doesn't force exit() anymore diff --git a/utils/nfc-mfclassic.c b/utils/nfc-mfclassic.c index 3d3b83f..5a0514a 100644 --- a/utils/nfc-mfclassic.c +++ b/utils/nfc-mfclassic.c @@ -492,7 +492,7 @@ main(int argc, const char *argv[]) bUseKeyA = tolower((int)((unsigned char) * (argv[2]))) == 'a'; bTolerateFailures = tolower((int)((unsigned char) * (argv[2]))) != (int)((unsigned char) * (argv[2])); 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) { @@ -595,8 +595,8 @@ main(int argc, const char *argv[]) int res; if ((res = get_rats()) > 0) { if ((res >= 10) && (abtRx[5] == 0xc1) && (abtRx[6] == 0x05) - && (abtRx[7] == 0x2f) && (abtRx[8] == 0x2f) - && ((nt.nti.nai.abtAtqa[1] & 0x02) == 0x00)) { + && (abtRx[7] == 0x2f) && (abtRx[8] == 0x2f) + && ((nt.nti.nai.abtAtqa[1] & 0x02) == 0x00)) { // MIFARE Plus 2K uiBlocks = 0x7f; }