From 842919a26b9027027ca6a2ba49419c4162fffdda Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Mon, 15 Apr 2024 23:45:30 +0200 Subject: [PATCH] Use external unique ID. Signed-off-by: Pol Henarejos --- pico-keys-sdk | 2 +- src/hsm/CMakeLists.txt | 2 +- src/hsm/sc_hsm.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pico-keys-sdk b/pico-keys-sdk index 7def35f..8d86a8c 160000 --- a/pico-keys-sdk +++ b/pico-keys-sdk @@ -1 +1 @@ -Subproject commit 7def35f87cfb79ac52c203a31bb5282b20dde0a9 +Subproject commit 8d86a8c56b4e8dd4b525570d2ca324a29d5b901a diff --git a/src/hsm/CMakeLists.txt b/src/hsm/CMakeLists.txt index 5a60962..31d66c9 100644 --- a/src/hsm/CMakeLists.txt +++ b/src/hsm/CMakeLists.txt @@ -1,6 +1,6 @@ idf_component_register( SRCS ${SOURCES} INCLUDE_DIRS . ../../pico-keys-sdk/src ../../pico-keys-sdk/src/fs ../../pico-keys-sdk/src/rng ../../pico-keys-sdk/src/usb - REQUIRES bootloader_support esp_partition esp_tinyusb zorxx__neopixel mbedtls + REQUIRES bootloader_support esp_partition esp_tinyusb zorxx__neopixel mbedtls efuse ) idf_component_set_property(${COMPONENT_NAME} WHOLE_ARCHIVE ON) diff --git a/src/hsm/sc_hsm.c b/src/hsm/sc_hsm.c index d4ccb68..82a2334 100644 --- a/src/hsm/sc_hsm.c +++ b/src/hsm/sc_hsm.c @@ -301,7 +301,7 @@ int parse_token_info(const file_t *f, int mode) { *p++ = 0; //set later *p++ = 0x2; *p++ = 1; *p++ = HSM_VERSION_MAJOR; #ifndef ENABLE_EMULATION - *p++ = 0x4; *p++ = 8; pico_get_unique_board_id((pico_unique_board_id_t *) p); p += 8; + *p++ = 0x4; *p++ = 8; memcpy(p, pico_serial.id, 8); p += 8; #else *p++ = 0x4; *p++ = 8; memset(p, 0, 8); p += 8; #endif