ADD: some defines to make headerfiles behave better.

CHG: syntax sugar

armsrc/aes.h

@@ -3,6 +3,8 @@
 * your source which uses these given APIs. (This source is kept under
 * public domain)
 */
+#ifndef __AES_H
+#define __AES_H
 
 // AES context structure
 typedef struct {
@@ -28,3 +30,5 @@ typedef struct {
 int AesCtxIni(AesCtx *pCtx, unsigned char *pIV, unsigned char *pKey, unsigned int KeyLen, unsigned char Mode);
 int AesEncrypt(AesCtx *pCtx, unsigned char *pData, unsigned char *pCipher, unsigned int DataLen);
 int AesDecrypt(AesCtx *pCtx, unsigned char *pCipher, unsigned char *pData, unsigned int CipherLen);
+
+#endif

armsrc/optimized_cipher.c

@@ -98,7 +98,6 @@ uint8_t xopt__select(bool x, bool y, uint8_t r)
 
 void opt_successor(const uint8_t* k, State *s, bool y, State* successor)
 {
-
 	uint8_t Tt = 1 & opt_T(s);
 
 	successor->t = (s->t >> 1);
@@ -212,26 +211,26 @@ void opt_doReaderMAC(uint8_t *cc_nr_p, uint8_t *div_key_p, uint8_t mac[4])
 {
 	static uint8_t cc_nr[12];
 
-	opt_reverse_arraybytecpy(cc_nr, cc_nr_p,12);
+	opt_reverse_arraybytecpy(cc_nr, cc_nr_p, 12);
 	uint8_t dest []= {0,0,0,0,0,0,0,0};
-	opt_MAC(div_key_p,cc_nr, dest);
+	opt_MAC(div_key_p, cc_nr, dest);
 	//The output MAC must also be reversed
-	opt_reverse_arraybytecpy(mac, dest,4);
+	opt_reverse_arraybytecpy(mac, dest, 4);
 	return;
 }
 void opt_doTagMAC(uint8_t *cc_p, const uint8_t *div_key_p, uint8_t mac[4])
 {
 	static uint8_t cc_nr[8+4+4];
-	opt_reverse_arraybytecpy(cc_nr, cc_p,12);
+	opt_reverse_arraybytecpy(cc_nr, cc_p, 12);
 	State _init  =  {
 			((div_key_p[0] ^ 0x4c) + 0xEC) & 0xFF,// l
 			((div_key_p[0] ^ 0x4c) + 0x21) & 0xFF,// r
 			0x4c, // b
 			0xE012 // t
 			};
-	opt_suc(div_key_p,&_init,cc_nr, 12,true);
+	opt_suc(div_key_p, &_init, cc_nr, 12, true);
 	uint8_t dest []= {0,0,0,0};
-	opt_output(div_key_p,&_init, dest);
+	opt_output(div_key_p, &_init, dest);
 	//The output MAC must also be reversed
 	opt_reverse_arraybytecpy(mac, dest,4);
 	return;
@@ -248,14 +247,14 @@ void opt_doTagMAC(uint8_t *cc_p, const uint8_t *div_key_p, uint8_t mac[4])
 State opt_doTagMAC_1(uint8_t *cc_p, const uint8_t *div_key_p)
 {
 	static uint8_t cc_nr[8];
-	opt_reverse_arraybytecpy(cc_nr, cc_p,8);
+	opt_reverse_arraybytecpy(cc_nr, cc_p, 8);
 	State _init  =  {
 			((div_key_p[0] ^ 0x4c) + 0xEC) & 0xFF,// l
 			((div_key_p[0] ^ 0x4c) + 0x21) & 0xFF,// r
 			0x4c, // b
 			0xE012 // t
 			};
-	opt_suc(div_key_p,&_init,cc_nr, 8,false);
+	opt_suc(div_key_p, &_init, cc_nr, 8, false);
 	return _init;
 }
 /**
@@ -271,10 +270,10 @@ void opt_doTagMAC_2(State _init,  uint8_t* nr, uint8_t mac[4], const uint8_t* di
 {
 	static uint8_t _nr [4];
 	opt_reverse_arraybytecpy(_nr, nr, 4);
-	opt_suc(div_key_p,&_init,_nr, 4, true);
+	opt_suc(div_key_p, &_init,_nr, 4, true);
-	//opt_suc(div_key_p,&_init,nr, 4, false);
+	//opt_suc(div_key_p, &_init,nr, 4, false);
 	uint8_t dest []= {0,0,0,0};
-	opt_output(div_key_p,&_init, dest);
+	opt_output(div_key_p, &_init, dest);
 	//The output MAC must also be reversed
 	opt_reverse_arraybytecpy(mac, dest,4);
 	return;

client/cmdhfmfdes.h

@@ -1,5 +1,5 @@
 //-----------------------------------------------------------------------------
-// Copyright (C) 2014 Iceman
+// Iceman, 2014
 //
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,
 // at your option, any later version. See the LICENSE.txt file for the text of
@@ -7,6 +7,8 @@
 //-----------------------------------------------------------------------------
 // High frequency MIFARE Desfire commands
 //-----------------------------------------------------------------------------
+#ifndef __MFDESFIRE_H
+#define __MFDESFIRE_H
 
 int CmdHFMFDes(const char *Cmd);
 int CmdHF14ADesAuth(const char* cmd);
@@ -108,8 +110,7 @@ enum  {
 #define COMMAND_ABORTED			0xCA		// Previous Command was not fully
 											//  completed Not all Frames were
 											//  requested or provided by PCD
-#define PICC_DISABLED_ERROR		0xCD // [1] // PICC was disabled by an unre-
+#define PICC_DISABLED_ERROR		0xCD // [1] // PICC was disabled by an unrecoverable error
-											//  coverable error
 #define COUNT_ERROR				0xCE		// Number of Applications limited
 											//  to 28, no additional
 											//  CreateApplication possible
@@ -125,4 +126,6 @@ enum  {
 #define FILE_INTEGRITY_ERROR	0xF1 // [1]	// Unrecoverable error within file,
 											//  file will be disabled
 //
-// [1] These errors are not expected to appear during normal operation.        |
+// [1] These errors are not expected to appear during normal operation
+
+#endif

client/lualibs/read14a.lua

@@ -86,7 +86,7 @@ local function sendToDevice(command, ignoreresponse)
 	end
 	if ignoreresponse then return nil,nil end
 
-	local response = core.WaitForResponseTimeout(cmds.CMD_ACK,TIMEOUT)
+	local response = core.WaitForResponseTimeout(cmds.CMD_ACK, TIMEOUT)
 	return response,nil
 end
 

client/mifarehost.h

@@ -7,6 +7,8 @@
 //-----------------------------------------------------------------------------
 // High frequency ISO14443A commands
 //-----------------------------------------------------------------------------
+#ifndef __MIFARE_HOST_H
+#define __MIFARE_HOST_H
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -15,13 +17,11 @@
 #include <pthread.h>
 
 #include "proxmark3.h"	// time_t
-//#include "radixsort.h"
 #include "common.h"
 #include "cmdmain.h"
 #include "ui.h"
 #include "data.h"
 #include "util.h"
-//#include "nonce2key/nonce2key.h"
 #include "nonce2key/crapto1.h"
 #include "iso14443crc.h"
 #include "protocols.h"
@@ -84,3 +84,4 @@ int isBlockTrailer(int blockN);
 int loadTraceCard(uint8_t *tuid, uint8_t uidlen);
 int saveTraceCard(void);
 int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data, int len);
+#endif

client/ui.c

@@ -25,6 +25,9 @@ void PrintAndLog(char *fmt, ...)
 	va_list argptr, argptr2;
 	static FILE *logfile = NULL;
 	static int logging = 1;
+	// time_t current_time;
+	// struct tm* tm_info;
+	// char buffer[26] = {0};
 		
 	// lock this section to avoid interlacing prints from different threats
 	pthread_mutex_lock(&print_lock);
@@ -63,6 +66,16 @@ void PrintAndLog(char *fmt, ...)
 	}
 	
 	if (logging && logfile) {
+
+		/*
+		// Obtain current time.
+		current_time = time(NULL);
+		// Convert to local time format.
+		tm_info = localtime(&current_time);		
+		strftime(buffer, 26, "%Y-%m-%d %H:%M:%S", tm_info);
+		fprintf(logfile, "%s  ", buffer);
+		*/
+		
 		vfprintf(logfile, fmt, argptr2);
 		fprintf(logfile,"\n");
 		fflush(logfile);

client/util.h

@@ -7,6 +7,8 @@
 //-----------------------------------------------------------------------------
 // utilities
 //-----------------------------------------------------------------------------
+#ifndef __UTIL_H_
+#define __UTIL_H_
 
 #include <stdio.h>
 #include <stdint.h>		//included in data.h
@@ -141,3 +143,5 @@ void rol(uint8_t *data, const size_t len);
 uint32_t SwapBits(uint32_t value, int nrbits);
 uint32_t reflect(uint32_t v, int b);
 uint64_t HornerScheme(uint64_t num, uint64_t divider, uint64_t factor);
+
+#endif