Makefile & CMake rework

client/src/cmdflashmem.c

@@ -18,8 +18,8 @@
 #include "comms.h"              //getfromdevice
 #include "cmdflashmemspiffs.h" // spiffs commands
 
-#include "mbedtls/rsa.h"
-#include "mbedtls/sha1.h"
+#include "rsa.h"
+#include "sha1.h"
 
 #define MCK 48000000
 #define FLASH_MINFAST 24000000 //33000000

client/src/cmdhffelica.c

@@ -22,7 +22,7 @@
 #include "util.h"
 #include "ui.h"
 #include "mifare.h"     // felica_card_select_t struct
-#include "mbedtls/des.h"
+#include "des.h"
 #define AddCrc(data, len) compute_crc(CRC_FELICA, (data), (len), (data)+(len)+1, (data)+(len))
 
 static int CmdHelp(const char *Cmd);

client/src/cmdhficlass.c

@@ -18,7 +18,7 @@
 #include "cmdtrace.h"
 #include "util_posix.h"
 #include "comms.h"
-#include "mbedtls/des.h"
+#include "des.h"
 #include "loclass/cipherutils.h"
 #include "loclass/cipher.h"
 #include "loclass/ikeys.h"

client/src/cmdhfmfdes.c

@@ -17,7 +17,7 @@
 #include "comms.h"
 #include "ui.h"
 #include "cmdhf14a.h"
-#include "mbedtls/aes.h"
+#include "aes.h"
 #include "crypto/libpcrypto.h"
 #include "protocols.h"
 #include "cmdtrace.h"

client/src/cmdhfmfdesfire_disabled.c

@@ -14,8 +14,8 @@
 
 #include "cmdhfmf.h"
 #include "util.h"
-#include "mbedtls/des.h"
-#include "mbedtls/aes.h"
+#include "des.h"
+#include "aes.h"
 
 static int CmdHelp(const char *Cmd);
 

client/src/cmdhfmfhard.c

@@ -35,7 +35,7 @@
 #include "hardnested_bruteforce.h"
 #include "hardnested_bf_core.h"
 #include "hardnested_bitarray_core.h"
-#include "zlib/zlib.h"
+#include "zlib.h"
 #include "fileutils.h"
 
 #define NUM_CHECK_BITFLIPS_THREADS      (num_CPUs())
@@ -220,7 +220,7 @@ static void inflate_free(voidpf opaque, voidpf address) {
 #define INPUT_BUFFER_LEN 80
 
 //----------------------------------------------------------------------------
-// Initialize decompression of the respective (HF or LF) FPGA stream
+// Initialize decompression of the respective bitflip_bitarray stream
 //----------------------------------------------------------------------------
 static void init_inflate(z_streamp compressed_stream, uint8_t *input_buffer, uint32_t insize, uint8_t *output_buffer, uint32_t outsize) {
 

client/src/cmdhfmfu.c

@@ -12,7 +12,7 @@
 #include "cmdparser.h"
 #include "commonutil.h"
 #include "crypto/libpcrypto.h"
-#include "mbedtls/des.h"
+#include "des.h"
 #include "cmdhfmf.h"
 #include "cmdhf14a.h"
 #include "comms.h"

client/src/emv/crypto_polarssl.c

@@ -23,8 +23,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "mbedtls/rsa.h"
-#include "mbedtls/sha1.h"
+#include "rsa.h"
+#include "sha1.h"
 
 struct crypto_hash_polarssl {
     struct crypto_hash ch;

client/src/emv/emv_roca.c

@@ -24,7 +24,7 @@
 #include "emv_roca.h"
 
 #include "ui.h"  // Print...
-#include "mbedtls/bignum.h"
+#include "bignum.h"
 
 static uint8_t g_primes[ROCA_PRINTS_LENGTH] = {
     11, 13, 17, 19, 37, 53, 61, 71, 73, 79, 97, 103, 107, 109, 127, 151, 157

client/src/emv/test/cryptotest.c

@@ -12,19 +12,19 @@
 #include "util.h"
 #include "ui.h"
 
-#include "mbedtls/bignum.h"
-#include "mbedtls/aes.h"
-#include "mbedtls/cmac.h"
-#include "mbedtls/des.h"
-#include "mbedtls/ecp.h"
-#include "mbedtls/rsa.h"
-#include "mbedtls/sha1.h"
-#include "mbedtls/md5.h"
-#include "mbedtls/x509.h"
-#include "mbedtls/base64.h"
-#include "mbedtls/ctr_drbg.h"
-#include "mbedtls/entropy.h"
-#include "mbedtls/timing.h"
+#include "bignum.h"
+#include "aes.h"
+#include "cmac.h"
+#include "des.h"
+#include "ecp.h"
+#include "rsa.h"
+#include "sha1.h"
+#include "md5.h"
+#include "x509.h"
+#include "base64.h"
+#include "ctr_drbg.h"
+#include "entropy.h"
+#include "timing.h"
 
 #include "crypto_test.h"
 #include "sda_test.h"

client/src/fido/fidocore.c

@@ -17,7 +17,7 @@
 #include "emv/emvcore.h"
 #include "emv/emvjson.h"
 #include "cbortools.h"
-#include "mbedtls/x509_crt.h"
+#include "x509_crt.h"
 #include "crypto/asn1utils.h"
 #include "crypto/libpcrypto.h"
 #include "additional_ca.h"

client/src/loclass/elite_crack.c

@@ -45,7 +45,7 @@
 #include "ikeys.h"
 #include "elite_crack.h"
 #include "fileutils.h"
-#include "mbedtls/des.h"
+#include "des.h"
 #include "util_posix.h"
 
 /**

client/src/loclass/ikeys.c

@@ -70,7 +70,7 @@ From "Dismantling iclass":
 
 #include "fileutils.h"
 #include "cipherutils.h"
-#include "mbedtls/des.h"
+#include "des.h"
 
 uint8_t pi[35] = {
     0x0F, 0x17, 0x1B, 0x1D, 0x1E, 0x27, 0x2B, 0x2D,

client/src/mifare/desfire_crypto.c

@@ -29,8 +29,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include "commonutil.h"
-#include "mbedtls/aes.h"
-#include "mbedtls/des.h"
+#include "aes.h"
+#include "des.h"
 #include "ui.h"
 #include "crc.h"
 #include "crc16.h"        // crc16 ccitt

client/src/scripting.c

@@ -21,8 +21,8 @@
 #include "mifare/mifarehost.h"
 #include "crc.h"
 #include "crc64.h"
-#include "mbedtls/sha1.h"
-#include "mbedtls/aes.h"
+#include "sha1.h"
+#include "aes.h"
 #include "cmdcrc.h"
 #include "cmdhfmfhard.h"
 #include "cmdhfmfu.h"