X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/8258f409697ab41a6858ef9bdcdf406989223bbb..b18948fd92623d0fc62ce497fe8100a41d3b1e49:/armsrc/mifareutil.c

diff --git a/armsrc/mifareutil.c b/armsrc/mifareutil.c
index 0469364c..7c208b84 100644
--- a/armsrc/mifareutil.c
+++ b/armsrc/mifareutil.c
@@ -322,15 +322,14 @@ int mifare_ul_ev1_auth(uint8_t *keybytes, uint8_t *pack){
 	len = mifare_sendcmd_short_mfuev1auth(NULL, 0, 0x1B, key, resp, respPar, NULL);
 	if (len != 4) {
 		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x %u", resp[0], len);
-		OnError(1);
-		return 1;
+		return 0;
 	}
 
 	if (MF_DBGLEVEL >= MF_DBG_EXTENDED)
 		Dbprintf("Auth Resp: %02x%02x%02x%02x", resp[0],resp[1],resp[2],resp[3]);
 
 	memcpy(pack, resp, 4);
-	return 0;
+	return 1;
 }
 
 int mifare_ultra_auth(uint8_t *keybytes){
@@ -353,8 +352,7 @@ int mifare_ultra_auth(uint8_t *keybytes){
 	len = mifare_sendcmd_short(NULL, 1, 0x1A, 0x00, resp, respPar ,NULL);
 	if (len != 11) {
 		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", resp[0]);
-		OnError(1);
-		return 1;
+		return 0;
 	}
 
 	// tag nonce.
@@ -386,8 +384,7 @@ int mifare_ultra_auth(uint8_t *keybytes){
 	len = mifare_sendcmd_short_mfucauth(NULL, 1, 0xAF, rnd_ab, resp, respPar, NULL);
 	if (len != 11) {
 		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", resp[0]);
-		OnError(1);
-		return 1;
+		return 0;
 	}
 
 	uint8_t enc_resp[8] = { 0,0,0,0,0,0,0,0 };
@@ -398,7 +395,7 @@ int mifare_ultra_auth(uint8_t *keybytes){
 	tdes_2key_dec(resp_random_a, enc_resp, 8, key, enc_random_b);
 	if ( memcmp(resp_random_a, random_a, 8) != 0 ) {
 		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("failed authentication");
-		return 1;
+		return 0;
 	}
 
 	if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
@@ -418,7 +415,7 @@ int mifare_ultra_auth(uint8_t *keybytes){
 				resp_random_a[0],resp_random_a[1],resp_random_a[2],resp_random_a[3],
 				resp_random_a[4],resp_random_a[5],resp_random_a[6],resp_random_a[7]);
 	}
-	return 0;
+	return 1;
 }
 
 int mifare_ultra_readblock(uint8_t blockNo, uint8_t *blockData)
@@ -453,9 +450,9 @@ int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t bl
 {
 	// variables
 	uint16_t len, i;	
-	uint32_t pos;
-	uint8_t par[3] = {0};		// enough for 18 Bytes to send
-	byte_t res;
+	uint32_t pos = 0;
+	uint8_t par[3] = {0x00};		// enough for 18 Bytes to send
+	byte_t res = 0;
 	
 	uint8_t d_block[18], d_block_enc[18];
 	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];
@@ -499,22 +496,22 @@ int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t bl
 int mifare_ultra_writeblock(uint8_t blockNo, uint8_t *blockData) 
 {
 	uint16_t len;
-	uint8_t par[3] = {0};  // enough for 18 parity bits
+    uint8_t par[3] = {0};  // enough for 18 parity bits
 	uint8_t d_block[18] = {0x00};
 	uint8_t receivedAnswer[MAX_FRAME_SIZE];
 	uint8_t receivedAnswerPar[MAX_PARITY_SIZE];
 
-	// command MIFARE_CLASSIC_WRITEBLOCK
-	len = mifare_sendcmd_short(NULL, true, 0xA0, blockNo, receivedAnswer, receivedAnswerPar, NULL);
+    // command MIFARE_CLASSIC_WRITEBLOCK
+    len = mifare_sendcmd_short(NULL, true, 0xA0, blockNo, receivedAnswer, receivedAnswerPar, NULL);
 
-	if ((len != 1) || (receivedAnswer[0] != 0x0A)) {   //  0x0a - ACK
+    if ((len != 1) || (receivedAnswer[0] != 0x0A)) {   //  0x0a - ACK
 		if (MF_DBGLEVEL >= MF_DBG_ERROR)
 			Dbprintf("Cmd Addr Error: %02x", receivedAnswer[0]);
-		return 1;
-	}
+        return 1;
+    }
 
 	memcpy(d_block, blockData, 16);
-	AppendCrc14443a(d_block, 16);
+    AppendCrc14443a(d_block, 16);
 
 	ReaderTransmitPar(d_block, sizeof(d_block), par, NULL);
 
@@ -523,31 +520,31 @@ int mifare_ultra_writeblock(uint8_t blockNo, uint8_t *blockData)
 	if ((len != 1) || (receivedAnswer[0] != 0x0A)) {   //  0x0a - ACK
 		if (MF_DBGLEVEL >= MF_DBG_ERROR)
 			Dbprintf("Cmd Data Error: %02x %d", receivedAnswer[0],len);
-		return 2;
+        return 2;
 	}
-	return 0;
+    return 0;
 }
 
 int mifare_ultra_special_writeblock(uint8_t blockNo, uint8_t *blockData)
 {
-	uint16_t len;
+    uint16_t len;
 	uint8_t d_block[8] = {0x00};
 	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];
 	uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];
 
-	// command MIFARE_CLASSIC_WRITEBLOCK
+    // command MIFARE_CLASSIC_WRITEBLOCK
 	d_block[0]= blockNo;
 	memcpy(d_block+1,blockData,4);
 	AppendCrc14443a(d_block, 6);
 
-	len = mifare_sendcmd_short_special(NULL, 1, 0xA2, d_block, receivedAnswer, receivedAnswerPar, NULL);
+    len = mifare_sendcmd_short_special(NULL, 1, 0xA2, d_block, receivedAnswer, receivedAnswerPar, NULL);
 
-	if (receivedAnswer[0] != 0x0A) {   //  0x0a - ACK
+    if (receivedAnswer[0] != 0x0A) {   //  0x0a - ACK
 		if (MF_DBGLEVEL >= MF_DBG_ERROR)
 			Dbprintf("Cmd Send Error: %02x %d", receivedAnswer[0],len);
-		return 1;
-	}
-	return 0;
+        return 1;
+    }
+    return 0;
 }
 
 int mifare_classic_halt(struct Crypto1State *pcs, uint32_t uid) 
@@ -731,8 +728,8 @@ int mifare_desfire_des_auth1(uint32_t uid, uint8_t *blockData){
 	int len;
 	// load key, keynumber
 	uint8_t data[2]={0x0a, 0x00};
-	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];
-	uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];
+	uint8_t receivedAnswer[MAX_FRAME_SIZE];
+	uint8_t receivedAnswerPar[MAX_PARITY_SIZE];
 	
 	len = mifare_sendcmd_special(NULL, 1, 0x02, data, receivedAnswer,receivedAnswerPar,NULL);
 	if (len == 1) {
@@ -761,8 +758,8 @@ int mifare_desfire_des_auth2(uint32_t uid, uint8_t *key, uint8_t *blockData){
 	data[0] = 0xAF;
 	memcpy(data+1,key,16);
 	
-	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];
-	uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];
+	uint8_t receivedAnswer[MAX_FRAME_SIZE];
+	uint8_t receivedAnswerPar[MAX_PARITY_SIZE];
 	
 	len = mifare_sendcmd_special2(NULL, 1, 0x03, data, receivedAnswer, receivedAnswerPar ,NULL);