Merge branch 'master' into remove-pin-storage

2019-09-02 21:45:21 +08:00
parent a5877f518f 321bbe3691
commit a9bbdee35b
29 changed files with 915 additions and 507 deletions
--- a/fido2/ctap.h
+++ b/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           5000
+#define CTAP2_UP_DELAY_MS           29000

 typedef struct
 {