Correctly initialize and update git submodules for IDF in autobuild.sh

Fixing autobuild script so ESP32 binaries now built correctly

CMakeLists.txt

@@ -83,7 +83,7 @@ set(SOURCES ${SOURCES}
     ${CMAKE_CURRENT_LIST_DIR}/src/hsm/kek.c
 )
 
-SET_VERSION(ver_major ver_minor "${CMAKE_CURRENT_LIST_DIR}/src/hsm/version.h" 3)
+SET_VERSION(ver_major ver_minor "${CMAKE_CURRENT_LIST_DIR}/src/hsm/version.h" 2)
 
 if(ESP_PLATFORM)
     project(pico_hsm)

build_pico_hsm.sh

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

sdkconfig.defaults

@@ -9,7 +9,6 @@ CONFIG_TINYUSB_TASK_STACK_SIZE=16384
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="pico-keys-sdk/config/esp32/partitions.csv"
 CONFIG_PARTITION_TABLE_FILENAME="pico-keys-sdk/config/esp32/partitions.csv"
-CONFIG_PARTITION_TABLE_OFFSET=0x10000
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y

src/hsm/files.c

@@ -18,7 +18,7 @@
 #include "files.h"
 
 extern const uint8_t sc_hsm_aid[];
-/* extern int parse_token_info(const file_t *f, int mode); */
+extern int parse_token_info(const file_t *f, int mode);
 extern int parse_ef_dir(const file_t *f, int mode);
 
 file_t file_entries[] = {
@@ -32,7 +32,7 @@ file_t file_entries[] = {
                .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH | FILE_PERSISTENT, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0 } },                                                                                                                             //EF.GDO
     /*  4 */ { .fid = 0x2f03, .parent = 5, .name = NULL,
-               .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH, .data = NULL,                                                      // ToDo: Check why callback to parse_token_info will cause a crash of the pico
+               .type = FILE_TYPE_WORKING_EF | FILE_DATA_FUNC, .data = (uint8_t *) parse_token_info,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = { 0 } },                                                                                                                                //EF.TokenInfo
     /*  5 */ { .fid = 0x5015, .parent = 0, .name = NULL, .type = FILE_TYPE_DF, .data = NULL,
                .ef_structure = 0, .acl = { 0 } },                                                                                 //DF.PKCS15

src/hsm/kek.c

@@ -37,6 +37,19 @@ uint8_t mkek_mask[MKEK_KEY_SIZE];
 bool has_mkek_mask = false;
 uint8_t pending_save_dkek = 0xff;
 
+#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++) {

src/hsm/sc_hsm.c

@@ -52,7 +52,6 @@ static int sc_hsm_process_apdu();
 
 static void init_sc_hsm();
 static int sc_hsm_unload();
-static const char *get_card_label();
 
 extern int cmd_select();
 extern void select_file(file_t *pe);
@@ -278,31 +277,6 @@ uint16_t get_device_options() {
     return 0x0;
 }
 
-const char *get_card_label() {
-    file_t *tokeninfo = search_file(EF_TOKENINFO);
-    if (tokeninfo && (tokeninfo->type & FILE_DATA_FLASH) && tokeninfo->data != NULL && file_get_size(tokeninfo) > 0) {
-        uint16_t tag = 0x0;
-        uint8_t *tag_data = NULL, *p = NULL;
-        uint16_t tag_len = 0;
-        asn1_ctx_t ctxi;
-        asn1_ctx_init(file_get_data(tokeninfo), file_get_size(tokeninfo), &ctxi);
-        while (walk_tlv(&ctxi, &p, &tag, &tag_len, &tag_data)) {
-            if (tag == 0x5F20 && tag_len > 0) {
-                static char label_buf[256];
-                uint16_t len = tag_len < sizeof(label_buf) ? tag_len : sizeof(label_buf) - 1;
-                memcpy(label_buf, tag_data, len);
-                label_buf[len] = 0;
-                return label_buf;
-            }
-        }
-    }
-#ifdef __FOR_CI
-    return "SmartCard-HSM";
-#else
-    return "Pico-HSM";
-#endif
-}
-
 bool wait_button_pressed() {
     uint32_t val = EV_PRESS_BUTTON;
 #ifndef ENABLE_EMULATION
@@ -319,7 +293,11 @@ bool wait_button_pressed() {
 
 int parse_token_info(const file_t *f, int mode) {
     (void)f;
-    const char *label = get_card_label();
+#ifdef __FOR_CI
+    char *label = "SmartCard-HSM";
+#else
+    char *label = "Pico-HSM";
+#endif
     char *manu = "Pol Henarejos";
     if (mode == 1) {
         uint8_t *p = res_APDU;
@@ -342,7 +320,11 @@ int parse_token_info(const file_t *f, int mode) {
 
 int parse_ef_dir(const file_t *f, int mode) {
     (void)f;
-    const char *label = get_card_label();
+#ifdef __FOR_CI
+    char *label = "SmartCard-HSM";
+#else
+    char *label = "Pico-HSM";
+#endif
     if (mode == 1) {
         uint8_t *p = res_APDU;
         *p++ = 0x61;

src/hsm/version.h

@@ -18,7 +18,7 @@
 #ifndef __VERSION_H_
 #define __VERSION_H_
 
-#define HSM_VERSION 0x0604
+#define HSM_VERSION 0x0602
 
 #define HSM_VERSION_MAJOR ((HSM_VERSION >> 8) & 0xff)
 #define HSM_VERSION_MINOR (HSM_VERSION & 0xff)

workflows/autobuild.sh

@@ -29,6 +29,7 @@ sudo apt install -y git wget flex bison gperf python3 python3-pip python3-venv c
 git clone --recursive https://github.com/espressif/esp-idf.git
 cd esp-idf
 git checkout tags/v5.5
+git submodule update --init --recursive
 ./install.sh esp32s3
 . ./export.sh
 cd ..