From 5faab169a8cfa27864323089283f3b9de97db37b Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Sun, 1 Dec 2024 01:07:33 +0100 Subject: [PATCH] Add option to disable power cycle on reset via Commissioner. Signed-off-by: Pol Henarejos --- pico-keys-sdk | 2 +- src/fido/cbor_reset.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pico-keys-sdk b/pico-keys-sdk index a271785..a61f768 160000 --- a/pico-keys-sdk +++ b/pico-keys-sdk @@ -1 +1 @@ -Subproject commit a271785814583757e493bedaab24635a4f8a6a54 +Subproject commit a61f7683b6602c4bee367be44ad38b090b7f7ecd diff --git a/src/fido/cbor_reset.c b/src/fido/cbor_reset.c index b3a07d5..afc8298 100644 --- a/src/fido/cbor_reset.c +++ b/src/fido/cbor_reset.c @@ -24,13 +24,14 @@ #ifdef ESP_PLATFORM #include "esp_compat.h" #endif +#include "fs/phy.h" extern void scan_all(); int cbor_reset() { #ifndef ENABLE_EMULATION #if defined(ENABLE_POWER_ON_RESET) && ENABLE_POWER_ON_RESET == 1 - if (board_millis() > 10000) { + if (!(phy_data.opts & PHY_OPT_DISABLE_POWER_RESET) && board_millis() > 10000) { return CTAP2_ERR_NOT_ALLOWED; } #endif