Refactor signing backend (#690)

Cleaned up the AES driver and removed some cppcheck isues
in the process.

Author: fallberg

core/MySigning.cpp

@@ -490,14 +490,6 @@ typedef struct {
 /** @brief Helper macro to determine the number of elements in a array */
 #define NUM_OF(x) (sizeof(x)/sizeof(x[0]))
 
-/** @brief Helper macro to determine if node require serial salted signatures */
-#define DO_WHITELIST(node) (~_doWhitelist[node>>3]&(1<<node%8))
-/** @brief Helper macro to set that node require serial salted signatures */
-#define SET_WHITELIST(node) (_doWhitelist[node>>3]&=~(1<<node%8))
-/** @brief Helper macro to set that node does not require serial salted signatures */
-#define CLEAR_WHITELIST(node) (_doWhitelist[node>>3]|=(1<<node%8))
-
-
 /**
  * @brief Initializes signing infrastructure and associated backend.
  *

core/MySigning.h

@@ -62,6 +62,9 @@ static char i2h(uint8_t i)
 static void DEBUG_SIGNING_PRINTBUF(const __FlashStringHelper* str, uint8_t* buf, uint8_t sz)
 {
 	static char printBuffer[300];
+	if (NULL == buf) {
+		return;
+	}
 #ifdef MY_GATEWAY_FEATURE
 	// prepend debug message to be handled correctly by controller (C_INTERNAL, I_LOG_MESSAGE)
 	snprintf_P(printBuffer, 299, PSTR("0;255;%d;0;%d;"), C_INTERNAL, I_LOG_MESSAGE);

core/MySigningAtsha204.cpp

@@ -64,25 +64,17 @@ static char i2h(uint8_t i)
 }
 
 #ifdef __linux__
-static void DEBUG_SIGNING_PRINTBUF(const char *str, uint8_t* buf, uint8_t sz)
-{
-	static char printBuffer[300];
+#define __FlashStringHelper char
+#define MY_SERIALDEVICE.print debug
+#endif
 
-	for (int i=0; i<sz; i++) {
-		printBuffer[i * 2] = i2h(buf[i] >> 4);
-		printBuffer[(i * 2) + 1] = i2h(buf[i]);
-	}
-	printBuffer[sz * 2] = '\0';
-	debug(str);
-	if (sz > 0) {
-		debug(printBuffer);
-	}
-}
-#else
 static void DEBUG_SIGNING_PRINTBUF(const __FlashStringHelper* str, uint8_t* buf, uint8_t sz)
 {
 	static char printBuffer[300];
-#ifdef MY_GATEWAY_FEATURE
+	if (NULL == buf) {
+		return;
+	}
+#if defined(MY_GATEWAY_FEATURE) && !defined(__linux__)
 	// prepend debug message to be handled correctly by controller (C_INTERNAL, I_LOG_MESSAGE)
 	snprintf_P(printBuffer, 299, PSTR("0;255;%d;0;%d;"), C_INTERNAL, I_LOG_MESSAGE);
 	MY_SERIALDEVICE.print(printBuffer);
@@ -92,17 +84,18 @@ static void DEBUG_SIGNING_PRINTBUF(const __FlashStringHelper* str, uint8_t* buf,
 		printBuffer[(i * 2) + 1] = i2h(buf[i]);
 	}
 	printBuffer[sz * 2] = '\0';
-#ifdef MY_GATEWAY_FEATURE
+#if defined(MY_GATEWAY_FEATURE) && !defined(__linux__)
 	// Truncate message if this is gateway node
 	printBuffer[MY_GATEWAY_MAX_SEND_LENGTH-1-strlen_P((const char*)str)] = '\0';
 #endif
 	MY_SERIALDEVICE.print(str);
 	if (sz > 0) {
 		MY_SERIALDEVICE.print(printBuffer);
 	}
+#if !defined(__linux__)
 	MY_SERIALDEVICE.println("");
+#endif
 }
-#endif /* __linux__ */
 #else
 #define DEBUG_SIGNING_PRINTBUF(str, buf, sz)
 #endif

core/MySigningAtsha204Soft.cpp

@@ -104,7 +104,7 @@ const static byte s_inv [0x100] PROGMEM = {
 } ;
 
 // times 2 in the GF(2^8)
-#define f2(x)   ((x) & 0x80 ? (x << 1) ^ WPOLY : x << 1)
+#define f2(x)   (((x) & 0x80) ? (x << 1) ^ WPOLY : x << 1)
 #define d2(x)  (((x) >> 1) ^ ((x) & 1 ? DPOLY : 0))
 
 static byte s_box (byte x)
@@ -248,6 +248,11 @@ static void inv_mix_sub_columns (byte dt[N_BLOCK], byte st[N_BLOCK])
 AES::AES()
 {
 	byte ar_iv[8] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01 };
+	IVC = 0x01;
+	round = 0;
+	pad = 0;
+	size = 0;
+	memset(key_sched, 0, KEY_SCHEDULE_BYTES);
 	memcpy(iv,ar_iv,8);
 	memcpy(iv+8,ar_iv,8);
 	arr_pad[0] = 0x01;

drivers/AES/AES.cpp

@@ -312,42 +312,6 @@ class AES
 
 #endif
 
-/**
- * @example aes.pde
- * <b>For Arduino</b><br>
- * <b>Updated: spaniakos 2015 </b><br>
- *
- * This is an example of how to use AES in CBC mode easily.
- * The text and keys can be either in HEX or String format.<br />
- */
-
-/**
-* @example aes.cpp
-* <b>For Rasberry pi</b><br>
-* <b>Updated: spaniakos 2015 </b><br>
-*
-* This is an example of how to use AES in CBC mode easily.
-* The text and keys can be either in HEX or String format.<br />
-*/
-
-/**
-* @example test_vectors.pde
-* <b>For Arduino</b><br>
-* <b>Updated: spaniakos 2015 </b><br>
-*
-* This is an example of monte carlo test vectors, in order to justify the effectiveness of the algorithm.<br />
-* plus is a classical approach to the AES encryption library with out the easy to use add-on modifications.
-*/
-
-/**
-* @example test_vectors.cpp
-* <b>For Rasberry pi</b><br>
-* <b>Updated: spaniakos 2015 </b><br>
-*
-* This is an example of monte carlo test vectors, in order to justify the effectiveness of the algorithm.<br />
-* plus is a classical approach to the AES encryption library with out the easy to use add-on modifications.
-*/
-
 /**
  * @defgroup aeslib AES library for Arduino and Raspberry pi
  * @ingroup internals