tweaked sim command, added mfkey32

This commit is contained in:
roel@libnfc.org 2013-03-07 12:22:12 +00:00
commit 17331e14ee
3 changed files with 16 additions and 13 deletions

View file

@ -1133,7 +1133,7 @@ void SimulateIso14443aTag(int tagType, int uid_1st, int uid_2nd)
respdata = &nack; respdata = &nack;
respsize = sizeof(nack); // 4-bit answer respsize = sizeof(nack); // 4-bit answer
} else if(receivedCmd[0] == 0x50) { // Received a HALT } else if(receivedCmd[0] == 0x50) { // Received a HALT
DbpString("Reader requested we HALT!:"); // DbpString("Reader requested we HALT!:");
// Do not respond // Do not respond
resp = resp1; respLen = 0; order = 0; resp = resp1; respLen = 0; order = 0;
respdata = NULL; respdata = NULL;
@ -1147,16 +1147,19 @@ void SimulateIso14443aTag(int tagType, int uid_1st, int uid_2nd)
respdata = response6; respdata = response6;
respsize = sizeof(response6); respsize = sizeof(response6);
} else { } else {
// Never seen this command before if (order == 7 && len ==8) {
Dbprintf("Received (len=%d): %02x %02x %02x %02x %02x %02x %02x %02x %02x", uint32_t nr = bytes_to_num(receivedCmd,4);
len, uint32_t ar = bytes_to_num(receivedCmd+4,4);
receivedCmd[0], receivedCmd[1], receivedCmd[2], Dbprintf("Auth attempt {nr}{ar}: %08x %08x",nr,ar);
receivedCmd[3], receivedCmd[4], receivedCmd[5], } else {
receivedCmd[6], receivedCmd[7], receivedCmd[8]); // Never seen this command before
// Do not respond Dbprintf("Received unknown command (len=%d):",len);
resp = resp1; respLen = 0; order = 0; Dbhexdump(len,receivedCmd,false);
respdata = NULL; }
respsize = 0; // Do not respond
resp = resp1; respLen = 0; order = 0;
respdata = NULL;
respsize = 0;
} }
// Count number of wakeups received after a halt // Count number of wakeups received after a halt

View file

@ -5,7 +5,7 @@ LDFLAGS =
OBJS = crapto1.o crypto1.o OBJS = crapto1.o crypto1.o
HEADERS = HEADERS =
EXES = mfkey EXES = mfkey64 mfkey32
LIBS = LIBS =
all: $(OBJS) $(EXES) $(LIBS) all: $(OBJS) $(EXES) $(LIBS)

View file

@ -11,5 +11,5 @@
+ 1287: : a1 e4 58 ce 6e ea 41 e0 + 1287: : a1 e4 58 ce 6e ea 41 e0
+ 64: 0: TAG 5c ad f4 39 + 64: 0: TAG 5c ad f4 39
./mfkey 9c599b32 82a4166c a1e458ce 6eea41e0 5cadf439 ./mfkey64 9c599b32 82a4166c a1e458ce 6eea41e0 5cadf439