summer restructuring:

* .h include only the strict minimum for their own parsing
  * this forces all files to include explicitment their needs and not count on far streched dependencies
  * this helps Makefile to rebuild only the minimum
  * according to this rule, most standalone .h are now gone
  * big app.h is gone
  * remove seldom __cplusplus, if c++ happens, everything will have to be done properly anyway
* all unrequired include were removed
* split common/ into common/ (client+arm) and common_arm/ (os+bootloader)
  * bring zlib to common/
  * bring stuff not really/not yet used in common back to armsrc/ or client/
  * bring liblua into client/
  * bring uart into client/
  * move some portions of code around (dbprint, protocols,...)
* rename unused files into *_disabled.[ch] to make it explicit
* rename soft Uarts between 14a, 14b and iclass, so a standalone could use several without clash
* remove PrintAndLogDevice
* move deprecated-hid-flasher from client to tools
* Makefiles
  * treat deps in armsrc/ as in client/
  * client: stop on warning (-Werror), same as for armsrc/

Tested on:

* all standalone modes
* Linux
This commit is contained in:
Philippe Teuwen
2019-08-08 16:57:33 +02:00
parent b7d412d27b
commit d19754567d
447 changed files with 2553 additions and 2599 deletions

View File

@@ -10,7 +10,6 @@
//
#include "additional_ca.h"
#include "mbedtls/certs.h"
#define GLOBALSIGN_CA \
"-----BEGIN CERTIFICATE-----\r\n" \

View File

@@ -12,7 +12,7 @@
#ifndef __ADDITIONAL_CA_H__
#define __ADDITIONAL_CA_H__
#include <stddef.h>
#include "common.h"
// Concatenation of all CA certificates in PEM format if available
extern const char additional_ca_pem[];

View File

@@ -11,7 +11,9 @@
//
#include "cbortools.h"
#include <stdlib.h>
#include <inttypes.h>
#include "emv/emvjson.h"
#include "util.h"
#include "fidocore.h"

View File

@@ -13,8 +13,7 @@
#ifndef __CBORTOOLS_H__
#define __CBORTOOLS_H__
#include <stddef.h>
#include <stdint.h>
#include "common.h"
#include <jansson.h>
#include <cbor.h>

View File

@@ -11,8 +11,11 @@
//
#include "cose.h"
#include <cbor.h>
#include "cbortools.h"
#include "commonutil.h" // ARRAYLEN
#include "ui.h" // Print...
#include "util.h"
static const char COSEEmptyStr[] = "";

View File

@@ -13,10 +13,7 @@
#ifndef __COSE_H__
#define __COSE_H__
#include <stddef.h>
#include <stdint.h>
#include <cbor.h>
#include "util.h"
#include "common.h"
const char *GetCOSEAlgName(int id);
const char *GetCOSEAlgDescription(int id);

View File

@@ -11,17 +11,20 @@
//
#include "fidocore.h"
#include "commonutil.h" // ARRAYLEN
#include "emv/emvcore.h"
#include "emv/emvjson.h"
#include <cbor.h>
#include "cbortools.h"
#include <mbedtls/x509_crt.h>
#include <mbedtls/x509.h>
#include <mbedtls/pk.h>
#include "mbedtls/x509_crt.h"
#include "crypto/asn1utils.h"
#include "crypto/libpcrypto.h"
#include "fido/additional_ca.h"
#include "fido/cose.h"
#include "additional_ca.h"
#include "cose.h"
#include "emv/dump.h"
#include "ui.h"
#include "util.h"
typedef struct {
uint8_t ErrorCode;

View File

@@ -12,10 +12,10 @@
#ifndef __FIDOCORE_H__
#define __FIDOCORE_H__
#include <stddef.h>
#include <stdint.h>
#include "common.h"
#include <jansson.h>
#include "cmdhf14a.h"
#include "emv/apduinfo.h" // sAPDU
typedef enum {
fido2CmdMakeCredential = 0x01,