X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/758f5ee3e59a9a0774fb272e7fb7930c91c7ca61..2d3f8e5fa7e5a775cef24b526a85465cd7d125b5:/client/cmdlfhid.c

diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index f17bb58c..3c0faf3e 100644
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -51,19 +51,51 @@ int usage_lf_hid_clone(void){
 }
 int usage_lf_hid_brute(void){
 	PrintAndLog("Enables bruteforce of HID readers with specified facility code.");
-	PrintAndLog("Different formatlength is supported");
-	PrintAndLog("This is a incremental attack against reader.");
+	PrintAndLog("This is a attack against reader. if cardnumber is given, it starts with it and goes up / down one step");
+	PrintAndLog("if cardnumber is not given, it starts with 1 and goes up to 65535");
 	PrintAndLog("");
-	PrintAndLog("Usage:  lf hid brute [h] <format length> <facility code>");
+	PrintAndLog("Usage:  lf hid brute [h] a <format> f <facility-code> c <cardnumber> d <delay>");
 	PrintAndLog("Options :");
-	PrintAndLog("  h				- This help");	
-	PrintAndLog("  <format length>	- 26|33|34|35|37|40|44|84");
-	PrintAndLog("  <facility code>	- 8-bit value HID facility code");
+	PrintAndLog("       h                 :  This help");	
+	PrintAndLog("       a <format>        :  26|33|34|35|37|40|44|84");
+	PrintAndLog("       f <facility-code> :  8-bit value HID facility code");
+	PrintAndLog("       c <cardnumber>    :  (optional) cardnumber to start with, max 65535");
+	PrintAndLog("       d <delay>         :  delay betweens attempts in ms. Default 1000ms");
 	PrintAndLog("");
-	PrintAndLog("Sample  : lf hid brute 26 224");
+	PrintAndLog("Samples:");
+	PrintAndLog("       lf hid brute a 26 f 224");
+	PrintAndLog("       lf hid brute a 26 f 21 d 2000");
+	PrintAndLog("       lf hid brute a 26 f 21 c 200 d 2000");
 	return 0;
 }
 
+static int sendPing(void){
+	UsbCommand ping = {CMD_PING, {1, 2, 3}};
+	SendCommand(&ping);
+	SendCommand(&ping);	
+	SendCommand(&ping);	
+	clearCommandBuffer();
+	UsbCommand resp;
+	if (WaitForResponseTimeout(CMD_ACK, &resp, 1000))
+		return 0;
+	return 1;
+}
+static bool sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, uint8_t *bs){
+
+	PrintAndLog("Trying FC: %u; CN: %u", fc, cn);
+	
+	calcWiegand( fmtlen, fc, cn, bs);
+
+	uint64_t arg1 = bytebits_to_byte(bs,32);
+	uint64_t arg2 = bytebits_to_byte(bs+32,32);
+	UsbCommand c = {CMD_HID_SIM_TAG, {arg1, arg2, 0}}; 
+	clearCommandBuffer();
+	SendCommand(&c);
+	msleep(delay);
+	sendPing();
+	return TRUE;
+}
+
 int CmdHIDDemodFSK(const char *Cmd) {
 	int findone = ( Cmd[0] == '1' ) ? 1 : 0;
 	UsbCommand c = {CMD_HID_DEMOD_FSK, {findone, 0 , 0}};
@@ -95,7 +127,7 @@ int CmdHIDSim(const char *Cmd) {
 
 int CmdHIDClone(const char *Cmd) {
 	
-	unsigned int hi2 = 0, hi = 0, lo = 0;
+	uint32_t hi2 = 0, hi = 0, lo = 0;
 	int n = 0, i = 0;
 	UsbCommand c;
 
@@ -143,28 +175,28 @@ typedef struct {
 	size_t   Wiegand_n;
  } wiegand_t;
 
-// static void addHIDMarker(uint8_t fmtlen, uint8_t *out) {
-	
-// }
-//static void getParity26(uint32_t *hi, uint32_t *lo){
-	// uint32_t result = 0;
-	// int i;
-	// // even parity
-	// for (i = 24;i >= 13;i--)
-		// result ^= (*lo >> i) & 1;
-	// // even parity 26th bit
-	// *lo |= result << 25;
-
-	// // odd parity 
-	// result = 0;
-	// for (i = 12;i >= 1;i--)
-		// result ^= (*lo >> i) & 1;
-	// *lo |= !result;
-//}
-
-// static void getParity33(uint32_t *hi, uint32_t *lo){
+static void addHIDMarker(uint8_t fmtlen, uint8_t *out) {    
+	switch(fmtlen) {
+		case 26:{
+			uint8_t len = 37;
+			uint8_t tmp[len];
+			memset(tmp, 0, len);
+			uint8_t idx = 37-fmtlen;
+			memcpy(tmp+idx, out, fmtlen);
+			tmp[idx] = 1; // start sentinel?
+			tmp[0]  = 1; // bit indicates that a format smaller than 37 is used
+			memcpy(out, tmp, len);
+			break;
+		}
+		case 34:
+				// set bit format for less than 37 bit format
+				// 5+32= 1
+				//*hi = (1 << 5) | (fc >> 15);
+			break;
+		default:break;
+	}
+}
 
-// }
 // static void getParity34(uint32_t *hi, uint32_t *lo){
 	// uint32_t result = 0;
 	// int i;
@@ -184,28 +216,6 @@ typedef struct {
 
 	// *lo |= !result;
 // }
-// static void getParity35(uint32_t *hi, uint32_t *lo){	
-// }
-// static void getParity37S(uint32_t *hi,uint32_t *lo){
-	// uint32_t result = 0;
-	// int i;
-
-	// // even parity
-	// for (i = 4; i >= 0; i--)
-		// result ^= (*hi >> i) & 1;
-	
-	// for (i = 31; i >= 20; i--)
-		// result ^= (*lo >> i) & 1;
-
-	// *hi |= result;
-
-	// // odd parity
-	// result = 0;
-	// for (i = 19; i >= 1; i--)
-		// result ^= (*lo >> i) & 1;
-
-	// *lo |= result;
-// }
 // static void getParity37H(uint32_t *hi, uint32_t *lo){
 	// uint32_t result = 0;
 	// int i;
@@ -224,102 +234,73 @@ typedef struct {
 	// *lo |= result;
 // }
 
-//static void calc26(uint16_t fc, uint32_t cardno, uint32_t *hi, uint32_t *lo){
-void calc26(uint16_t fc, uint32_t cardno, uint8_t *out){
-
+//static void calc26(uint16_t fc, uint32_t cardno,  uint8_t *out){
+static void calc26(uint16_t fc, uint32_t cardno, uint8_t *out){
 	uint8_t wiegand[24];
 	num_to_bytebits(fc, 8, wiegand);
 	num_to_bytebits(cardno, 16, wiegand+8);
 	wiegand_add_parity(out,  wiegand, sizeof(wiegand) );
-	
-//   *out |= (1 << 26); // why this?
-//   *out |= (1 << 37);  // bit format for hid?
 }
-// static void calc33(uint16_t fc, uint32_t cardno, uint32_t *hi, uint32_t *lo){
-
-// }
-// static void calc34(uint16_t fc, uint32_t cardno, uint32_t *hi, uint32_t *lo){
-  // // put card number first bit 1 .. 20 //
-  // *lo = ((cardno & 0X000F7FFF) << 1) | ((fc & 0XFFFF) << 17);
-  // // set bit format for less than 37 bit format
-  // *hi = (1 << 5) | (fc >> 15);
+// static void calc33(uint16_t fc, uint32_t cardno,  uint8_t *out){
 // }
-// static void calc35(uint16_t fc, uint32_t cardno, uint32_t *hi, uint32_t *lo){
+static void calc34(uint16_t fc, uint32_t cardno, uint8_t *out){
+	uint8_t wiegand[32];
+	num_to_bytebits(fc, 16, wiegand);
+	num_to_bytebits(cardno, 16, wiegand + 16);
+  	wiegand_add_parity(out,  wiegand, sizeof(wiegand) );	
+}
+// static void calc35(uint16_t fc, uint32_t cardno,  uint8_t *out){
 	// *lo = ((cardno & 0xFFFFF) << 1) | fc << 21; 
 	// *hi = (1 << 5) | ((fc >> 11) & 1);  
 // }
-// static void calc37S(uint16_t fc, uint32_t cardno, uint32_t *hi, uint32_t *lo){
-	// // FC 2 - 17   - 16 bit  
-	// // cardno 18 - 36  - 19 bit
-	// // Even P1   1 - 19
-	// // Odd  P37  19 - 36
-
-	// fc = fc & 0xFFFF;
-	// *lo = ((fc << 20) | (cardno & 0x7FFFF) << 1);
-	// *hi = (fc >> 12);
-// }
-// static void calc37H(uint64_t cardno, uint32_t *hi, uint32_t *lo){
-	// // SC NONE
-	// // cardno 1-35 34 bits 
-	// // Even Parity  0th bit  1-18
-	// // Odd  Parity 36th bit 19-35
-	// cardno = (cardno & 0x00000003FFFFFFFF);
-	// *lo = (cardno << 1);
-	// *hi = (cardno >> 31);
-// }
-// static void calc40(uint64_t cardno, uint32_t *hi, uint32_t *lo){
+static void calc37S(uint16_t fc, uint32_t cardno, uint8_t *out){
+	// FC 2 - 17   - 16 bit  
+	// cardno 18 - 36  - 19 bit
+	// Even P1   1 - 19
+	// Odd  P37  19 - 36
+	uint8_t wiegand[35];
+	num_to_bytebits(fc, 16, wiegand);
+	num_to_bytebits(cardno, 19, wiegand + 16);
+  	wiegand_add_parity(out,  wiegand, sizeof(wiegand) );
+}
+static void calc37H(uint64_t cardno, uint8_t *out){
+	// SC NONE
+	// cardno 1-35 34 bits 
+	// Even Parity  0th bit  1-18
+	// Odd  Parity 36th bit 19-35
+	uint8_t wiegand[37];
+	num_to_bytebits( (uint32_t)(cardno >> 32), 2, wiegand);
+	num_to_bytebits( (uint32_t)(cardno >> 0), 32, wiegand + 2);
+  	wiegand_add_parity(out,  wiegand, sizeof(wiegand) );
+	
+	printf("%x %x\n", (uint32_t)(cardno >> 32), (uint32_t)cardno );
+}
+// static void calc40(uint64_t cardno,  uint8_t *out){
 	// cardno = (cardno & 0xFFFFFFFFFF);
 	// *lo = ((cardno & 0xFFFFFFFF) << 1 ); 
 	// *hi = (cardno >> 31);  
 // }
 
-static void calcWiegand(uint8_t fmtlen, uint16_t fc, uint64_t cardno, uint8_t *bits){
-
-	// uint32_t hi = 0, lo = 0;
-	// uint32_t cn32 = (cardno & 0xFFFFFFFF);
-	// switch ( fmtlen ) {
-		// case 26 : {			
-			// calc26(fc, cn32, bits);
-			// addHIDFormatMarker(fmtlen, bits);	
-			// break;
-		// }
-		// case 33 : { 
- 			// // calc33(fc, cn32, hi, lo);
-			// // getParity33(hi, lo);	
-			// break;
-		// }
-		// case 34 : {
- 			// calc34(fc, cn32, hi, lo);
-			// getParity34(hi, lo);		
-			// break;
-		// }
-		// case 35 : {
-			// calc35(fc, cn32, hi, lo);
-			// getParity35(hi, lo);
-			// break;
-		// }
-		// case 37 : {
-			// calc37S(fc, cn32, hi, lo);
-			// getParity37S(hi, lo);
-			// break;
-		// }
-		// case 38 : { 
-			// calc37H(cn32, hi, lo);
-			// getParity37H(hi, lo);
-			// break;
-		// }
-		// case 40 : calc40(cardno, hi, lo);	break;
+void calcWiegand(uint8_t fmtlen, uint16_t fc, uint64_t cardno, uint8_t *bits){
+	 uint32_t cn32 = (cardno & 0xFFFFFFFF);
+	 switch ( fmtlen ) {
+		case 26: calc26(fc, cn32, bits); break;
+		// case 33 : calc33(fc, cn32, bits); break;
+		case 34: calc34(fc, cn32, bits); break;
+		// case 35 : calc35(fc, cn32, bits); break;
+		case 37: calc37S(fc, cn32, bits); break;
+		case 38: calc37H(cardno, bits); break;
+		// case 40 : calc40(cardno, bits);	break;
 		// case 44 : { break; }
 		// case 84 : { break; }
-	// }
-
+		default: break;
+	}
 }	
 
 int CmdHIDWiegand(const char *Cmd) {
 	uint32_t oem = 0, fc = 0;
 	uint64_t cardnum = 0;
-	
-	uint32_t blocks[2], wiegand[2];
+	uint64_t blocks = 0, wiegand = 0; 
 
 	uint8_t bits[96];
 	uint8_t *bs = bits;
@@ -332,92 +313,130 @@ int CmdHIDWiegand(const char *Cmd) {
 	fc = param_get32ex(Cmd, 1, 0, 10);
 	cardnum = param_get64ex(Cmd, 2, 0, 10);
 
-	// 
-	uint8_t ftmlen[] = {26,33,34,35,37,38,40};
+	uint8_t fmtlen[] = {26,33,34,35,37,38,40};
 	
-	PrintAndLog("HID | FC  | CN    |  Wiegand  |  HID Formatted");
-	PrintAndLog("----+-----+-------+-----------+--------------------");
-	for (uint8_t i = 0; i < sizeof(ftmlen); i++){
-		calcWiegand( ftmlen[i], fc, cardnum, bs);
-		blocks[0] = bytebits_to_byte(bs,32);
-		blocks[1] = bytebits_to_byte(bs+32,32);
-		PrintAndLog(" %d | %d  | %llu  | %08X%08X  |  %08X%08X ",
-			ftmlen,
+	PrintAndLog("HID | OEM | FC   | CN      |  Wiegand  |  HID Formatted");
+	PrintAndLog("----+-----+------+---------+-----------+--------------------");
+	for (uint8_t i = 0; i < sizeof(fmtlen); i++){
+		memset(bits, 0x00, sizeof(bits));
+		calcWiegand( fmtlen[i], fc, cardnum, bs);
+		printf("ice:: %s", sprint_bin(bs, fmtlen[i]));
+		wiegand = (uint64_t)bytebits_to_byte(bs, 32) << 32 | bytebits_to_byte(bs+32, 32);
+		
+		addHIDMarker(fmtlen[i], bs);	
+		printf("ice:: %s", sprint_bin(bs, 37));
+		blocks = (uint64_t)bytebits_to_byte(bs, 32) << 32 | bytebits_to_byte(bs+32, 32);
+		uint8_t shifts = 64-fmtlen[i];		
+		wiegand >>= shifts;
+		
+		PrintAndLog(" %u | %03u | %03u  | %llu  | %llX  |  %llX",
+			fmtlen[i],
+			oem,
 			fc,
 			cardnum,
-			wiegand[0],
-			wiegand[1],
-			blocks[0],
-			blocks[1]
+			wiegand,
+			blocks
 			);
 	}
-	PrintAndLog("----+-----+-------+-----------+--------------------");
+	PrintAndLog("----+-----+-----+-------+-----------+--------------------");
 	return 0;
 }
 
 int CmdHIDBrute(const char *Cmd){
 	
-	bool error = TRUE;
-	uint8_t fc = 0, fmtlen = 0;
-
+	bool errors = false;
+	uint32_t fc = 0, cn = 0, delay = 1000;
+	uint8_t fmtlen = 0;
 	uint8_t bits[96];
 	uint8_t *bs = bits;
 	memset(bs, 0, sizeof(bits));
-
-	UsbCommand c = {CMD_HID_SIM_TAG, {0, 0, 0}};  
-	
-	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) > 2 || strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_hid_brute();
-
-	fmtlen = param_get8(Cmd, 0);
-	uint8_t ftms[] = {26,33,34,35,37};
-	for ( uint8_t i = 0; i < sizeof(ftms); i++){
-		if ( ftms[i] == fmtlen ) {
-			error = FALSE;
+	uint8_t cmdp = 0;
+		
+	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+		switch(param_getchar(Cmd, cmdp)) {
+		case 'h':
+		case 'H':
+			return usage_lf_hid_brute();
+		case 'f':
+		case 'F':
+		  	fc =  param_get32ex(Cmd ,cmdp+1, 0, 10);
+			if ( !fc )
+				errors = true;
+			cmdp += 2;
+			break;
+		case 'd':
+		case 'D':
+			// delay between attemps,  defaults to 1000ms. 
+			delay = param_get32ex(Cmd, cmdp+1, 1000, 10);
+			cmdp += 2;
+			break;
+		case 'c':
+		case 'C':
+			cn = param_get32ex(Cmd, cmdp+1, 0, 10);
+			// truncate cardnumber.
+			cn &= 0xFFFF;
+			cmdp += 2;
+			break;
+		case 'a':
+		case 'A':
+			fmtlen = param_get8(Cmd, cmdp+1);			
+			cmdp += 2;
+			bool is_ftm_ok = FALSE;
+			uint8_t ftms[] = {26,33,34,35,37};
+			for ( uint8_t i = 0; i < sizeof(ftms); i++){
+				if ( ftms[i] == fmtlen ) {
+					is_ftm_ok = TRUE;
+				}
+			}
+			// negated
+			errors = !is_ftm_ok;
+			break;
+		default:
+			PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+			errors = true;
+			break;
 		}
 	}
-
-	if ( error ) return usage_lf_hid_brute();
-	
-  	fc =  param_get8(Cmd, 1);
-	if ( fc == 0) return usage_lf_hid_brute();
+	if ( fc == 0 ) errors = true;
+	if ( errors ) return usage_lf_hid_brute();
 	
 	PrintAndLog("Brute-forcing HID reader");
 	PrintAndLog("Press pm3-button to abort simulation or run another command");
-
-	for ( uint16_t cn = 1; cn < 0xFFFF; ++cn){
+	
+	uint16_t up = cn;
+	uint16_t down = cn;
+	
+	for (;;){
+		
+		if ( offline ) {
+			printf("Device offline\n");
+			return  2;
+		}
+		
 		if (ukbhit()) {
 			PrintAndLog("aborted via keyboard!");
-			c.cmd = CMD_PING;
-			c.arg[0] = 0x00;
-			c.arg[1] = 0x00;
-			c.arg[2] = 0x00;
-			clearCommandBuffer();
-			SendCommand(&c);
-			return 1;
+			return sendPing();
 		}
-
-		calcWiegand( fmtlen, fc, cn, bs);
-
-		c.arg[0] = bytebits_to_byte(bs,32);
-		c.arg[1] = bytebits_to_byte(bs+32,32);
-		clearCommandBuffer();
-		SendCommand(&c);
 		
-		PrintAndLog("Trying FC: %u; CN: %u", fc, cn);
-		// pause
-		sleep(1);
+		// Do one up
+		if ( up < 0xFFFF )
+			if ( !sendTry(fmtlen, fc, up++, delay, bs)) return 1;
+		
+		// Do one down  (if cardnumber is given)
+		if ( cn > 1 )
+			if ( down > 1 )
+				if ( !sendTry(fmtlen, fc, --down, delay, bs)) return 1;
 	}
 	return 0;
 }
 
 static command_t CommandTable[] = {
 	{"help",    CmdHelp,        1, "This help"},
-	{"fskdemod",CmdHIDDemodFSK, 0, "[1] Realtime HID FSK demodulator (option '1' for one tag only)"},
-	{"sim",     CmdHIDSim,      0, "<ID> -- HID tag simulator"},
-	{"clone",   CmdHIDClone,    0, "<ID> [L] -- Clone HID to T55x7"},
-	{"wiegand", CmdHIDWiegand,  0, "<OEM> <facility code> <card number> -- convert facility code/card number to Wiegand code"},
-	{"brute",   CmdHIDBrute, 0, "<format length> <facility code> -- brute force card number"},
+	{"fskdemod",CmdHIDDemodFSK, 0, "Realtime HID FSK demodulator"},
+	{"sim",     CmdHIDSim,      0, "HID tag simulator"},
+	{"clone",   CmdHIDClone,    0, "Clone HID to T55x7"},
+	{"wiegand", CmdHIDWiegand,  1, "Convert facility code/card number to Wiegand code"},
+	{"brute",   CmdHIDBrute,	0, "Bruteforce card number against reader"},
 	{NULL, NULL, 0, NULL}
 };