Merge pull request #2 from shapeshift/fix-u2f-issue

keepkey · Apr 14, 2022 · 70064d7 · 70064d7
2 parents 65eddf2 + 06b089b
commit 70064d7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/include/keepkey/board/messages.h b/include/keepkey/board/messages.h
@@ -97,6 +97,8 @@ typedef enum {
   RAW_MESSAGE_ERROR
 } RawMessageState;
 
+extern bool msg_tiny_flag;
+
 typedef void (*raw_msg_handler_t)(RawMessage *msg, uint32_t frame_length);
 
 const pb_field_t *message_fields(MessageMapType type, MessageType msg_id,

diff --git a/lib/board/messages.c b/lib/board/messages.c
@@ -303,7 +303,7 @@ void usb_rx_helper(const uint8_t *buf, size_t length, MessageMapType type) {
 }
 
 /* Tiny messages */
-static bool msg_tiny_flag = false;
+bool msg_tiny_flag = false;
 static CONFIDENTIAL uint8_t msg_tiny[MSG_TINY_BFR_SZ];
 static uint16_t msg_tiny_id = MSG_TINY_TYPE_ERROR; /* Default to error type */
 

diff --git a/lib/board/udp.c b/lib/board/udp.c
@@ -20,6 +20,7 @@
 #ifdef EMULATOR
 
 #include "keepkey/board/usb.h"
+#include "keepkey/board/messages.h"
 #include "keepkey/board/timer.h"
 #include "keepkey/emulator/emulator.h"
 
@@ -32,8 +33,6 @@ extern usb_rx_callback_t user_rx_callback;
 extern usb_rx_callback_t user_debug_rx_callback;
 #endif
 
-static volatile char tiny = 0;
-
 void usbInit(const char *origin_url) {
   (void)origin_url;
   emulatorSocketInit();
@@ -47,7 +46,7 @@ void usbPoll(void) {
 
   int iface = 0;
   if (0 < (len = emulatorSocketRead(&iface, buf, sizeof(buf)))) {
-    if (!tiny) {
+    if (!msg_tiny_flag) {
       if (iface == 0) {
         user_rx_callback(&buf, len);
       } else if (iface == 1) {
@@ -75,8 +74,8 @@ bool usb_debug_tx(uint8_t *msg, uint32_t len) {
 #endif
 
 char usbTiny(char set) {
-  char old = tiny;
-  tiny = set;
+  char old = msg_tiny_flag;
+  msg_tiny_flag = set;
   return old;
 }
 

diff --git a/lib/board/usb.c b/lib/board/usb.c
@@ -313,8 +313,6 @@ static enum usbd_request_return_codes hid_control_request(
   return 1;
 }
 
-static volatile char tiny = 0;
-
 static void main_rx_callback(usbd_device *dev, uint8_t ep) {
   (void)ep;
   static CONFIDENTIAL uint8_t buf[64] __attribute__((aligned(4)));
@@ -335,7 +333,7 @@ static void u2f_rx_callback(usbd_device *dev, uint8_t ep) {
   if (usbd_ep_read_packet(dev, ENDPOINT_ADDRESS_U2F_OUT, buf, 64) != 64) return;
 
   if (user_u2f_rx_callback) {
-    user_u2f_rx_callback(tiny, (const U2FHID_FRAME *)(void *)buf);
+    user_u2f_rx_callback(msg_tiny_flag, (const U2FHID_FRAME *)(void *)buf);
   }
 }
 
@@ -423,8 +421,8 @@ void usbReconnect(void) {
 }
 
 char usbTiny(char set) {
-  char old = tiny;
-  tiny = set;
+  char old = msg_tiny_flag;
+  msg_tiny_flag = set;
   return old;
 }