From: W8M2Hg9lLmWqXSGC Date: Mon, 24 Mar 2014 20:07:48 +0000 (+1100) Subject: Merge pull request #7 from PenturaLabs/master X-Git-Tag: v1.0.0~7 X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/88c637e6cde839c8316800ab0d96301b61208b6d?hp=1801456ede26acf58301412c8f3a5c01f1e9cd8f Merge pull request #7 from PenturaLabs/master Re-submitting Midnitesnake's Mifare Ultralight Patch --- diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c index bd6137ac..a7312d21 100644 --- a/client/cmdlfem4x.c +++ b/client/cmdlfem4x.c @@ -35,6 +35,7 @@ int CmdEM410xRead(const char *Cmd) int i, j, clock, header, rows, bit, hithigh, hitlow, first, bit2idx, high, low; int parity[4]; char id[11]; + char id2[11]; int retested = 0; uint8_t BitStream[MAX_GRAPH_TRACE_LEN]; high = low = 0; @@ -101,6 +102,7 @@ retest: { /* Read another byte! */ sprintf(id+rows, "%x", (8 * BitStream[i]) + (4 * BitStream[i+1]) + (2 * BitStream[i+2]) + (1 * BitStream[i+3])); + sprintf(id2+rows, "%x", (8 * BitStream[i+3]) + (4 * BitStream[i+2]) + (2 * BitStream[i+1]) + (1 * BitStream[i])); rows++; /* Keep parity info */ @@ -135,6 +137,7 @@ retest: { /* Sweet! */ PrintAndLog("EM410x Tag ID: %s", id); + PrintAndLog("Unique Tag ID: %s", id2); /* Stop any loops */ return 1;