refactor to use libsolo

fido2/Makefile

@@ -9,9 +9,9 @@ INC += -I../tinycbor/src
 INC += -I../crypto/sha256 -I../crypto/micro-ecc -I../crypto/tiny-AES-c
 INC += -I../crypto/cifra/src -I../crypto/cifra/src/ext
 
-CFLAGS += -DAPP_CONFIG=\"$(APP_CONFIG)\"
-CFLAGS += $(INC)
-CFLAGS += $(SOLO_VERSION_FLAGS)
+INT_CFLAGS = -DAPP_CONFIG=\"$(APP_CONFIG)\"
+INT_CFLAGS += $(INC)
+INT_CFLAGS += $(SOLO_VERSION_FLAGS)
 
 SRC = apdu.c util.c u2f.c test_power.c
 SRC += stubs.c log.c  ctaphid.c  ctap.c
@@ -34,10 +34,10 @@ libsolo.a: $(OBJ)
 	$(AR) cqs $@ $^
 
 %.o: %.c
-	$(CC) $^ $(CFLAGS) -c -o $@
+	$(CC) $^ $(INT_CFLAGS) $(CFLAGS) -c -o $@
 
 ../crypto/micro-ecc/uECC.o: ../crypto/micro-ecc/uECC.c
-	$(CC) $^ $(ECC_CFLAGS) -c -o $@
+	$(CC) $^ $(INT_CFLAGS) $(ECC_CFLAGS) -c -o $@
 
 clean:
 	rm $(OBJ) libsolo.a

fido2/example_app.h

@@ -13,8 +13,6 @@
 
 #define USING_PC
 
-#define DEBUG_LEVEL 1
-
 #define ENABLE_U2F
 #define ENABLE_U2F_EXTENSIONS
 //#define BRIDGE_TO_WALLET

fido2/log.h

@@ -7,7 +7,10 @@
 #ifndef _LOG_H
 #define _LOG_H
 
+#ifdef APP_CONFIG
 #include APP_CONFIG
+#endif 
+
 #include <stdint.h>
 
 #ifndef DEBUG_LEVEL
@@ -50,7 +53,7 @@ typedef enum
     TAG_FILENO   = (1UL << 31)
 } LOG_TAG;
 
-#if DEBUG_LEVEL > 0
+#if defined(DEBUG_LEVEL) && DEBUG_LEVEL > 0
 
 void set_logging_mask(uint32_t mask);
 #define printf1(tag,fmt, ...) LOG(tag & ~(TAG_FILENO), NULL, 0, fmt, ##__VA_ARGS__)