Merge branch 'main' into development

Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>

CMakeLists.txt

@@ -21,27 +21,13 @@ set(USB_VID 0x2E8A)
 set(USB_PID 0x10FE)
 
 if(ESP_PLATFORM)
-    if(NOT DEFINED ENABLE_POWER_ON_RESET)
-        set(ENABLE_POWER_ON_RESET 0)
-    endif()
-    if(NOT DEFINED ENABLE_PQC)
-        set(ENABLE_PQC 0)
-    endif()
-    set(EXTRA_COMPONENT_DIRS
-        src/fido
-        pico-keys-sdk/config/esp32/components/pico-keys-sdk
-        pico-keys-sdk/config/esp32/components/tinycbor
-    )
-    if(ENABLE_PQC)
-        list(APPEND EXTRA_COMPONENT_DIRS
-            pico-keys-sdk/config/esp32/components/mlkem512
-            pico-keys-sdk/config/esp32/components/mlkem768
-            pico-keys-sdk/config/esp32/components/mlkem1024
-        )
-    endif()
+set(DENABLE_POWER_ON_RESET 0)
+set(EXTRA_COMPONENT_DIRS pico-keys-sdk/config/esp32/components src/fido)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 else()
-    if(NOT ENABLE_EMULATION)
+
+if(ENABLE_EMULATION)
+else()
 set(PICO_USE_FASTEST_SUPPORTED_CLOCK 1)
 include(pico_sdk_import.cmake)
 endif()
@@ -54,31 +40,32 @@ else()
 add_executable(pico_fido)
 endif()
 
-include(pico-keys-sdk/cmake/options.cmake)
-
 option(ENABLE_POWER_ON_RESET "Enable/disable power cycle on reset" ON)
-configure_bool_option(
-    ENABLE_POWER_ON_RESET
-    ENABLE_POWER_ON_RESET
-    "Power cycle on reset: \t enabled"
-    "Power cycle on reset: \t disabled"
-)
+if(ENABLE_POWER_ON_RESET)
+    add_definitions(-DENABLE_POWER_ON_RESET=1)
+    message(STATUS "Power cycle on reset: \t enabled")
+else()
+    add_definitions(-DENABLE_POWER_ON_RESET=0)
+    message(STATUS "Power cycle on reset: \t disabled")
+endif(ENABLE_POWER_ON_RESET)
 
 option(ENABLE_OATH_APP "Enable/disable OATH application" ON)
-configure_bool_option(
-    ENABLE_OATH_APP
-    ENABLE_OATH_APP
-    "OATH Application: \t\t enabled"
-    "OATH Application: \t\t disabled"
-)
+if(ENABLE_OATH_APP)
+    add_definitions(-DENABLE_OATH_APP=1)
+    message(STATUS "OATH Application: \t\t enabled")
+else()
+    add_definitions(-DENABLE_OATH_APP=0)
+    message(STATUS "OATH Application: \t\t disabled")
+endif(ENABLE_OATH_APP)
 
 option(ENABLE_OTP_APP "Enable/disable OTP application" ON)
-configure_bool_option(
-    ENABLE_OTP_APP
-    ENABLE_OTP_APP
-    "OTP Application: \t\t enabled"
-    "OTP Application: \t\t disabled"
-)
+if(ENABLE_OTP_APP)
+    add_definitions(-DENABLE_OTP_APP=1)
+    message(STATUS "OTP Application: \t\t enabled")
+else()
+    add_definitions(-DENABLE_OTP_APP=0)
+    message(STATUS "OTP Application: \t\t disabled")
+endif(ENABLE_OTP_APP)
 
 if(ENABLE_OTP_APP OR ENABLE_OATH_APP)
     set(USB_ITF_CCID 1)
@@ -94,9 +81,10 @@ if(NOT ESP_PLATFORM)
     set(SOURCES ${PICO_KEYS_SOURCES})
 endif()
 
-list(APPEND SOURCES
+set(SOURCES ${SOURCES}
         ${CMAKE_CURRENT_LIST_DIR}/src/fido/fido.c
         ${CMAKE_CURRENT_LIST_DIR}/src/fido/files.c
+        ${CMAKE_CURRENT_LIST_DIR}/src/fido/kek.c
         ${CMAKE_CURRENT_LIST_DIR}/src/fido/cmd_register.c
         ${CMAKE_CURRENT_LIST_DIR}/src/fido/cmd_authenticate.c
         ${CMAKE_CURRENT_LIST_DIR}/src/fido/cmd_version.c
@@ -116,99 +104,69 @@ list(APPEND SOURCES
         ${CMAKE_CURRENT_LIST_DIR}/src/fido/management.c
         ${CMAKE_CURRENT_LIST_DIR}/src/fido/defs.c
         )
-
-if(ENABLE_OATH_APP)
-    list(APPEND SOURCES
+if (${ENABLE_OATH_APP})
+set(SOURCES ${SOURCES}
         ${CMAKE_CURRENT_LIST_DIR}/src/fido/oath.c
         )
 endif()
-
-if(ENABLE_OTP_APP)
-    list(APPEND SOURCES
+if (${ENABLE_OTP_APP})
+set(SOURCES ${SOURCES}
         ${CMAKE_CURRENT_LIST_DIR}/src/fido/otp.c
         )
 endif()
 
-SET_VERSION(ver_major ver_minor "${CMAKE_CURRENT_LIST_DIR}/src/fido/version.h")
+SET_VERSION(ver_major ver_minor "${CMAKE_CURRENT_LIST_DIR}/src/fido/version.h" 3)
 if(ESP_PLATFORM)
     project(pico_fido)
 endif()
-
 set(INCLUDES ${INCLUDES}
         ${CMAKE_CURRENT_LIST_DIR}/src/fido
         )
-
 if(NOT ESP_PLATFORM)
 target_sources(pico_fido PUBLIC ${SOURCES})
 target_include_directories(pico_fido PUBLIC ${INCLUDES})
 
-    set(COMMON_COMPILE_OPTIONS
+target_compile_options(pico_fido PUBLIC
     -Wall
     )
-    target_compile_options(pico_fido PRIVATE ${COMMON_COMPILE_OPTIONS})
-
-    pico_keys_apply_strict_flags(
-        SOURCES ${SOURCES}
-        FILTER_REGEX "/src/fido/|/pico-keys-sdk/src/|/pico-keys-sdk/config/"
+if (NOT MSVC)
+target_compile_options(pico_fido PUBLIC
+    -Werror
     )
 
-    if(NOT MSVC)
 string(FIND ${CMAKE_C_COMPILER} ":" COMPILER_COLON)
 if (${COMPILER_COLON} GREATER_EQUAL 0)
-            target_compile_options(pico_fido PRIVATE
+        target_compile_options(pico_fido PUBLIC
         -Wno-error=use-after-free
         )
 endif()
-    endif()
+endif(NOT MSVC)
 
 if(ENABLE_EMULATION)
     if(NOT MSVC)
-            set(EMULATION_NON_MSVC_COMPILE_OPTIONS
+    target_compile_options(pico_fido PUBLIC
             -fdata-sections
             -ffunction-sections
             )
-            target_compile_options(pico_fido PRIVATE ${EMULATION_NON_MSVC_COMPILE_OPTIONS})
-        endif()
-
+    endif(NOT MSVC)
     if(APPLE)
-            set(EMULATION_APPLE_LINK_OPTIONS
+    target_link_options(pico_fido PUBLIC
             -Wl,-dead_strip
             )
-            target_link_options(pico_fido PRIVATE ${EMULATION_APPLE_LINK_OPTIONS})
-
         if(DEBUG_APDU)
-                set(DEBUG_APDU_SANITIZER_OPTIONS
-                    -fsanitize=address
-                    -g
-                    -O1
-                    -fno-omit-frame-pointer
-                )
-                target_compile_options(pico_fido PRIVATE ${DEBUG_APDU_SANITIZER_OPTIONS})
-                target_link_options(pico_fido PRIVATE ${DEBUG_APDU_SANITIZER_OPTIONS})
+            target_compile_options(pico_fido PUBLIC
+            -fsanitize=address -g -O1 -fno-omit-frame-pointer)
+            target_link_options(pico_fido PUBLIC
+            -fsanitize=address -g -O1 -fno-omit-frame-pointer)
         endif()
     else()
-            set(EMULATION_NON_APPLE_LINK_OPTIONS
+    target_link_options(pico_fido PUBLIC
             -Wl,--gc-sections
             )
-            target_link_options(pico_fido PRIVATE ${EMULATION_NON_APPLE_LINK_OPTIONS})
-        endif()
-
+    endif (APPLE)
     target_link_libraries(pico_fido PRIVATE pico_keys_sdk mbedtls pthread m)
 else()
-        target_link_libraries(
-            pico_fido
-            PRIVATE
-                pico_keys_sdk
-                pico_stdlib
-                pico_multicore
-                hardware_flash
-                hardware_sync
-                hardware_adc
-                pico_unique_id
-                pico_aon_timer
-                tinyusb_device
-                tinyusb_board
-        )
+target_link_libraries(pico_fido PRIVATE pico_keys_sdk pico_stdlib pico_multicore hardware_flash hardware_sync hardware_adc pico_unique_id pico_aon_timer tinyusb_device tinyusb_board)
 pico_add_extra_outputs(${CMAKE_PROJECT_NAME})
 endif()
 endif()

build_pico_fido.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 VERSION_MAJOR="7"
-VERSION_MINOR="6"
+VERSION_MINOR="4"
 SUFFIX="${VERSION_MAJOR}.${VERSION_MINOR}"
 #if ! [[ -z "${GITHUB_SHA}" ]]; then
 #    SUFFIX="${SUFFIX}.${GITHUB_SHA}"

src/fido/cbor.c

@@ -30,7 +30,20 @@
 
 const bool _btrue = true, _bfalse = false;
 
+int cbor_reset();
+int cbor_get_info();
+int cbor_make_credential(const uint8_t *data, size_t len);
+int cbor_client_pin(const uint8_t *data, size_t len);
 int cbor_get_assertion(const uint8_t *data, size_t len, bool next);
+int cbor_get_next_assertion(const uint8_t *data, size_t len);
+int cbor_selection();
+int cbor_cred_mgmt(const uint8_t *data, size_t len);
+int cbor_config(const uint8_t *data, size_t len);
+int cbor_vendor(const uint8_t *data, size_t len);
+int cbor_large_blobs(const uint8_t *data, size_t len);
+extern void reset_gna_state();
+
+extern int cmd_read_config();
 
 const uint8_t aaguid[16] = { 0x89, 0xFB, 0x94, 0xB7, 0x06, 0xC9, 0x36, 0x73, 0x9B, 0x7E, 0x30, 0x52, 0x6D, 0x96, 0x81, 0x45 }; // First 16 bytes of SHA256("Pico FIDO2")
 
@@ -85,7 +98,7 @@ int cbor_parse(uint8_t cmd, const uint8_t *data, size_t len) {
             return cbor_vendor(data, len);
         }
         else if (cmd == 0xC2) {
-            if (man_get_config() == 0) {
+            if (cmd_read_config() == 0x9000) {
                 memmove(res_APDU-1, res_APDU, res_APDU_size);
                 res_APDU_size -= 1;
                 return 0;
@@ -95,7 +108,6 @@ int cbor_parse(uint8_t cmd, const uint8_t *data, size_t len) {
     return CTAP1_ERR_INVALID_CMD;
 }
 
-void *cbor_thread(void *arg) __attribute__((unused));
 void *cbor_thread(void *arg) {
     (void)arg;
     card_init_core1();
@@ -140,7 +152,7 @@ int cbor_process(uint8_t last_cmd, const uint8_t *data, size_t len) {
     return 2; // CBOR processing
 }
 
-static CborError COSE_key_params(int crv, int alg, mbedtls_ecp_group *grp, mbedtls_ecp_point *Q, CborEncoder *mapEncoderParent, CborEncoder *mapEncoder) {
+CborError COSE_key_params(int crv, int alg, mbedtls_ecp_group *grp, mbedtls_ecp_point *Q, CborEncoder *mapEncoderParent, CborEncoder *mapEncoder) {
     CborError error = CborNoError;
     int kty = 1;
     if (crv == FIDO2_CURVE_P256 || crv == FIDO2_CURVE_P384 || crv == FIDO2_CURVE_P521 ||

src/fido/cbor_client_pin.c

@@ -16,6 +16,11 @@
  */
 
 #include "pico_keys.h"
+#ifndef ESP_PLATFORM
+#include "common.h"
+#else
+#define MBEDTLS_ALLOW_PRIVATE_ACCESS
+#endif
 #include "mbedtls/ecp.h"
 #include "mbedtls/ecdh.h"
 #include "mbedtls/sha256.h"
@@ -32,14 +37,16 @@
 #include "random.h"
 #include "crypto_utils.h"
 #include "apdu.h"
+#include "kek.h"
 
 uint32_t usage_timer = 0, initial_usage_time_limit = 0;
 uint32_t max_usage_time_period  = 600 * 1000;
 bool needs_power_cycle = false;
 static mbedtls_ecdh_context hkey;
 static bool hkey_init = false;
+extern int encrypt_keydev_f1(const uint8_t keydev[32]);
 
-static int beginUsingPinUvAuthToken(bool userIsPresent) {
+int beginUsingPinUvAuthToken(bool userIsPresent) {
     paut.user_present = userIsPresent;
     paut.user_verified = true;
     initial_usage_time_limit = board_millis();
@@ -48,25 +55,25 @@ static int beginUsingPinUvAuthToken(bool userIsPresent) {
     return 0;
 }
 
-void clearUserPresentFlag(void) {
+void clearUserPresentFlag() {
     if (paut.in_use == true) {
         paut.user_present = false;
     }
 }
 
-void clearUserVerifiedFlag(void) {
+void clearUserVerifiedFlag() {
     if (paut.in_use == true) {
         paut.user_verified = false;
     }
 }
 
-void clearPinUvAuthTokenPermissionsExceptLbw(void) {
+void clearPinUvAuthTokenPermissionsExceptLbw() {
     if (paut.in_use == true) {
         paut.permissions = CTAP_PERMISSION_LBW;
     }
 }
 
-static void stopUsingPinUvAuthToken(void) {
+void stopUsingPinUvAuthToken() {
     paut.permissions = 0;
     usage_timer = 0;
     paut.in_use = false;
@@ -77,21 +84,21 @@ static void stopUsingPinUvAuthToken(void) {
     user_present_time_limit = 0;
 }
 
-bool getUserPresentFlagValue(void) {
+bool getUserPresentFlagValue() {
     if (paut.in_use != true) {
         paut.user_present = false;
     }
     return paut.user_present;
 }
 
-bool getUserVerifiedFlagValue(void) {
+bool getUserVerifiedFlagValue() {
     if (paut.in_use != true) {
         paut.user_verified = false;
     }
     return paut.user_verified;
 }
 
-static int regenerate(void) {
+int regenerate() {
     if (hkey_init == true) {
         mbedtls_ecdh_free(&hkey);
     }
@@ -107,7 +114,7 @@ static int regenerate(void) {
     return 0;
 }
 
-static int kdf(uint8_t protocol, const mbedtls_mpi *z, uint8_t *sharedSecret) {
+int kdf(uint8_t protocol, const mbedtls_mpi *z, uint8_t *sharedSecret) {
     int ret = 0;
     uint8_t buf[32];
     ret = mbedtls_mpi_write_binary(z, buf, sizeof(buf));
@@ -137,7 +144,7 @@ int ecdh(uint8_t protocol, const mbedtls_ecp_point *Q, uint8_t *sharedSecret) {
     return ret;
 }
 
-static void resetAuthToken(bool persistent) {
+void resetAuthToken(bool persistent) {
     uint16_t fid = EF_AUTHTOKEN;
     if (persistent) {
         fid = EF_PAUTHTOKEN;
@@ -149,7 +156,7 @@ static void resetAuthToken(bool persistent) {
     low_flash_available();
 }
 
-int resetPinUvAuthToken(void) {
+int resetPinUvAuthToken() {
     resetAuthToken(false);
     paut.permissions = 0;
     paut.data = file_get_data(ef_authtoken);
@@ -157,7 +164,7 @@ int resetPinUvAuthToken(void) {
     return 0;
 }
 
-int resetPersistentPinUvAuthToken(void) {
+int resetPersistentPinUvAuthToken() {
     resetAuthToken(true);
     file_t *ef_pauthtoken = search_by_fid(EF_PAUTHTOKEN, NULL, SPECIFY_EF);
     ppaut.permissions = 0;
@@ -193,7 +200,7 @@ int decrypt(uint8_t protocol, const uint8_t *key, const uint8_t *in, uint16_t in
     return -1;
 }
 
-static int __attribute__((unused)) authenticate(uint8_t protocol, const uint8_t *key, const uint8_t *data, size_t len, uint8_t *sign) {
+int authenticate(uint8_t protocol, const uint8_t *key, const uint8_t *data, size_t len, uint8_t *sign) {
     uint8_t hmac[32];
     int ret =
         mbedtls_md_hmac(mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), key, 32, data, len, hmac);
@@ -229,16 +236,16 @@ int verify(uint8_t protocol, const uint8_t *key, const uint8_t *data, uint16_t l
     return -1;
 }
 
-static int initialize(void) {
+int initialize() {
     regenerate();
     return resetPinUvAuthToken();
 }
 
-static int __attribute__((unused)) getPublicKey(void) {
+int getPublicKey() {
     return 0;
 }
 
-static int __attribute__((unused)) pinUvAuthTokenUsageTimerObserver(void) {
+int pinUvAuthTokenUsageTimerObserver() {
     if (usage_timer == 0) {
         return -1;
     }
@@ -259,11 +266,11 @@ static int __attribute__((unused)) pinUvAuthTokenUsageTimerObserver(void) {
     return 0;
 }
 
-static int check_keydev_encrypted(const uint8_t pin_token[32]) {
+int check_keydev_encrypted(const uint8_t pin_token[32]) {
     if (file_get_data(ef_keydev) && *file_get_data(ef_keydev) == 0x01) {
         uint8_t tmp_keydev[61];
-        tmp_keydev[0] = 0x03; // Change format to encrypted
-        encrypt_with_aad(pin_token, file_get_data(ef_keydev) + 1, 32, 2, tmp_keydev + 1);
+        tmp_keydev[0] = 0x02; // Change format to encrypted
+        encrypt_with_aad(pin_token, file_get_data(ef_keydev) + 1, 32, tmp_keydev + 1);
         file_put_data(ef_keydev, tmp_keydev, sizeof(tmp_keydev));
         mbedtls_platform_zeroize(tmp_keydev, sizeof(tmp_keydev));
         low_flash_available();

src/fido/cbor_config.c

@@ -31,6 +31,9 @@
 
 extern uint8_t keydev_dec[32];
 extern bool has_keydev_dec;
+extern void resetPersistentPinUvAuthToken();
+extern void resetPinUvAuthToken();
+
 int cbor_config(const uint8_t *data, size_t len) {
     CborParser parser;
     CborValue map;

src/fido/cbor_get_assertion.c

@@ -42,7 +42,7 @@ uint32_t timerx = 0;
 uint8_t *datax = NULL;
 size_t lenx = 0;
 
-void reset_gna_state(void) {
+void reset_gna_state() {
     for (int i = 0; i < MAX_CREDENTIAL_COUNT_IN_LIST; i++) {
         credential_free(&credsx[i]);
     }

src/fido/cbor_get_info.c

@@ -24,7 +24,7 @@
 #include "apdu.h"
 #include "version.h"
 
-int cbor_get_info(void) {
+int cbor_get_info() {
     CborEncoder encoder, mapEncoder, arrayEncoder, mapEncoder2;
     CborError error = CborNoError;
     cbor_encoder_init(&encoder, ctap_resp->init.data + 1, CTAP_MAX_CBOR_PAYLOAD, 0);

src/fido/cbor_reset.c

@@ -18,7 +18,6 @@
 #include "pico_keys.h"
 #include "file.h"
 #include "fido.h"
-#include "ctap2_cbor.h"
 #include "ctap.h"
 #if defined(PICO_PLATFORM)
 #include "bsp/board.h"
@@ -28,7 +27,9 @@
 #endif
 #include "fs/phy.h"
 
-int cbor_reset(void) {
+extern void scan_all();
+
+int cbor_reset() {
 #ifndef ENABLE_EMULATION
 #if defined(ENABLE_POWER_ON_RESET) && ENABLE_POWER_ON_RESET == 1
     if (!(phy_data.opts & PHY_OPT_DISABLE_POWER_RESET) && board_millis() > 10000) {

src/fido/cbor_selection.c

@@ -17,10 +17,9 @@
 
 #include "pico_keys.h"
 #include "fido.h"
-#include "ctap2_cbor.h"
 #include "ctap.h"
 
-int cbor_selection(void) {
+int cbor_selection() {
     if (wait_button_pressed() == true) {
         return CTAP2_ERR_USER_ACTION_TIMEOUT;
     }

src/fido/cbor_vendor.c

@@ -42,7 +42,7 @@ int mse_decrypt_ct(uint8_t *data, size_t len) {
     return ret;
 }
 
-static int cbor_vendor_generic(uint8_t cmd, const uint8_t *data, size_t len) {
+int cbor_vendor_generic(uint8_t cmd, const uint8_t *data, size_t len) {
     CborParser parser;
     CborValue map;
     CborError error = CborNoError;

src/fido/cmd_authenticate.c

@@ -23,7 +23,7 @@
 #include "files.h"
 #include "credential.h"
 
-int cmd_authenticate(void) {
+int cmd_authenticate() {
     CTAP_AUTHENTICATE_REQ *req = (CTAP_AUTHENTICATE_REQ *) apdu.data;
     CTAP_AUTHENTICATE_RESP *resp = (CTAP_AUTHENTICATE_RESP *) res_APDU;
     //if (scan_files_fido(true) != PICOKEY_OK)

src/fido/cmd_register.c

@@ -29,10 +29,10 @@ const uint8_t u2f_aid[] = {
     0xA0, 0x00, 0x00, 0x05, 0x27, 0x10, 0x02
 };
 
-static int u2f_unload(void);
-static int u2f_process_apdu(void);
+int u2f_unload();
+int u2f_process_apdu();
 
-static int u2f_select(app_t *a, uint8_t force) {
+int u2f_select(app_t *a, uint8_t force) {
     (void) force;
     if (cap_supported(CAP_U2F)) {
         a->process_apdu = u2f_process_apdu;
@@ -46,14 +46,15 @@ INITIALIZER ( u2f_ctor ) {
     register_app(u2f_select, u2f_aid);
 }
 
-int u2f_unload(void) {
+int u2f_unload() {
     return PICOKEY_OK;
 }
 
 const uint8_t *bogus_firefox = (const uint8_t *) "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00";
 const uint8_t *bogus_chrome = (const uint8_t *) "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
 
-int cmd_register(void) {
+extern int ctap_error(uint8_t error);
+int cmd_register() {
     CTAP_REGISTER_REQ *req = (CTAP_REGISTER_REQ *) apdu.data;
     CTAP_REGISTER_RESP *resp = (CTAP_REGISTER_RESP *) res_APDU;
     resp->registerId = CTAP_REGISTER_ID;
@@ -115,6 +116,10 @@ int cmd_register(void) {
     return SW_OK();
 }
 
+extern int cmd_register();
+extern int cmd_authenticate();
+extern int cmd_version();
+
 static const cmd_t cmds[] = {
     { CTAP_REGISTER, cmd_register },
     { CTAP_AUTHENTICATE, cmd_authenticate },
@@ -122,7 +127,7 @@ static const cmd_t cmds[] = {
     { 0x00, 0x0 }
 };
 
-int u2f_process_apdu(void) {
+int u2f_process_apdu() {
     if (CLA(apdu) != 0x00) {
         return SW_CLA_NOT_SUPPORTED();
     }

src/fido/cmd_version.c

@@ -17,9 +17,8 @@
 
 #include "apdu.h"
 #include "pico_keys.h"
-#include "fido.h"
 
-int cmd_version(void) {
+int cmd_version() {
     memcpy(res_APDU, "U2F_V2", strlen("U2F_V2"));
     res_APDU_size = (uint16_t)strlen("U2F_V2");
     return SW_OK();

src/fido/credential.c

@@ -29,6 +29,7 @@
 #include "files.h"
 #include "otp.h"
 
+extern bool has_set_rtc();
 int credential_derive_chacha_key(uint8_t *outk, const uint8_t *);
 
 static int credential_silent_tag(const uint8_t *cred_id, size_t cred_id_len, const uint8_t *rp_id_hash, uint8_t *outk) {

src/fido/ctap.h

@@ -129,7 +129,8 @@ typedef struct {
 #define CTAP_VENDOR_MSE                 0x02
 #define CTAP_VENDOR_UNLOCK              0x03
 #define CTAP_VENDOR_EA                  0x04
-#define CTAP_VENDOR_ADMIN_PIN           0x08
+#define CTAP_VENDOR_PHY_OPTS            0x05
+#define CTAP_VENDOR_MEMORY              0x06
 
 #define CTAP_PERMISSION_MC              0x01  // MakeCredential
 #define CTAP_PERMISSION_GA              0x02  // GetAssertion

src/fido/ctap2_cbor.h

@@ -19,23 +19,16 @@
 #define _CTAP2_CBOR_H_
 
 #include "cbor.h"
+#ifndef ESP_PLATFORM
+#include "common.h"
+#else
+#define MBEDTLS_ALLOW_PRIVATE_ACCESS
+#endif
 #include "mbedtls/ecp.h"
 #include "mbedtls/ecdh.h"
 
-extern uint8_t *driver_prepare_response(void);
+extern uint8_t *driver_prepare_response();
 extern void driver_exec_finished(size_t size_next);
-extern int cbor_parse(uint8_t cmd, const uint8_t *data, size_t len);
-extern int cbor_get_info(void);
-extern int cbor_reset(void);
-extern int cbor_make_credential(const uint8_t *data, size_t len);
-extern int cbor_client_pin(const uint8_t *data, size_t len);
-extern int cbor_selection(void);
-extern int cbor_get_next_assertion(const uint8_t *data, size_t len);
-extern int cbor_cred_mgmt(const uint8_t *data, size_t len);
-extern int cbor_config(const uint8_t *data, size_t len);
-extern int cbor_large_blobs(const uint8_t *data, size_t len);
-extern int cbor_vendor(const uint8_t *data, size_t len);
-extern void reset_gna_state(void);
 extern int cbor_process(uint8_t, const uint8_t *data, size_t len);
 extern const uint8_t aaguid[16];
 

src/fido/fido.c

@@ -17,6 +17,7 @@
 
 #include "pico_keys.h"
 #include "fido.h"
+#include "kek.h"
 #include "apdu.h"
 #include "ctap.h"
 #include "files.h"
@@ -33,12 +34,12 @@
 #include <math.h>
 #include "management.h"
 #include "hid/ctap_hid.h"
-#include "ctap2_cbor.h"
 #include "version.h"
 #include "crypto_utils.h"
 #include "otp.h"
 
-static int fido_unload(void);
+int fido_process_apdu();
+int fido_unload();
 
 pinUvAuthToken_t paut = { 0 };
 persistentPinUvAuthToken_t ppaut = { 0 };
@@ -63,14 +64,14 @@ const uint8_t atr_fido[] = {
     0x75, 0x62, 0x69, 0x4b, 0x65, 0x79, 0x40
 };
 
-static uint8_t fido_get_version_major(void) {
+uint8_t fido_get_version_major() {
     return PICO_FIDO_VERSION_MAJOR;
 }
-static uint8_t fido_get_version_minor(void) {
+uint8_t fido_get_version_minor() {
     return PICO_FIDO_VERSION_MINOR;
 }
 
-static int fido_select(app_t *a, uint8_t force) {
+int fido_select(app_t *a, uint8_t force) {
     (void) force;
     if (cap_supported(CAP_FIDO2)) {
         a->process_apdu = fido_process_apdu;
@@ -80,8 +81,8 @@ static int fido_select(app_t *a, uint8_t force) {
     return PICOKEY_ERR_FILE_NOT_FOUND;
 }
 
-extern uint8_t (*get_version_major)(void);
-extern uint8_t (*get_version_minor)(void);
+extern uint8_t (*get_version_major)();
+extern uint8_t (*get_version_minor)();
 
 INITIALIZER ( fido_ctor ) {
 #if defined(USB_ITF_CCID) || defined(ENABLE_EMULATION)
@@ -93,7 +94,7 @@ INITIALIZER ( fido_ctor ) {
     register_app(fido_select, fido_aid_backup);
 }
 
-static int fido_unload(void) {
+int fido_unload() {
     return PICOKEY_OK;
 }
 
@@ -149,7 +150,7 @@ int mbedtls_curve_to_fido(mbedtls_ecp_group_id id) {
         return FIDO2_CURVE_P256K1;
     }
     else if (id == MBEDTLS_ECP_DP_CURVE25519) {
-        return FIDO2_CURVE_X25519;
+        return MBEDTLS_ECP_DP_CURVE25519;
     }
     else if (id == MBEDTLS_ECP_DP_CURVE448) {
         return FIDO2_CURVE_X448;
@@ -172,18 +173,14 @@ int fido_load_key(int curve, const uint8_t *cred_id, mbedtls_ecp_keypair *key) {
     }
     uint8_t key_path[KEY_PATH_LEN];
     memcpy(key_path, cred_id, KEY_PATH_LEN);
-    uint32_t key_path_first = 0x80000000u | 10022u;
-    memcpy(key_path, &key_path_first, sizeof(key_path_first));
+    *(uint32_t *) key_path = 0x80000000 | 10022;
     for (size_t i = 1; i < KEY_PATH_ENTRIES; i++) {
-        uint32_t part = 0;
-        memcpy(&part, key_path + i * sizeof(uint32_t), sizeof(part));
-        part |= 0x80000000u;
-        memcpy(key_path + i * sizeof(uint32_t), &part, sizeof(part));
+        *(uint32_t *) (key_path + i * sizeof(uint32_t)) |= 0x80000000;
     }
     return derive_key(NULL, false, key_path, mbedtls_curve, key);
 }
 
-static int x509_create_cert(mbedtls_ecdsa_context *ecdsa, uint8_t *buffer, size_t buffer_size) {
+int x509_create_cert(mbedtls_ecdsa_context *ecdsa, uint8_t *buffer, size_t buffer_size) {
     mbedtls_x509write_cert ctx;
     mbedtls_x509write_crt_init(&ctx);
     mbedtls_x509write_crt_set_version(&ctx, MBEDTLS_X509_CRT_VERSION_3);
@@ -225,31 +222,23 @@ int load_keydev(uint8_t key[32]) {
         uint16_t fid_size = file_get_size(ef_keydev);
         if (fid_size == 32) {
             memcpy(key, file_get_data(ef_keydev), 32);
+            if (mkek_decrypt(key, 32) != PICOKEY_OK) {
+                return PICOKEY_EXEC_ERROR;
+            }
             if (otp_key_1 && aes_decrypt(otp_key_1, NULL, 32 * 8, PICO_KEYS_AES_MODE_CBC, key, 32) != PICOKEY_OK) {
                 return PICOKEY_EXEC_ERROR;
             }
         }
         else if (fid_size == 33 || fid_size == 61) {
             uint8_t format = *file_get_data(ef_keydev);
-            if (format == 0x01 || format == 0x02 || format == 0x03) { // Format indicator
-                if (format == 0x02 || format == 0x03) {
-                    uint8_t tmp_key[61], version = format == 0x03 ? 2 : 1;
-                    memcpy(tmp_key, file_get_data(ef_keydev), sizeof(tmp_key));
-                    int ret = decrypt_with_aad(session_pin, tmp_key + 1, 60, version, key);
-                    if (ret != PICOKEY_OK) {
-                        return PICOKEY_EXEC_ERROR;
-                    }
+            if (format == 0x01 || format == 0x02) { // Format indicator
                 if (format == 0x02) {
-                        tmp_key[0] = 0x03;
-                        ret = encrypt_with_aad(session_pin, key, 32, 2, tmp_key + 1);
+                    uint8_t tmp_key[61];
+                    memcpy(tmp_key, file_get_data(ef_keydev), sizeof(tmp_key));
+                    int ret = decrypt_with_aad(session_pin, tmp_key + 1, 60, key);
                     if (ret != PICOKEY_OK) {
-                            mbedtls_platform_zeroize(tmp_key, sizeof(tmp_key));
                         return PICOKEY_EXEC_ERROR;
                     }
-                        file_put_data(ef_keydev, tmp_key, sizeof(tmp_key));
-                        low_flash_available();
-                    }
-                    mbedtls_platform_zeroize(tmp_key, sizeof(tmp_key));
                 }
                 else {
                     memcpy(key, file_get_data(ef_keydev) + 1, 32);
@@ -271,8 +260,7 @@ int load_keydev(uint8_t key[32]) {
 
 int verify_key(const uint8_t *appId, const uint8_t *keyHandle, mbedtls_ecp_keypair *key) {
     for (size_t i = 0; i < KEY_PATH_ENTRIES; i++) {
-        uint32_t k = 0;
-        memcpy(&k, &keyHandle[i * sizeof(uint32_t)], sizeof(k));
+        uint32_t k = *(uint32_t *) &keyHandle[i * sizeof(uint32_t)];
         if (!(k & 0x80000000)) {
             return -1;
         }
@@ -343,7 +331,7 @@ int derive_key(const uint8_t *app_id, bool new_key, uint8_t *key_handle, int cur
         if (cinfo->bit_size % 8 != 0) {
             outk[0] >>= 8 - (cinfo->bit_size % 8);
         }
-        r = mbedtls_ecp_read_key(curve, key, outk, (size_t)((cinfo->bit_size + 7) / 8));
+        r = mbedtls_ecp_read_key(curve, key, outk, (size_t)ceil((float) cinfo->bit_size / 8));
         mbedtls_platform_zeroize(outk, sizeof(outk));
         if (r != 0) {
             return r;
@@ -376,9 +364,10 @@ int encrypt_keydev_f1(const uint8_t keydev[32]) {
     return ret;
 }
 
-int scan_files_fido(void) {
+int scan_files_fido() {
     ef_keydev = search_by_fid(EF_KEY_DEV, NULL, SPECIFY_EF);
     ef_keydev_enc = search_by_fid(EF_KEY_DEV_ENC, NULL, SPECIFY_EF);
+    ef_mkek = search_by_fid(EF_MKEK, NULL, SPECIFY_EF);
     if (ef_keydev) {
         if (!file_has_data(ef_keydev) && !file_has_data(ef_keydev_enc)) {
             printf("KEY DEVICE is empty. Generating SECP256R1 curve...");
@@ -453,7 +442,6 @@ int scan_files_fido(void) {
         printf("FATAL ERROR: Global counter not found in memory!\r\n");
     }
     ef_pin = search_by_fid(EF_PIN, NULL, SPECIFY_EF);
-    ef_pin_admin = search_by_fid(EF_PIN_ADMIN, NULL, SPECIFY_EF);
     ef_authtoken = search_by_fid(EF_AUTHTOKEN, NULL, SPECIFY_EF);
     if (ef_authtoken) {
         if (!file_has_data(ef_authtoken)) {
@@ -489,13 +477,14 @@ int scan_files_fido(void) {
     return PICOKEY_OK;
 }
 
-void scan_all(void) {
+void scan_all() {
     scan_flash();
     scan_files_fido();
 }
 
+extern void init_otp();
 extern bool needs_power_cycle;
-void init_fido(void) {
+void init_fido() {
     scan_all();
 #ifdef ENABLE_OTP_APP
     init_otp();
@@ -503,7 +492,7 @@ void init_fido(void) {
     needs_power_cycle = false;
 }
 
-bool wait_button_pressed(void) {
+bool wait_button_pressed() {
     uint32_t val = EV_PRESS_BUTTON;
 #if defined(PICO_PLATFORM) || defined(ESP_PLATFORM)
     queue_try_add(&card_to_usb_q, &val);
@@ -516,7 +505,7 @@ bool wait_button_pressed(void) {
 
 uint32_t user_present_time_limit = 0;
 
-bool check_user_presence(void) {
+bool check_user_presence() {
     if (user_present_time_limit == 0 || user_present_time_limit + TRANSPORT_TIME_LIMIT < board_millis()) {
         if (wait_button_pressed() == true) { //timeout
             return false;
@@ -526,12 +515,12 @@ bool check_user_presence(void) {
     return true;
 }
 
-uint32_t get_sign_counter(void) {
+uint32_t get_sign_counter() {
     uint8_t *caddr = file_get_data(ef_counter);
     return get_uint32_t_le(caddr);
 }
 
-uint8_t get_opts(void) {
+uint8_t get_opts() {
     file_t *ef = search_by_fid(EF_OPTS, NULL, SPECIFY_EF);
     if (file_has_data(ef)) {
         return *file_get_data(ef);
@@ -545,9 +534,16 @@ void set_opts(uint8_t opts) {
     low_flash_available();
 }
 
+extern int cmd_register();
+extern int cmd_authenticate();
+extern int cmd_version();
+extern int cbor_parse(int, uint8_t *, size_t);
+extern int cbor_vendor(const uint8_t *data, size_t len);
+extern void driver_init_hid();
+
 #define CTAP_CBOR 0x10
 
-static int cmd_vendor(void) {
+int cmd_vendor() {
     uint8_t *old_buf = res_APDU;
     driver_init_hid();
     int ret = cbor_vendor(apdu.data, apdu.nc);
@@ -560,7 +556,7 @@ static int cmd_vendor(void) {
     return SW_OK();
 }
 
-static int cmd_cbor(void) {
+int cmd_cbor() {
     uint8_t *old_buf = res_APDU;
     driver_init_hid();
     int ret = cbor_parse(0x90, apdu.data, apdu.nc);
@@ -582,7 +578,7 @@ static const cmd_t cmds[] = {
     { 0x00, 0x0 }
 };
 
-int fido_process_apdu(void) {
+int fido_process_apdu() {
     if (CLA(apdu) != 0x00 && CLA(apdu) != 0x80) {
         return SW_CLA_NOT_SUPPORTED();
     }

src/fido/fido.h

@@ -21,6 +21,11 @@
 #if defined(PICO_PLATFORM)
 #include "pico/stdlib.h"
 #endif
+#ifndef ESP_PLATFORM
+#include "common.h"
+#else
+#define MBEDTLS_ALLOW_PRIVATE_ACCESS
+#endif
 
 #include "mbedtls/ecdsa.h"
 #ifdef MBEDTLS_EDDSA_C
@@ -34,17 +39,15 @@
 #define SHA256_DIGEST_LENGTH (32)
 #define KEY_HANDLE_LEN (KEY_PATH_LEN + SHA256_DIGEST_LENGTH)
 
-extern int scan_files_fido(void);
+extern int scan_files_fido();
 extern int derive_key(const uint8_t *app_id,
                       bool new_key,
                       uint8_t *key_handle,
                       int,
                       mbedtls_ecp_keypair *key);
 extern int verify_key(const uint8_t *appId, const uint8_t *keyHandle, mbedtls_ecp_keypair *);
-extern bool wait_button_pressed(void);
-extern void init_fido(void);
-extern void init_otp(void);
-extern void scan_all(void);
+extern bool wait_button_pressed();
+extern void init_fido();
 extern mbedtls_ecp_group_id fido_curve_to_mbedtls(int curve);
 extern int mbedtls_curve_to_fido(mbedtls_ecp_group_id id);
 extern int fido_load_key(int curve, const uint8_t *cred_id, mbedtls_ecp_keypair *key);
@@ -92,14 +95,14 @@ extern int ecdh(uint8_t protocol, const mbedtls_ecp_point *Q, uint8_t *sharedSec
 #define FIDO2_OPT_AUV           0x02 // User Verification
 
 #define MAX_PIN_RETRIES 8
-extern bool getUserPresentFlagValue(void);
-extern bool getUserVerifiedFlagValue(void);
-extern void clearUserPresentFlag(void);
-extern void clearUserVerifiedFlag(void);
-extern void clearPinUvAuthTokenPermissionsExceptLbw(void);
-extern void send_keepalive(void);
-extern uint32_t get_sign_counter(void);
-extern uint8_t get_opts(void);
+extern bool getUserPresentFlagValue();
+extern bool getUserVerifiedFlagValue();
+extern void clearUserPresentFlag();
+extern void clearUserVerifiedFlag();
+extern void clearPinUvAuthTokenPermissionsExceptLbw();
+extern void send_keepalive();
+extern uint32_t get_sign_counter();
+extern uint8_t get_opts();
 extern void set_opts(uint8_t);
 #define MAX_CREDENTIAL_COUNT_IN_LIST 16
 #define MAX_CRED_ID_LENGTH        1024
@@ -120,19 +123,7 @@ extern const known_app_t *find_app_by_rp_id_hash(const uint8_t *rp_id_hash);
 
 #define TRANSPORT_TIME_LIMIT (30 * 1000) //USB
 
-bool check_user_presence(void);
-int fido_process_apdu(void);
-int cmd_register(void);
-int cmd_authenticate(void);
-int cmd_version(void);
-int calculate_oath(uint8_t truncate,
-                   const uint8_t *key,
-                   size_t key_len,
-                   const uint8_t *chal,
-                   size_t chal_len);
-int encrypt_keydev_f1(const uint8_t keydev[32]);
-int resetPinUvAuthToken(void);
-int resetPersistentPinUvAuthToken(void);
+bool check_user_presence();
 
 typedef struct pinUvAuthToken {
     uint8_t *data;

src/fido/files.c

@@ -21,6 +21,7 @@ file_t file_entries[] = {
     { .fid = 0x3f00, .parent = 0xff, .name = NULL, .type = FILE_TYPE_DF, .data = NULL, .ef_structure = 0, .acl = { 0 } }, // MF
     { .fid = EF_KEY_DEV, .parent = 0, .name = NULL, .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0xff } }, // Device Key
     { .fid = EF_KEY_DEV_ENC, .parent = 0, .name = NULL,.type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0xff } }, // Device Key Enc
+    { .fid = EF_MKEK, .parent = 0, .name = NULL, .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0xff } }, // MKEK
     { .fid = EF_EE_DEV,  .parent = 0, .name = NULL, .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0xff } }, // End Entity Certificate Device
     { .fid = EF_EE_DEV_EA,  .parent = 0, .name = NULL, .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0xff } }, // End Entity Enterprise Attestation Certificate
     { .fid = EF_COUNTER,  .parent = 0, .name = NULL, .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0xff } }, // Global counter
@@ -31,7 +32,6 @@ file_t file_entries[] = {
     { .fid = EF_OPTS,  .parent = 0, .name = NULL, .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0xff } }, // Global options
     { .fid = EF_LARGEBLOB,  .parent = 0, .name = NULL, .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0xff } }, // Large Blob
     { .fid = EF_OTP_PIN,  .parent = 0, .name = NULL, .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0xff } },
-    { .fid = EF_PIN_ADMIN,  .parent = 0, .name = NULL, .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL, .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0xff } }, // ADMIN PIN
     { .fid = 0x0000, .parent = 0xff, .name = NULL, .type = FILE_TYPE_NOT_KNOWN, .data = NULL, .ef_structure = 0, .acl = { 0 } }  //end
 };
 
@@ -41,7 +41,7 @@ file_t *ef_keydev = NULL;
 file_t *ef_certdev = NULL;
 file_t *ef_counter = NULL;
 file_t *ef_pin = NULL;
-file_t *ef_pin_admin = NULL;
 file_t *ef_authtoken = NULL;
 file_t *ef_keydev_enc = NULL;
 file_t *ef_largeblob = NULL;
+file_t *ef_mkek = NULL;

src/fido/files.h

@@ -22,12 +22,12 @@
 
 #define EF_KEY_DEV      0xCC00
 #define EF_KEY_DEV_ENC  0xCC01
+#define EF_MKEK         0xCC0F
 #define EF_EE_DEV       0xCE00
 #define EF_EE_DEV_EA    0xCE01
 #define EF_COUNTER      0xC000
 #define EF_OPTS         0xC001
 #define EF_PIN          0x1080
-#define EF_PIN_ADMIN    0x1084
 #define EF_AUTHTOKEN    0x1090
 #define EF_PAUTHTOKEN   0x1091
 #define EF_MINPINLEN    0x1100
@@ -48,9 +48,9 @@ extern file_t *ef_keydev;
 extern file_t *ef_certdev;
 extern file_t *ef_counter;
 extern file_t *ef_pin;
-extern file_t *ef_pin_admin;
 extern file_t *ef_authtoken;
 extern file_t *ef_keydev_enc;
 extern file_t *ef_largeblob;
+extern file_t *ef_mkek;
 
 #endif //_FILES_H_

src/fido/kek.c

@@ -0,0 +1,97 @@
+/*
+ * This file is part of the Pico Fido distribution (https://github.com/polhenarejos/pico-fido).
+ * Copyright (c) 2022 Pol Henarejos.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "pico_keys.h"
+#include "fido.h"
+#include "stdlib.h"
+#if defined(PICO_PLATFORM)
+#include "pico/stdlib.h"
+#endif
+#include "kek.h"
+#include "crypto_utils.h"
+#include "random.h"
+#include "mbedtls/md.h"
+#include "mbedtls/cmac.h"
+#include "mbedtls/rsa.h"
+#include "mbedtls/ecdsa.h"
+#include "mbedtls/chachapoly.h"
+#include "files.h"
+#include "otp.h"
+
+extern uint8_t session_pin[32];
+uint8_t mkek_mask[MKEK_KEY_SIZE];
+bool has_mkek_mask = false;
+
+#define POLY 0xedb88320
+
+uint32_t crc32c(const uint8_t *buf, size_t len) {
+    uint32_t crc = 0xffffffff;
+    while (len--) {
+        crc ^= *buf++;
+        for (int k = 0; k < 8; k++) {
+            crc = (crc >> 1) ^ (POLY & (0 - (crc & 1)));
+        }
+    }
+    return ~crc;
+}
+
+void mkek_masked(uint8_t *mkek, const uint8_t *mask) {
+    if (mask) {
+        for (int i = 0; i < MKEK_KEY_SIZE; i++) {
+            MKEK_KEY(mkek)[i] ^= mask[i];
+        }
+    }
+}
+
+int load_mkek(uint8_t *mkek) {
+    file_t *tf = search_file(EF_MKEK);
+    if (file_has_data(tf)) {
+        memcpy(mkek, file_get_data(tf), MKEK_SIZE);
+    }
+
+    if (has_mkek_mask) {
+        mkek_masked(mkek, mkek_mask);
+    }
+    if (file_get_size(tf) == MKEK_SIZE) {
+        int ret = aes_decrypt_cfb_256(session_pin, MKEK_IV(mkek), MKEK_KEY(mkek), MKEK_KEY_SIZE + MKEK_KEY_CS_SIZE);
+        if (ret != 0) {
+            return PICOKEY_EXEC_ERROR;
+        }
+        if (crc32c(MKEK_KEY(mkek), MKEK_KEY_SIZE) != *(uint32_t *) MKEK_CHECKSUM(mkek)) {
+            return PICOKEY_WRONG_DKEK;
+        }
+        if (otp_key_1) {
+            mkek_masked(mkek, otp_key_1);
+        }
+    }
+    return PICOKEY_OK;
+}
+
+void release_mkek(uint8_t *mkek) {
+    mbedtls_platform_zeroize(mkek, MKEK_SIZE);
+}
+
+int mkek_decrypt(uint8_t *data, uint16_t len) {
+    int r;
+    uint8_t mkek[MKEK_SIZE + 4];
+    if ((r = load_mkek(mkek)) != PICOKEY_OK) {
+        return r;
+    }
+    r = aes_decrypt_cfb_256(MKEK_KEY(mkek), MKEK_IV(mkek), data, len);
+    release_mkek(mkek);
+    return r;
+}

src/fido/kek.h

@@ -0,0 +1,46 @@
+/*
+ * This file is part of the Pico Fido distribution (https://github.com/polhenarejos/pico-fido).
+ * Copyright (c) 2022 Pol Henarejos.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef _KEK_H_
+#define _KEK_H_
+
+#include "crypto_utils.h"
+#if defined(ENABLE_EMULATION) || defined(ESP_PLATFORM)
+#include <stdbool.h>
+#endif
+
+
+extern int load_mkek(uint8_t *);
+extern int store_mkek(const uint8_t *);
+extern void init_mkek();
+extern void release_mkek(uint8_t *);
+extern int mkek_encrypt(uint8_t *data, uint16_t len);
+extern int mkek_decrypt(uint8_t *data, uint16_t len);
+
+#define MKEK_IV_SIZE     (IV_SIZE)
+#define MKEK_KEY_SIZE    (32)
+#define MKEK_KEY_CS_SIZE (4)
+#define MKEK_SIZE        (MKEK_IV_SIZE + MKEK_KEY_SIZE + MKEK_KEY_CS_SIZE)
+#define MKEK_IV(p)       (p)
+#define MKEK_KEY(p)      (MKEK_IV(p) + MKEK_IV_SIZE)
+#define MKEK_CHECKSUM(p) (MKEK_KEY(p) + MKEK_KEY_SIZE)
+#define DKEK_KEY_SIZE    (32)
+
+extern uint8_t mkek_mask[MKEK_KEY_SIZE];
+extern bool has_mkek_mask;
+
+#endif

src/fido/management.c

@@ -25,14 +25,16 @@
 
 bool is_gpg = true;
 
-static int man_process_apdu(void);
-static int man_unload(void);
+int man_process_apdu();
+int man_unload();
 
 const uint8_t man_aid[] = {
     8,
     0xa0, 0x00, 0x00, 0x05, 0x27, 0x47, 0x11, 0x17
 };
-static int man_select(app_t *a, uint8_t force) {
+extern void scan_all();
+extern void init_otp();
+int man_select(app_t *a, uint8_t force) {
     a->process_apdu = man_process_apdu;
     a->unload = man_unload;
     sprintf((char *) res_APDU, "%d.%d.0", PICO_FIDO_VERSION_MAJOR, PICO_FIDO_VERSION_MINOR);
@@ -52,7 +54,7 @@ INITIALIZER ( man_ctor ) {
     register_app(man_select, man_aid);
 }
 
-static int man_unload(void) {
+int man_unload() {
     return PICOKEY_OK;
 }
 
@@ -86,7 +88,7 @@ static uint8_t _piv_aid[] = {
     0xA0, 0x00, 0x00, 0x03, 0x8,
 };
 
-int man_get_config(void) {
+int man_get_config() {
     file_t *ef = search_dynamic_file(EF_DEV_CONF);
     res_APDU_size = 0;
     res_APDU[res_APDU_size++] = 0; // Overall length. Filled later
@@ -153,12 +155,12 @@ int man_get_config(void) {
     return 0;
 }
 
-static int cmd_read_config(void) {
+int cmd_read_config() {
     man_get_config();
     return SW_OK();
 }
 
-static int cmd_write_config(void) {
+int cmd_write_config() {
     if (apdu.data[0] != apdu.nc - 1) {
         return SW_WRONG_DATA();
     }
@@ -177,8 +179,8 @@ static int cmd_write_config(void) {
     return SW_OK();
 }
 
-extern int cbor_reset(void);
-static int cmd_factory_reset(void) {
+extern int cbor_reset();
+int cmd_factory_reset() {
     cbor_reset();
     return SW_OK();
 }
@@ -194,7 +196,7 @@ static const cmd_t cmds[] = {
     { 0x00, 0x0 }
 };
 
-static int man_process_apdu(void) {
+int man_process_apdu() {
     if (CLA(apdu) != 0x00) {
         return SW_CLA_NOT_SUPPORTED();
     }

src/fido/management.h

@@ -50,6 +50,6 @@
 #define FLAG_EJECT 0x80
 
 extern bool cap_supported(uint16_t cap);
-extern int man_get_config(void);
+extern int man_get_config();
 
 #endif //_MANAGEMENT_H

src/fido/oath.c

@@ -24,6 +24,7 @@
 #include "asn1.h"
 #include "crypto_utils.h"
 #include "management.h"
+extern bool is_nk;
 
 #define MAX_OATH_CRED   255
 #define CHALLENGE_LEN   8
@@ -62,8 +63,8 @@
 #define PROP_TOUCH          0x02
 #define PROP_PIN            0x03
 
-static int oath_process_apdu(void);
-static int oath_unload(void);
+int oath_process_apdu();
+int oath_unload();
 
 static bool validated = true;
 static uint8_t challenge[CHALLENGE_LEN] = { 0 };
@@ -73,7 +74,7 @@ const uint8_t oath_aid[] = {
     0xa0, 0x00, 0x00, 0x05, 0x27, 0x21, 0x01
 };
 
-static int oath_select(app_t *a, uint8_t force) {
+int oath_select(app_t *a, uint8_t force) {
     (void) force;
     if (cap_supported(CAP_OATH)) {
         a->process_apdu = oath_process_apdu;
@@ -120,11 +121,11 @@ INITIALIZER ( oath_ctor ) {
     register_app(oath_select, oath_aid);
 }
 
-static int oath_unload(void) {
+int oath_unload() {
     return PICOKEY_OK;
 }
 
-static file_t *find_oath_cred(const uint8_t *name, size_t name_len) {
+file_t *find_oath_cred(const uint8_t *name, size_t name_len) {
     for (int i = 0; i < MAX_OATH_CRED; i++) {
         file_t *ef = search_dynamic_file((uint16_t)(EF_OATH_CRED + i));
         asn1_ctx_t ctxi, ef_tag = { 0 };
@@ -136,7 +137,7 @@ static file_t *find_oath_cred(const uint8_t *name, size_t name_len) {
     return NULL;
 }
 
-static int cmd_put(void) {
+int cmd_put() {
     if (validated == false) {
         return SW_SECURITY_STATUS_NOT_SATISFIED();
     }
@@ -184,7 +185,7 @@ static int cmd_put(void) {
 }
 
 
-static int cmd_delete(void) {
+int cmd_delete() {
     if (validated == false) {
         return SW_SECURITY_STATUS_NOT_SATISFIED();
     }
@@ -201,7 +202,7 @@ static int cmd_delete(void) {
     return SW_INCORRECT_PARAMS();
 }
 
-static const mbedtls_md_info_t *get_oath_md_info(uint8_t alg) {
+const mbedtls_md_info_t *get_oath_md_info(uint8_t alg) {
     if ((alg & ALG_MASK) == ALG_HMAC_SHA1) {
         return mbedtls_md_info_from_type(MBEDTLS_MD_SHA1);
     }
@@ -214,7 +215,7 @@ static const mbedtls_md_info_t *get_oath_md_info(uint8_t alg) {
     return NULL;
 }
 
-static int cmd_set_code(void) {
+int cmd_set_code() {
     if (validated == false) {
         return SW_SECURITY_STATUS_NOT_SATISFIED();
     }
@@ -260,7 +261,7 @@ static int cmd_set_code(void) {
     return SW_OK();
 }
 
-static int cmd_reset(void) {
+int cmd_reset() {
     if (P1(apdu) != 0xde || P2(apdu) != 0xad) {
         return SW_INCORRECT_P1P2();
     }
@@ -277,7 +278,7 @@ static int cmd_reset(void) {
     return SW_OK();
 }
 
-static int cmd_list(void) {
+int cmd_list() {
     if (validated == false) {
         return SW_SECURITY_STATUS_NOT_SATISFIED();
     }
@@ -309,7 +310,7 @@ static int cmd_list(void) {
     return SW_OK();
 }
 
-static int cmd_validate(void) {
+int cmd_validate() {
     asn1_ctx_t ctxi, key = { 0 }, chal = { 0 }, resp = { 0 };
     asn1_ctx_init(apdu.data, (uint16_t)apdu.nc, &ctxi);
     if (asn1_find_tag(&ctxi, TAG_CHALLENGE, &chal) == false) {
@@ -379,7 +380,7 @@ int calculate_oath(uint8_t truncate, const uint8_t *key, size_t key_len, const u
     return PICOKEY_OK;
 }
 
-static int cmd_calculate(void) {
+int cmd_calculate() {
     if (P2(apdu) != 0x0 && P2(apdu) != 0x1) {
         return SW_INCORRECT_P1P2();
     }
@@ -434,7 +435,7 @@ static int cmd_calculate(void) {
     return SW_OK();
 }
 
-static int cmd_calculate_all(void) {
+int cmd_calculate_all() {
     asn1_ctx_t ctxi, key = { 0 }, chal = { 0 }, name = { 0 }, prop = { 0 };
     asn1_ctx_init(apdu.data, (uint16_t)apdu.nc, &ctxi);
     if (P2(apdu) != 0x0 && P2(apdu) != 0x1) {
@@ -484,11 +485,11 @@ static int cmd_calculate_all(void) {
     return SW_OK();
 }
 
-static int cmd_send_remaining(void) {
+int cmd_send_remaining() {
     return SW_OK();
 }
 
-static int cmd_set_otp_pin(void) {
+int cmd_set_otp_pin() {
     uint8_t hsh[33] = { 0 };
     file_t *ef_otp_pin = search_by_fid(EF_OTP_PIN, NULL, SPECIFY_EF);
     if (file_has_data(ef_otp_pin)) {
@@ -506,7 +507,7 @@ static int cmd_set_otp_pin(void) {
     return SW_OK();
 }
 
-static int cmd_change_otp_pin(void) {
+int cmd_change_otp_pin() {
     uint8_t hsh[33] = { 0 };
     file_t *ef_otp_pin = search_by_fid(EF_OTP_PIN, NULL, SPECIFY_EF);
     if (!file_has_data(ef_otp_pin)) {
@@ -531,7 +532,7 @@ static int cmd_change_otp_pin(void) {
     return SW_OK();
 }
 
-static int cmd_verify_otp_pin(void) {
+int cmd_verify_otp_pin() {
     uint8_t hsh[33] = { 0 }, data_hsh[33];
     file_t *ef_otp_pin = search_by_fid(EF_OTP_PIN, NULL, SPECIFY_EF);
     if (!file_has_data(ef_otp_pin)) {
@@ -560,7 +561,7 @@ static int cmd_verify_otp_pin(void) {
     return SW_OK();
 }
 
-static int cmd_verify_hotp(void) {
+int cmd_verify_hotp() {
     asn1_ctx_t ctxi, key = { 0 }, chal = { 0 }, name = { 0 }, code = { 0 };
     asn1_ctx_init(apdu.data, (uint16_t)apdu.nc, &ctxi);
     uint32_t code_int = 0;
@@ -606,7 +607,7 @@ static int cmd_verify_hotp(void) {
     return SW_OK();
 }
 
-static int cmd_rename(void) {
+int cmd_rename() {
     asn1_ctx_t ctxi, name = { 0 }, new_name = { 0 };
 
     if (validated == false) {
@@ -624,7 +625,7 @@ static int cmd_rename(void) {
     if (asn1_find_tag(&ctxi, TAG_NAME, &new_name) == false) {
         return SW_WRONG_DATA();
     }
-    if (name.len == new_name.len && memcmp(name.data, new_name.data, name.len) == 0) {
+    if (memcmp(name.data, new_name.data, name.len) == 0) {
         return SW_WRONG_DATA();
     }
     file_t *ef = find_oath_cred(name.data, name.len);
@@ -648,7 +649,7 @@ static int cmd_rename(void) {
     return SW_OK();
 }
 
-static int cmd_get_credential(void) {
+int cmd_get_credential() {
     asn1_ctx_t ctxi, name = { 0 };
     if (apdu.nc < 3) {
         return SW_INCORRECT_PARAMS();
@@ -730,7 +731,7 @@ static const cmd_t cmds[] = {
     { 0x00, 0x0 }
 };
 
-static int oath_process_apdu(void) {
+int oath_process_apdu() {
     if (CLA(apdu) != 0x00) {
         return SW_CLA_NOT_SUPPORTED();
     }

src/fido/otp.c

@@ -28,15 +28,8 @@
 #include "bsp/board.h"
 #endif
 #ifdef ENABLE_EMULATION
-void add_keyboard_buffer(const uint8_t *buf, size_t len, bool press_enter) {
-    (void)buf;
-    (void)len;
-    (void)press_enter;
-}
-void append_keyboard_buffer(const uint8_t *buf, size_t len) {
-    (void)buf;
-    (void)len;
-}
+void add_keyboard_buffer(const uint8_t *buf, size_t len, bool press_enter) {}
+void append_keyboard_buffer(const uint8_t *buf, size_t len) {}
 #else
 #include "tusb.h"
 #endif
@@ -126,21 +119,22 @@ typedef struct otp_config {
 }) otp_config_t;
 
 #define otp_config_size sizeof(otp_config_t)
-static uint16_t otp_status(bool is_otp);
-static int otp_process_apdu(void);
-static int otp_unload(void);
+uint16_t otp_status(bool is_otp);
+
+int otp_process_apdu();
+int otp_unload();
 
 extern int (*hid_set_report_cb)(uint8_t, uint8_t, hid_report_type_t, uint8_t const *, uint16_t);
 extern uint16_t (*hid_get_report_cb)(uint8_t, uint8_t, hid_report_type_t, uint8_t *, uint16_t);
-static int otp_hid_set_report_cb(uint8_t, uint8_t, hid_report_type_t, uint8_t const *, uint16_t);
-static uint16_t otp_hid_get_report_cb(uint8_t, uint8_t, hid_report_type_t, uint8_t *, uint16_t);
+int otp_hid_set_report_cb(uint8_t, uint8_t, hid_report_type_t, uint8_t const *, uint16_t);
+uint16_t otp_hid_get_report_cb(uint8_t, uint8_t, hid_report_type_t, uint8_t *, uint16_t);
 
 const uint8_t otp_aid[] = {
     7,
     0xa0, 0x00, 0x00, 0x05, 0x27, 0x20, 0x01
 };
 
-static int otp_select(app_t *a, uint8_t force) {
+int otp_select(app_t *a, uint8_t force) {
     (void) force;
     if (cap_supported(CAP_OTP)) {
         a->process_apdu = otp_process_apdu;
@@ -160,7 +154,7 @@ static int otp_select(app_t *a, uint8_t force) {
 
 uint8_t modhex_tab[] =
 { 'c', 'b', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'n', 'r', 't', 'u', 'v' };
-static int encode_modhex(const uint8_t *in, size_t len, uint8_t *out) {
+int encode_modhex(const uint8_t *in, size_t len, uint8_t *out) {
     for (size_t l = 0; l < len; l++) {
         *out++ = modhex_tab[in[l] >> 4];
         *out++ = modhex_tab[in[l] & 0xf];
@@ -168,7 +162,8 @@ static int encode_modhex(const uint8_t *in, size_t len, uint8_t *out) {
     return 0;
 }
 static bool scanned = false;
-void init_otp(void) {
+extern void scan_all();
+void init_otp() {
     if (scanned == false) {
         scan_all();
         for (uint8_t i = 0; i < 4; i++) {
@@ -190,7 +185,13 @@ void init_otp(void) {
         low_flash_available();
     }
 }
-static uint16_t calculate_crc(const uint8_t *data, size_t data_len) {
+extern int calculate_oath(uint8_t truncate,
+                          const uint8_t *key,
+                          size_t key_len,
+                          const uint8_t *chal,
+                          size_t chal_len);
+
+uint16_t calculate_crc(const uint8_t *data, size_t data_len) {
     uint16_t crc = 0xFFFF;
     for (size_t idx = 0; idx < data_len; idx++) {
         crc ^= data[idx];
@@ -206,7 +207,7 @@ static uint16_t calculate_crc(const uint8_t *data, size_t data_len) {
 }
 
 static uint8_t session_counter[2] = { 0 };
-static int otp_button_pressed(uint8_t slot) {
+int otp_button_pressed(uint8_t slot) {
     init_otp();
     if (!cap_supported(CAP_OTP)) {
         return 3;
@@ -333,12 +334,12 @@ INITIALIZER( otp_ctor ) {
     hid_get_report_cb = otp_hid_get_report_cb;
 }
 
-static int otp_unload(void) {
+int otp_unload() {
     return PICOKEY_OK;
 }
 
 uint8_t status_byte = 0x0;
-static uint16_t otp_status_ext(void) {
+uint16_t otp_status_ext() {
     for (int i = 0; i < 4; i++) {
         file_t *ef = search_dynamic_file(EF_OTP_SLOT1 + i);
         if (file_has_data(ef)) {
@@ -371,7 +372,7 @@ static uint16_t otp_status_ext(void) {
     return SW_OK();
 }
 
-static uint16_t otp_status(bool is_otp) {
+uint16_t otp_status(bool is_otp) {
     if (scanned == false) {
         scan_all();
         scanned = true;
@@ -414,13 +415,13 @@ static uint16_t otp_status(bool is_otp) {
     return SW_OK();
 }
 
-static bool check_crc(const otp_config_t *data) {
+bool check_crc(const otp_config_t *data) {
     uint16_t crc = calculate_crc((const uint8_t *) data, otp_config_size);
     return crc == 0xF0B8;
 }
 
 bool _is_otp = false;
-static int cmd_otp(void) {
+int cmd_otp() {
     uint8_t p1 = P1(apdu), p2 = P2(apdu);
     if (p1 == 0x01 || p1 == 0x03) { // Configure slot
         otp_config_t *odata = (otp_config_t *) apdu.data;
@@ -435,7 +436,7 @@ static int cmd_otp(void) {
                 return SW_SECURITY_STATUS_NOT_SATISFIED();
             }
         }
-        for (size_t c = 0; c < otp_config_size; c++) {
+        for (int c = 0; c < otp_config_size; c++) {
             if (apdu.data[c] != 0) {
                 if (odata->rfu[0] != 0 || odata->rfu[1] != 0 || check_crc(odata) == false) {
                     return SW_WRONG_DATA();
@@ -607,7 +608,7 @@ static const cmd_t cmds[] = {
     { 0x00, 0x0 }
 };
 
-static int otp_process_apdu(void) {
+int otp_process_apdu() {
     if (CLA(apdu) != 0x00) {
         return SW_CLA_NOT_SUPPORTED();
     }
@@ -627,7 +628,9 @@ uint8_t otp_frame_tx[70] = {0};
 uint8_t otp_exp_seq = 0, otp_curr_seq = 0;
 uint8_t otp_header[4] = {0};
 
-static int otp_send_frame(uint8_t *frame, size_t frame_len) {
+extern uint16_t *get_send_buffer_size(uint8_t itf);
+
+int otp_send_frame(uint8_t *frame, size_t frame_len) {
     uint16_t crc = calculate_crc(frame, frame_len);
     frame_len += put_uint16_t_le(~crc, frame + frame_len);
     *get_send_buffer_size(ITF_KEYBOARD) = frame_len;
@@ -639,10 +642,7 @@ static int otp_send_frame(uint8_t *frame, size_t frame_len) {
     return 0;
 }
 
-static int otp_hid_set_report_cb(uint8_t itf, uint8_t report_id, hid_report_type_t report_type, uint8_t const *buffer, uint16_t bufsize) {
-    (void)itf;
-    (void)report_id;
-    (void)bufsize;
+int otp_hid_set_report_cb(uint8_t itf, uint8_t report_id, hid_report_type_t report_type, uint8_t const *buffer, uint16_t bufsize) {
     if (report_type == 3) {
         DEBUG_PAYLOAD(buffer, bufsize);
         if (buffer[7] == 0xFF) { // reset
@@ -690,7 +690,7 @@ static int otp_hid_set_report_cb(uint8_t itf, uint8_t report_id, hid_report_type
     return 0;
 }
 
-static uint16_t otp_hid_get_report_cb(uint8_t itf,
+uint16_t otp_hid_get_report_cb(uint8_t itf,
                                uint8_t report_id,
                                hid_report_type_t report_type,
                                uint8_t *buffer,

src/fido/version.h

@@ -18,7 +18,7 @@
 #ifndef __VERSION_H_
 #define __VERSION_H_
 
-#define PICO_FIDO_VERSION 0x0706
+#define PICO_FIDO_VERSION 0x0704
 
 #define PICO_FIDO_VERSION_MAJOR ((PICO_FIDO_VERSION >> 8) & 0xff)
 #define PICO_FIDO_VERSION_MINOR (PICO_FIDO_VERSION & 0xff)

tests/pico-fido/test_070_oath.py

@@ -25,7 +25,6 @@ INS_PUT = 0x01
 INS_DELETE = 0x02
 INS_SET_CODE = 0x03
 INS_RESET = 0x04
-INS_RENAME = 0x05
 INS_LIST = 0xa1
 INS_CALCULATE = 0xa2
 INS_VALIDATE = 0xa3
@@ -90,24 +89,6 @@ def test_life(reset_oath):
     resp = list_apdu(reset_oath)
     assert(len(resp) == 0)
 
-
-def test_rename_prefix_extension(reset_oath):
-    old_name = b"30/test"
-    new_name = b"30/test2"
-    key = list(bytes(b"foo bar"))
-
-    put_data = [TAG_NAME, len(old_name)] + list(old_name)
-    put_data += [TAG_KEY, len(key) + 2, TYPE_TOTP | ALG_SHA1, 6] + key
-    send_apdu(reset_oath, INS_PUT, p1=0, p2=0, data=put_data)
-
-    rename_data = [TAG_NAME, len(old_name)] + list(old_name)
-    rename_data += [TAG_NAME, len(new_name)] + list(new_name)
-    send_apdu(reset_oath, INS_RENAME, p1=0, p2=0, data=rename_data)
-
-    resp = list_apdu(reset_oath)
-    exp = [TAG_NAME_LIST, len(new_name) + 1, TYPE_TOTP | ALG_SHA1] + list(new_name)
-    assert resp == exp
-
 def test_overwrite(reset_oath):
     data = data_name + data_key
     resp = send_apdu(reset_oath, INS_PUT, p1=0, p2=0, data=list(data))

workflows/autobuild.sh

@@ -22,13 +22,13 @@ cd ../..
 mkdir build_pico
 cd build_pico
 cmake -DPICO_SDK_PATH=../pico-sdk ..
-make
+make -j`nproc`
 cd ..
 elif [[ $1 == "esp32" ]]; then
 sudo apt install -y git wget flex bison gperf python3 python3-pip python3-venv cmake ninja-build ccache libffi-dev libssl-dev dfu-util libusb-1.0-0
 git clone --recursive https://github.com/espressif/esp-idf.git
 cd esp-idf
-git checkout tags/v5.5
+git checkout tags/v5.5.1
 ./install.sh esp32s3
 . ./export.sh
 cd ..