Fix integer overflows

Author: kyakdan

modules/GPS_module/src/GPS_module_1.c

@@ -6,6 +6,8 @@
 #include "crypto_module_types.h"
 #include "crypto_module_1.h"
 
+#include "key_management_module_1.h"
+
 GPS_position current_destination;
 
 
@@ -38,12 +40,12 @@ enum GPS_return_status get_current_position(GPS_position * position) {
     if (GPS_driver_obtain_current_position(position_as_bytes, hmac_as_bytes) == 0) {
         if (crypto_verify_hmac(position_as_bytes, 16, hmac_as_bytes) == valid_hmac) {
             GPS_position pos = {
-                position_as_bytes[0] << 1 + position_as_bytes[1],
-                position_as_bytes[2] << 1 + position_as_bytes[3],
-                position_as_bytes[4] << 1 + position_as_bytes[5],
-                position_as_bytes[6] << 1 + position_as_bytes[7],
-                position_as_bytes[8] << 1 + position_as_bytes[9],
-                position_as_bytes[10] << 1 + position_as_bytes[11]
+                (uint8_t)(position_as_bytes[0] << 1) + position_as_bytes[1],
+                (uint8_t)(position_as_bytes[2] << 1) + position_as_bytes[3],
+                (uint8_t)(position_as_bytes[4] << 1) + position_as_bytes[5],
+                (uint8_t)(position_as_bytes[6] << 1) + position_as_bytes[7],
+                (uint8_t)(position_as_bytes[8] << 1) + position_as_bytes[9],
+                (uint8_t)(position_as_bytes[10] << 1) + position_as_bytes[11]
             };
             *position = pos;
             return GPS_success;

modules/crypto_module/src/crypto_module_1.c

@@ -1,4 +1,5 @@
 #include <string.h>
+#include <stdlib.h>
 
 #include "crypto_module_1.h"
 #include "crypto_module_2.h"
@@ -37,6 +38,9 @@ enum crypto_return_status crypto_set_key(crypto_key key) {
 
 enum crypto_return_status crypto_set_nonce(crypto_nonce nonce) {
     if(crypto_verify_nonce(&nonce) == valid_nonce_provided) {
+        if (current_nonce == 0) {
+            crypto_init();
+        }
         for (int i = 0; i < NONCE_LENGTH; i++) {
             current_nonce->nonce[i] = nonce.nonce[i];
         }

modules/crypto_module/src/crypto_module_1.h

@@ -5,7 +5,8 @@
 
 #include "crypto_module_types.h"
 
-extern uint8_t third_party_library_calc_hmac(uint8_t * const message, int len, char * const key, char * const nonce, uint8_t * hmac);
+// extern uint8_t third_party_library_calc_hmac(uint8_t * const message, int len, char * const key, char * const nonce, uint8_t * hmac);
+extern uint8_t third_party_library_calc_hmac(const uint8_t * message, int len, const char * key, const char * nonce, uint8_t * hmac);
 
 void crypto_init();
 

modules/crypto_module/src/crypto_module_2.c

@@ -3,11 +3,14 @@
 
 #include "time_module_1.h"
 
+#include <limits.h>
+
 
 enum crypto_return_status crypto_verify_nonce(crypto_nonce * nonce) {
     for (int i = 0; i < NONCE_LENGTH; i++ ) {
         if (nonce->nonce[i] != 0) {
-            if (nonce->time_of_creation > time_current_time() - 300) {
+            int ct = current_time();
+            if (ct > INT_MIN + 300 && nonce->time_of_creation > ct - 300) {
                 return valid_nonce_provided;
             }
         }

modules/time_module/src/time_module_1.c

@@ -1,5 +1,5 @@
 #include "time_module_1.h"
 
-int time_current_time() {
+int current_time() {
     return driver_get_current_time();
 }