X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/70459879e98e1e7a2a5627c4008f0ad38b8dc782..a7474bb30acb4881fe57db4c8ce0778823efa501:/armsrc/appmain.c diff --git a/armsrc/appmain.c b/armsrc/appmain.c index c51aa54e..4cbf5acd 100644 --- a/armsrc/appmain.c +++ b/armsrc/appmain.c @@ -432,7 +432,7 @@ void StandAloneMode14a() SpinDelay(300); } } - if (!iso14443a_select_card(uid, &hi14a_card[selected], &cuid)) + if (!iso14443a_select_card(uid, &hi14a_card[selected], &cuid, true, 0)) 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: - CopyViKingtoT55x7(c->arg[0],c->arg[1]); + CopyVikingtoT55xx(c->arg[0], c->arg[1], c->arg[2]); break; - - #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_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;