github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 22:03:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #653 from bkerler/master

Browse source 
Small typos and Models corrected.
This commit is contained in:
Iceman 2020-04-06 17:06:31 +02:00 • committed by GitHub
commit 13c50da9e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
client/cmdhf14a.c
View file

@ -1246,7 +1246,7 @@ int CmdHF14A(const char *Cmd) {
} }
static void printTag(char *tag) { static void printTag(char *tag) {
PrintAndLogEx(SUCCESS, _YELLOW_(" %s"), tag); PrintAndLogEx(SUCCESS, "POSSIBLE TYPE:" _YELLOW_(" %s"), tag);
} }
@ -1265,8 +1265,8 @@ int detect_nxp_card(uint8_t sak, uint16_t atqa) {
int type = MTNONE; int type = MTNONE;
if (sak == 0x00) { if (sak == 0x00) {
printTag("NTAG 21x / NTAG 21x TT / NTAG I2C plus"); printTag("NTAG 20x / 21x / 21x TT / I2C plus");
printTag("MIFARE Ultralight C / Ultralight CL2"); printTag("MIFARE Ultralight / C / EV1 / Nano");
type = MTULTRALIGHT; type = MTULTRALIGHT;
} }
@ -1432,7 +1432,6 @@ int infoHF14A(bool verbose, bool do_nack_test, bool do_aid_search) {
} }
if (card.uidlen > 4) { if (card.uidlen > 4) {
PrintAndLogEx(SUCCESS, "MANUFACTURER: " _YELLOW_("%s"), getTagInfo(card.uid[0])); PrintAndLogEx(SUCCESS, "MANUFACTURER: " _YELLOW_("%s"), getTagInfo(card.uid[0]));
PrintAndLogEx(SUCCESS, "Possible Type:");
switch (card.uid[0]) { switch (card.uid[0]) {
case 0x04: // NXP case 0x04: // NXP
nxptype = detect_nxp_card(card.sak, ((card.atqa[1] << 8) + card.atqa[0])); nxptype = detect_nxp_card(card.sak, ((card.atqa[1] << 8) + card.atqa[0]));
@ -1769,7 +1768,7 @@ int infoHF14A(bool verbose, bool do_nack_test, bool do_aid_search) {
else if (res == 0) else if (res == 0)
PrintAndLogEx(SUCCESS, "Prng detection: " _YELLOW_("hard")); PrintAndLogEx(SUCCESS, "Prng detection: " _YELLOW_("hard"));
else else
PrintAndLogEx(FAILED, "prng detection: " _RED_("fail")); PrintAndLogEx(FAILED, "Prng detection: " _RED_("fail"));
if (do_nack_test) if (do_nack_test)
detect_classic_nackbug(false); detect_classic_nackbug(false);