X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/3375daee9ec98977c69ef19ac1f14317bfdd80d9..81b7e89434aad94a3cbddd5742341cd75e48efa5:/client/cmdlfvisa2000.c diff --git a/client/cmdlfvisa2000.c b/client/cmdlfvisa2000.c index 9148a435..9eca4052 100644 --- a/client/cmdlfvisa2000.c +++ b/client/cmdlfvisa2000.c @@ -48,10 +48,16 @@ static uint8_t visa_chksum( uint32_t id ) { //see ASKDemod for what args are accepted int CmdVisa2kDemod(const char *Cmd) { + // save GraphBuffer - to restore it later + save_restoreGB(1); + + CmdAskEdgeDetect(""); + //ASK / Manchester bool st = TRUE; if (!ASKDemod_ext("64 0 0", FALSE, FALSE, 1, &st)) { if (g_debugMode) PrintAndLog("DEBUG: Error - Visa2k: ASK/Manchester Demod failed"); + save_restoreGB(0); return 0; } size_t size = DemodBufferLen; @@ -67,6 +73,7 @@ int CmdVisa2kDemod(const char *Cmd) { else PrintAndLog("DEBUG: Error - Visa2k: ans: %d", ans); } + save_restoreGB(0); return 0; } setDemodBuf(DemodBuffer, 96, ans); @@ -82,10 +89,11 @@ int CmdVisa2kDemod(const char *Cmd) { // test checksums if ( chk != calc ) { printf("DEBUG: error: Visa2000 checksum failed %x - %x\n", chk, calc); + save_restoreGB(0); return 0; } PrintAndLog("Visa2000 Tag Found: Card ID %u, Raw: %08X%08X%08X", raw2, raw1 ,raw2, raw3); - + save_restoreGB(0); return 1; } @@ -113,13 +121,13 @@ int CmdVisa2kClone(const char *Cmd) { // blocks[2] = id; - blocks[3] = visa_chksum( id); + blocks[3] = visa_chksum(id); PrintAndLog("Preparing to clone Visa2000 to T55x7 with CardId: %u", id); PrintAndLog("Blk | Data "); PrintAndLog("----+------------"); for(int i = 0; i<4; ++i) - PrintAndLog(" %02d | 0x%08x", i , blocks[i]); + PrintAndLog(" %02d | 0x%08x", i , blocks[i]); UsbCommand resp; UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};