remove delays

Merge branch 'master' of github.com:solokeys/solo
add user presence to flags
2019-08-23 22:25:22 +08:00 · 2019-08-23 14:53:22 +08:00 · 2019-08-23 14:48:21 +08:00 · 2019-08-23 14:41:26 +08:00 · 2019-08-23 14:41:26 +08:00
2 changed files with 1 additions and 3 deletions
--- a/fido2/ctap.c
+++ b/fido2/ctap.c
@ -486,7 +486,7 @@ static int ctap_make_auth_data(struct rpId * rp, CborEncoder * map, uint8_t * au
    
    device_set_status(CTAPHID_STATUS_PROCESSING);

-    authData->head.flags = (but << 0);
+    authData->head.flags = (1 << 0);        // User presence
    authData->head.flags |= (ctap_is_pin_set() << 2);


--- a/targets/stm32l432/src/nfc.c
+++ b/targets/stm32l432/src/nfc.c
@ -802,7 +802,6 @@ 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,7 +809,6 @@ 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!
Author	SHA1	Message	Date
merlokk	5d3914bc5e	remove delays	2019-08-23 22:25:22 +08:00
Conor Patrick	abe306a649	Merge branch 'master' of github.com:solokeys/solo	2019-08-23 14:53:22 +08:00
Conor Patrick	41ceb78f6c	add user presence to flags	2019-08-23 14:48:21 +08:00
Conor Patrick	8e192f2363	do not delay bootloader	2019-08-23 14:41:26 +08:00
Conor Patrick	affc256ca2	add delay to cap button improve reliability	2019-08-23 14:41:26 +08:00