X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/81b7e89434aad94a3cbddd5742341cd75e48efa5..16cfceb68966bb3022dee37f4c3f4f1bace3f9c5:/armsrc/appmain.c

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 4eabb319..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 <stdarg.h>
 #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.
 //=============================================================================
@@ -429,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++)
@@ -456,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);
@@ -527,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);
@@ -573,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
@@ -590,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) {
@@ -992,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
@@ -1025,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;