docs: update .all-contributorsrc

fido2/apdu.c

@@ -9,7 +9,7 @@
 
 #include "apdu.h"
 
-uint16_t apdu_decode(uint8_t *data, size_t len, APDU_STRUCT *apdu) 
+int apdu_decode(uint8_t *data, size_t len, APDU_STRUCT *apdu) 
 {
     EXT_APDU_HEADER *hapdu = (EXT_APDU_HEADER *)data;
     
@@ -63,11 +63,6 @@ uint16_t apdu_decode(uint8_t *data, size_t len, APDU_STRUCT *apdu)
     {
         uint16_t extlen = (hapdu->lc[1] << 8) + hapdu->lc[2];
         
-        if (len - 7 < extlen)
-        {
-            return SW_WRONG_LENGTH;
-        }
-        
          // case 2E (Le) - extended
         if (len == 7)
         {
@@ -108,18 +103,9 @@ uint16_t apdu_decode(uint8_t *data, size_t len, APDU_STRUCT *apdu)
             apdu->le = 0x10000;
         }
     }
-    else
-    {
-        if ((len > 5) && (len - 5 < hapdu->lc[0]))
-        {
-            return SW_WRONG_LENGTH;
-        }
-    }
     
     if (!apdu->case_type)
-    {
-        return SW_COND_USE_NOT_SATISFIED;
-    }
+        return 1;
     
     if (apdu->lc)
     {

fido2/apdu.h

@@ -36,7 +36,7 @@ typedef struct
     uint8_t case_type;
 } __attribute__((packed)) APDU_STRUCT;
 
-extern uint16_t apdu_decode(uint8_t *data, size_t len, APDU_STRUCT *apdu);
+extern int apdu_decode(uint8_t *data, size_t len, APDU_STRUCT *apdu);
 
 #define APDU_FIDO_U2F_REGISTER        0x01
 #define APDU_FIDO_U2F_AUTHENTICATE    0x02

fido2/ctap.c

@@ -437,19 +437,7 @@ static unsigned int get_credential_id_size(CTAP_credentialDescriptor * cred)
 static int ctap2_user_presence_test()
 {
     device_set_status(CTAPHID_STATUS_UPNEEDED);
-    int ret = ctap_user_presence_test(CTAP2_UP_DELAY_MS);
-    if ( ret > 0 )
-    {
-        return CTAP1_ERR_SUCCESS;
-    }
-    else if (ret < 0)
-    {
-        return CTAP2_ERR_KEEPALIVE_CANCEL;
-    }
-    else
-    {
-        return CTAP2_ERR_ACTION_TIMEOUT;
-    }
+    return ctap_user_presence_test(CTAP2_UP_DELAY_MS);
 }
 
 static int ctap_make_auth_data(struct rpId * rp, CborEncoder * map, uint8_t * auth_data_buf, uint32_t * len, CTAP_credInfo * credInfo)
@@ -482,11 +470,19 @@ static int ctap_make_auth_data(struct rpId * rp, CborEncoder * map, uint8_t * au
     int but;
 
     but = ctap2_user_presence_test(CTAP2_UP_DELAY_MS);
-    check_retr(but);
+
+    if (!but)
+    {
+        return CTAP2_ERR_OPERATION_DENIED;
+    }
+    else if (but < 0)   // Cancel
+    {
+        return CTAP2_ERR_KEEPALIVE_CANCEL;
+    }
     
     device_set_status(CTAPHID_STATUS_PROCESSING);
 
-    authData->head.flags = (1 << 0);        // User presence
+    authData->head.flags = (but << 0);
     authData->head.flags |= (ctap_is_pin_set() << 2);
 
 
@@ -711,7 +707,10 @@ uint8_t ctap_make_credential(CborEncoder * encoder, uint8_t * request, int lengt
     }
     if (MC.pinAuthEmpty)
     {
-        check_retr( ctap2_user_presence_test(CTAP2_UP_DELAY_MS) );
+        if (!ctap2_user_presence_test(CTAP2_UP_DELAY_MS))
+        {
+                return CTAP2_ERR_OPERATION_DENIED;
+        }
         return ctap_is_pin_set() == 1 ? CTAP2_ERR_PIN_AUTH_INVALID : CTAP2_ERR_PIN_NOT_SET;
     }
     if ((MC.paramsParsed & MC_requiredMask) != MC_requiredMask)
@@ -1144,7 +1143,10 @@ uint8_t ctap_get_assertion(CborEncoder * encoder, uint8_t * request, int length)
 
     if (GA.pinAuthEmpty)
     {
-        check_retr( ctap2_user_presence_test(CTAP2_UP_DELAY_MS) );
+        if (!ctap2_user_presence_test(CTAP2_UP_DELAY_MS))
+        {
+                return CTAP2_ERR_OPERATION_DENIED;
+        }
         return ctap_is_pin_set() == 1 ? CTAP2_ERR_PIN_AUTH_INVALID : CTAP2_ERR_PIN_NOT_SET;
     }
     if (GA.pinAuthPresent)
@@ -1654,11 +1656,14 @@ uint8_t ctap_request(uint8_t * pkt_raw, int length, CTAP_RESPONSE * resp)
             break;
         case CTAP_RESET:
             printf1(TAG_CTAP,"CTAP_RESET\n");
-            status = ctap2_user_presence_test(CTAP2_UP_DELAY_MS);
-            if (status == CTAP1_ERR_SUCCESS)
+            if (ctap2_user_presence_test(CTAP2_UP_DELAY_MS))
             {
                 ctap_reset();
             }
+            else
+            {
+                status = CTAP2_ERR_OPERATION_DENIED;
+            }
             break;
         case GET_NEXT_ASSERTION:
             printf1(TAG_CTAP,"CTAP_NEXT_ASSERTION\n");

fido2/ctap.h

@@ -131,7 +131,7 @@
 #define PIN_LOCKOUT_ATTEMPTS        8       // Number of attempts total
 #define PIN_BOOT_ATTEMPTS           3       // number of attempts per boot
 
-#define CTAP2_UP_DELAY_MS           29000
+#define CTAP2_UP_DELAY_MS           5000
 
 typedef struct
 {

fido2/ctap_errors.h

@@ -49,7 +49,6 @@
 #define CTAP2_ERR_PIN_POLICY_VIOLATION      0x37
 #define CTAP2_ERR_PIN_TOKEN_EXPIRED         0x38
 #define CTAP2_ERR_REQUEST_TOO_LARGE         0x39
-#define CTAP2_ERR_ACTION_TIMEOUT            0x3A
 #define CTAP1_ERR_OTHER                     0x7F
 #define CTAP2_ERR_SPEC_LAST                 0xDF
 #define CTAP2_ERR_EXTENSION_FIRST           0xE0

targets/stm32l432/src/device.c

@@ -55,43 +55,11 @@ static int is_physical_button_pressed()
 
 static int is_touch_button_pressed()
 {
-    int is_pressed = (tsc_read_button(0) || tsc_read_button(1));
-#ifndef IS_BOOTLOADER
-    if (is_pressed)
-    {
-        // delay for debounce, and longer than polling timer period.
-        delay(95);
-        return (tsc_read_button(0) || tsc_read_button(1));
-    }
-#endif
-    return is_pressed;
+    return tsc_read_button(0) || tsc_read_button(1);
 }
 
 int (*IS_BUTTON_PRESSED)() = is_physical_button_pressed;
 
-static void edge_detect_touch_button()
-{
-    static uint8_t last_touch = 0;
-    uint8_t current_touch = 0;
-    if (is_touch_button_pressed == IS_BUTTON_PRESSED)
-    {
-        current_touch = (tsc_read_button(0) || tsc_read_button(1));
-
-        // 1 sample per 25 ms
-        if ((millis() - __last_button_bounce_time) > 25)
-        {
-            // Detect "touch / rising edge"
-            if (!last_touch && current_touch)
-            {
-                __last_button_press_time = millis();
-            }
-            __last_button_bounce_time = millis();
-            last_touch = current_touch;
-        }
-    }
-
-}
-
 void request_from_nfc(bool request_active) {
     _RequestComeFromNFC = request_active;
 }
@@ -110,7 +78,19 @@ void TIM6_DAC_IRQHandler()
         }
     }
 
-    edge_detect_touch_button();
+
+    if (is_touch_button_pressed == IS_BUTTON_PRESSED)
+    {
+        if (IS_BUTTON_PRESSED())
+        {
+            // Only allow 1 press per 25 ms.
+            if ((millis() - __last_button_bounce_time) > 25)
+            {
+                __last_button_press_time = millis();
+            }
+            __last_button_bounce_time = millis();
+        }
+    }
 
 #ifndef IS_BOOTLOADER
 	// NFC sending WTX if needs
@@ -162,6 +142,7 @@ void device_set_status(uint32_t status)
 
 int device_is_button_pressed()
 {
+
     return IS_BUTTON_PRESSED();
 }
 

targets/stm32l432/src/nfc.c

@@ -703,6 +703,9 @@ void apdu_process(uint8_t buf0, uint8_t *apduptr, APDU_STRUCT *apdu)
 			// WTX_on(WTX_TIME_DEFAULT);
             request_from_nfc(true);
             ctap_response_init(&ctap_resp);
+            delay(1);
+            printf1(TAG_NFC,"[%d] ", apdu->lc);
+            dump_hex1(TAG_NFC, apdu->data, apdu->lc);
             status = ctap_request(apdu->data, apdu->lc, &ctap_resp);
             request_from_nfc(false);
 			// if (!WTX_off())
@@ -756,8 +759,7 @@ void apdu_process(uint8_t buf0, uint8_t *apduptr, APDU_STRUCT *apdu)
         case  APDU_SOLO_RESET:
             if (apdu->lc == 4 && !memcmp(apdu->data, "\x12\x56\xab\xf0", 4)) {
                 printf1(TAG_NFC, "Reset...\r\n");
-                nfc_write_response(buf0, SW_SUCCESS);
-                delay(20);
+                delay(10);
                 device_reboot();
                 while(1);
             } else {
@@ -784,10 +786,9 @@ void nfc_process_iblock(uint8_t * buf, int len)
     }
     
     APDU_STRUCT apdu;
-    uint16_t ret = apdu_decode(buf + block_offset, len - block_offset, &apdu);
-    if (ret != 0) {
+    if (apdu_decode(buf + block_offset, len - block_offset, &apdu)) {
         printf1(TAG_NFC,"apdu decode error\r\n");
-        nfc_write_response(buf[0], ret);
+        nfc_write_response(buf[0], SW_COND_USE_NOT_SATISFIED);
         return;
     }
     printf1(TAG_NFC,"apdu ok. %scase=%02x cla=%02x ins=%02x p1=%02x p2=%02x lc=%d le=%d\r\n", 
@@ -803,6 +804,7 @@ void nfc_process_iblock(uint8_t * buf, int len)
         
         memmove(&chain_buffer[chain_buffer_len], apdu.data, apdu.lc);
         chain_buffer_len += apdu.lc;
+        delay(1);
         nfc_write_response(buf[0], SW_SUCCESS);
         printf1(TAG_NFC, "APDU chaining ok. %d/%d\r\n", apdu.lc, chain_buffer_len);
         return;
@@ -810,6 +812,7 @@ void nfc_process_iblock(uint8_t * buf, int len)
     
     // if we have ISO 7816 APDU chain - move there all the data
     if (!chain_buffer_tx && chain_buffer_len > 0) {
+        delay(1);
         memmove(&apdu.data[chain_buffer_len], apdu.data, apdu.lc);
         memmove(apdu.data, chain_buffer, chain_buffer_len);
         apdu.lc += chain_buffer_len; // here apdu struct does not match with memory!