projects
/
proxmark3-svn
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FIX: minor fixes in hf mfu, from @marshmello42 's branch.
[proxmark3-svn]
/
armsrc
/
appmain.c
diff --git
a/armsrc/appmain.c
b/armsrc/appmain.c
index c51aa54e44e3d6ccfd90a41aab3aaf38c6c8cdbe..4cbf5acdc1ed11ab7d5afd53b66439f42f9d7eeb 100644
(file)
--- a/
armsrc/appmain.c
+++ b/
armsrc/appmain.c
@@
-432,7
+432,7
@@
void StandAloneMode14a()
SpinDelay(300);
}
}
SpinDelay(300);
}
}
- if (!iso14443a_select_card(uid, &hi14a_card[selected], &cuid))
+ if (!iso14443a_select_card(uid, &hi14a_card[selected], &cuid
, true, 0
))
continue;
else
{
continue;
else
{
@@
-1007,10
+1007,8
@@
void UsbPacketReceived(uint8_t *packet, int len)
CmdAWIDdemodFSK(c->arg[0], 0, 0, 1);
break;
case CMD_VIKING_CLONE_TAG:
CmdAWIDdemodFSK(c->arg[0], 0, 0, 1);
break;
case CMD_VIKING_CLONE_TAG:
-
CopyViKingtoT55x7(c->arg[0],c->arg[1
]);
+
CopyVikingtoT55xx(c->arg[0], c->arg[1], c->arg[2
]);
break;
break;
-
-
#endif
#ifdef WITH_HITAG
#endif
#ifdef WITH_HITAG
@@
-1133,6
+1131,9
@@
void UsbPacketReceived(uint8_t *packet, int len)
case CMD_MIFAREU_WRITEBL:
MifareUWriteBlock(c->arg[0], c->arg[1], c->d.asBytes);
break;
case CMD_MIFAREU_WRITEBL:
MifareUWriteBlock(c->arg[0], c->arg[1], c->d.asBytes);
break;
+ case CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES:
+ MifareAcquireEncryptedNonces(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+ break;
case CMD_MIFARE_NESTED:
MifareNested(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
break;
case CMD_MIFARE_NESTED:
MifareNested(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
break;
Impressum
,
Datenschutz