Nickez/fix u2f safari

Makefile

@@ -14,8 +14,15 @@
 
 # This makefile is used as a command runner and not for tracking dependencies between recipies
 
+UNAME_S := $(shell uname -s)
+
 .DEFAULT_GOAL := firmware
-SANITIZE ?= ON
+# asan/ubsan is not supported on darwin, default to off
+ifeq ($(UNAME_S),Darwin)
+  SANITIZE ?= OFF
+else
+  SANITIZE ?= ON
+endif
 simulator: SANITIZE = OFF
 
 bootstrap:

src/firmware.c

@@ -23,6 +23,10 @@
 #include "screen.h"
 #include "ui/screen_stack.h"
 
+#if APP_U2F == 1
+#include <u2f.h>
+#endif
+
 uint32_t __stack_chk_guard = 0;
 
 int main(void)
@@ -36,6 +40,9 @@ int main(void)
     qtouch_init();
     common_main();
     bitbox02_smarteeprom_init();
+#if APP_U2F == 1
+    u2f_device_setup();
+#endif
     firmware_main_loop();
     return 0;
 }

src/firmware_main_loop.c

@@ -59,6 +59,12 @@ void firmware_main_loop(void)
         }
         if (!u2f_data) {
             u2f_data = queue_pull(queue_u2f_queue());
+            // If USB stack was locked and there is no more messages to send out, time to
+            // unlock it.
+            if (!u2f_data && usb_processing_locked(usb_processing_u2f())) {
+                util_log("u2f unlock");
+                usb_processing_unlock();
+            }
         }
 #endif
         // Only read new messages if we have nothing to send
@@ -67,6 +73,7 @@ void firmware_main_loop(void)
         }
 #if APP_U2F == 1
         if (!u2f_data && hid_u2f_read(&u2f_frame[0])) {
+            util_log("u2f data %s", util_dbg_hex((void*)u2f_frame, 16));
             u2f_packet_process((const USB_FRAME*)u2f_frame);
         }
 #endif