X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/84bdbc19174eaf54db337ef0470e35cf45dc8e9d..36dc0b437017bf360787afe3c15fd3cbaf941dd2:/client/cmdhf14a.c diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c index b6c8b3c9..6d338d0d 100644 --- a/client/cmdhf14a.c +++ b/client/cmdhf14a.c @@ -1,5 +1,6 @@ //----------------------------------------------------------------------------- // 2011, Merlok +// 2014, Peter Fillmore // Copyright (C) 2010 iZsh , Hagen Fritsch // // This code is licensed to you under the terms of the GNU GPL, version 2 or, @@ -133,13 +134,14 @@ int usage_hf_14a_sim(void) { PrintAndLog("usage: hf 14a sim [h] t u [x] [e] [v]"); PrintAndLog("options: "); PrintAndLog(" h : This help"); - PrintAndLog(" t : 1 = MIFARE Classic"); + PrintAndLog(" t : 1 = MIFARE Classic 1k"); PrintAndLog(" 2 = MIFARE Ultralight"); PrintAndLog(" 3 = MIFARE Desfire"); PrintAndLog(" 4 = ISO/IEC 14443-4"); PrintAndLog(" 5 = MIFARE Tnp3xxx"); PrintAndLog(" 6 = MIFARE Mini"); PrintAndLog(" 7 = AMIIBO (NTAG 215), pack 0x8080"); + PrintAndLog(" 8 = MIFARE Classic 4k"); // PrintAndLog(" u : 4, 7 or 10 byte UID"); PrintAndLog(" u : 4, 7 byte UID"); PrintAndLog(" x : (Optional) Performs the 'reader attack', nr/ar attack against a reader"); @@ -220,6 +222,8 @@ int CmdHF14AReader(const char *Cmd) { uint32_t tagT = GetHF14AMfU_Type(); if (tagT != UL_ERROR) ul_print_type(tagT, 0); + else + PrintAndLog("TYPE: Possible AZTEK (iso14443a compliant)"); // reconnect for further tests c.arg[0] = ISO14A_CONNECT | ISO14A_NO_DISCONNECT; @@ -697,7 +701,8 @@ int CmdHF14ACmdRaw(const char *cmd) { return 0; } -static void waitCmd(uint8_t iSelect) { +static void waitCmd(uint8_t iSelect) +{ UsbCommand resp; uint16_t len = 0;