X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/ab1112796e787407eadba215674efef3ab3f372e..16cfceb68966bb3022dee37f4c3f4f1bace3f9c5:/armsrc/appmain.c diff --git a/armsrc/appmain.c b/armsrc/appmain.c index 222e4b21..de6e4427 100644 --- a/armsrc/appmain.c +++ b/armsrc/appmain.c @@ -10,20 +10,15 @@ // executes. //----------------------------------------------------------------------------- #include "usb_cdc.h" -//#include "cmd.h" #include "proxmark3.h" #include "apps.h" #include "util.h" #include "printf.h" #include "string.h" -#include #include "legicrf.h" -#include "hitag2.h" -#include "hitagS.h" #include "lfsampling.h" #include "BigBuf.h" #include "mifareutil.h" -#include "pcf7931.h" #ifdef WITH_LCD #include "LCD.h" @@ -76,6 +71,28 @@ void PrintToSendBuffer(void){ Dbhexdump(ToSendMax, ToSend, 0); } +void print_result(char *name, uint8_t *buf, size_t len) { + uint8_t *p = buf; + + if ( len % 16 == 0 ) { + for(; p-buf < len; p += 16) + Dbprintf("[%s:%d/%d] %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x", + name, + p-buf, + len, + p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7],p[8], p[9], p[10], p[11], p[12], p[13], p[14], p[15] + ); + } + else { + for(; p-buf < len; p += 8) + Dbprintf("[%s:%d/%d] %02x %02x %02x %02x %02x %02x %02x %02x", + name, + p-buf, + len, + p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]); + } +} + //============================================================================= // Debug print functions, to go out over USB, to the usual PC-side client. //============================================================================= @@ -182,9 +199,7 @@ static int ReadAdc(int ch) int AvgAdc(int ch) // was static - merlok { - int i; - int a = 0; - + int i, a = 0; for(i = 0; i < 32; ++i) a += ReadAdc(ch); @@ -431,8 +446,9 @@ void StandAloneMode14a() continue; else { - Dbprintf("Read UID:"); Dbhexdump(10,uid,0); - memcpy(readUID,uid,10*sizeof(uint8_t)); + Dbprintf("Read UID:"); + Dbhexdump(10, uid, 0); + memcpy(readUID, uid, 10 * sizeof(uint8_t)); uint8_t *dst = (uint8_t *)&uid_tmp1; // Set UID byte order for (int i=0; i<4; i++) @@ -458,8 +474,8 @@ void StandAloneMode14a() } } } - Dbprintf("ATQA = %02X%02X",hi14a_card[selected].atqa[0],hi14a_card[selected].atqa[1]); - Dbprintf("SAK = %02X",hi14a_card[selected].sak); + Dbprintf("ATQA = %02X%02X", hi14a_card[selected].atqa[0], hi14a_card[selected].atqa[1]); + Dbprintf("SAK = %02X", hi14a_card[selected].sak); LEDsoff(); LED(LED_GREEN, 200); LED(LED_ORANGE, 200); @@ -529,15 +545,15 @@ void StandAloneMode14a() playing = 1; } else { - Dbprintf("UID from target tag: %02X%02X%02X%02X", oldBlock0[0],oldBlock0[1],oldBlock0[2],oldBlock0[3]); - memcpy(newBlock0,oldBlock0,16); + Dbprintf("UID from target tag: %02X%02X%02X%02X", oldBlock0[0], oldBlock0[1], oldBlock0[2], oldBlock0[3]); + memcpy(newBlock0, oldBlock0, 16); // Copy uid_1st for bank (2nd is for longer UIDs not supported if classic) newBlock0[0] = uid_1st[selected]>>24; newBlock0[1] = 0xFF & (uid_1st[selected]>>16); newBlock0[2] = 0xFF & (uid_1st[selected]>>8); newBlock0[3] = 0xFF & (uid_1st[selected]); - newBlock0[4] = newBlock0[0]^newBlock0[1]^newBlock0[2]^newBlock0[3]; + newBlock0[4] = newBlock0[0] ^ newBlock0[1] ^ newBlock0[2] ^ newBlock0[3]; // arg0 = workFlags, arg1 = blockNo, datain MifareCSetBlock(params, 0, newBlock0); @@ -575,9 +591,9 @@ void StandAloneMode14a() uint8_t data[512] = {0}; // in case there is a read command received we shouldn't break uint8_t flags = ( uid_2nd[selected] > 0x00 ) ? FLAG_7B_UID_IN_DATA : FLAG_4B_UID_IN_DATA; num_to_bytes(uid_1st[selected], 3, data); - num_to_bytes(uid_2nd[selected], 4, data); + num_to_bytes(uid_2nd[selected], 4, data+3); - Dbprintf("Simulating ISO14443a tag with uid[0]: %08x, uid[1]: %08x [Bank: %u]", uid_1st[selected],uid_2nd[selected],selected); + Dbprintf("Simulating ISO14443a tag with uid[0]: %08x, uid[1]: %08x [Bank: %u]", uid_1st[selected], uid_2nd[selected], selected); if (hi14a_card[selected].sak == 8 && hi14a_card[selected].atqa[0] == 4 && hi14a_card[selected].atqa[1] == 0) { DbpString("Mifare Classic"); SimulateIso14443aTag(1, flags, data); // Mifare Classic @@ -592,7 +608,7 @@ void StandAloneMode14a() } else { Dbprintf("Unrecognized tag type -- defaulting to Mifare Classic emulation"); - SimulateIso14443aTag(1, flags, data); + SimulateIso14443aTag(1, flags, data); // Mifare Classic } } else if (button_action == BUTTON_SINGLE_CLICK) { @@ -994,6 +1010,9 @@ void UsbPacketReceived(uint8_t *packet, int len) case CMD_VIKING_CLONE_TAG: CopyVikingtoT55xx(c->arg[0], c->arg[1], c->arg[2]); break; + case CMD_COTAG: + Cotag(); + break; #endif #ifdef WITH_HITAG @@ -1027,19 +1046,15 @@ void UsbPacketReceived(uint8_t *packet, int len) case CMD_RECORD_RAW_ADC_SAMPLES_ISO_15693: RecordRawAdcSamplesIso15693(); break; - case CMD_ISO_15693_COMMAND: DirectTag15693Command(c->arg[0],c->arg[1],c->arg[2],c->d.asBytes); break; - case CMD_ISO_15693_FIND_AFI: BruteforceIso15693Afi(c->arg[0]); break; - case CMD_ISO_15693_DEBUG: SetDebugIso15693(c->arg[0]); break; - case CMD_READER_ISO_15693: ReaderIso15693(c->arg[0]); break; @@ -1052,17 +1067,17 @@ void UsbPacketReceived(uint8_t *packet, int len) case CMD_SIMULATE_TAG_LEGIC_RF: LegicRfSimulate(c->arg[0], c->arg[1], c->arg[2]); break; - case CMD_WRITER_LEGIC_RF: - LegicRfWriter( c->arg[0], c->arg[1], c->arg[2]); + LegicRfWriter( c->arg[0], c->arg[1], c->arg[2], c->d.asBytes); break; - - case CMD_RAW_WRITER_LEGIC_RF: - LegicRfRawWriter(c->arg[0], c->arg[1], c->arg[2]); - break; - case CMD_READER_LEGIC_RF: LegicRfReader(c->arg[0], c->arg[1], c->arg[2]); + break; + case CMD_LEGIC_INFO: + LegicRfInfo(); + break; + case CMD_LEGIC_ESET: + LegicEMemSet(c->arg[0], c->arg[1], c->d.asBytes); break; #endif @@ -1192,7 +1207,6 @@ void UsbPacketReceived(uint8_t *packet, int len) case CMD_MIFARE_DESFIRE: MifareSendCommand(c->arg[0], c->arg[1], c->d.asBytes); break; - case CMD_MIFARE_COLLECT_NONCES: break; #endif @@ -1223,7 +1237,7 @@ void UsbPacketReceived(uint8_t *packet, int len) case CMD_READER_ICLASS_REPLAY: ReaderIClass_Replay(c->arg[0], c->d.asBytes); break; - case CMD_ICLASS_EML_MEMSET: + case CMD_ICLASS_EML_MEMSET: emlSet(c->d.asBytes,c->arg[0], c->arg[1]); break; case CMD_ICLASS_WRITEBLOCK: @@ -1277,19 +1291,36 @@ void UsbPacketReceived(uint8_t *packet, int len) LED_B_ON(); uint8_t *BigBuf = BigBuf_get_addr(); size_t len = 0; - for(size_t i=0; iarg[1]; i += USB_CMD_DATA_SIZE) { - len = MIN((c->arg[1] - i),USB_CMD_DATA_SIZE); - cmd_send(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K,i,len,BigBuf_get_traceLen(),BigBuf+c->arg[0]+i,len); + size_t startidx = c->arg[0]; + uint8_t isok = FALSE; + // arg0 = startindex + // arg1 = length bytes to transfer + // arg2 = RFU + //Dbprintf("transfer to client parameters: %llu | %llu | %llu", c->arg[0], c->arg[1], c->arg[2]); + + for(size_t i = 0; i < c->arg[1]; i += USB_CMD_DATA_SIZE) { + len = MIN( (c->arg[1] - i), USB_CMD_DATA_SIZE); + isok = cmd_send(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, i, len, BigBuf_get_traceLen(), BigBuf + startidx + i, len); + if (!isok) + Dbprintf("transfer to client failed :: | bytes %d", len); } // Trigger a finish downloading signal with an ACK frame - cmd_send(CMD_ACK,1,0,BigBuf_get_traceLen(),getSamplingConfig(),sizeof(sample_config)); + cmd_send(CMD_ACK, 1, 0, BigBuf_get_traceLen(), getSamplingConfig(), sizeof(sample_config)); LED_B_OFF(); break; } case CMD_DOWNLOADED_SIM_SAMPLES_125K: { + // iceman; since changing fpga_bitstreams clears bigbuff, Its better to call it before. + // to be able to use this one for uploading data to device + // arg1 = 0 upload for LF usage + // 1 upload for HF usage + if ( c->arg[1] == 0 ) + FpgaDownloadAndGo(FPGA_BITSTREAM_LF); + else + FpgaDownloadAndGo(FPGA_BITSTREAM_HF); uint8_t *b = BigBuf_get_addr(); memcpy( b + c->arg[0], c->d.asBytes, USB_CMD_DATA_SIZE); - cmd_send(CMD_ACK,0,0,0,0,0); + cmd_send(CMD_ACK,1,0,0,0,0); break; } case CMD_DOWNLOAD_EML_BIGBUF: {