Upgrade to Mbedtls 3.6

polhenarejos · polhenarejos · commit c4a08aff0f3c · 2024-06-21T21:29:32.000+02:00
Signed-off-by: Pol Henarejos &lt;pol.henarejos@cttc.es&gt;
diff --git a/pico-keys-sdk b/pico-keys-sdk
@@ -1 +1 @@
-Subproject commit 218441a45a50993c585ad74b3d0a632d2cf1124e
+Subproject commit f8480291fe2325b6658ee94320aa028eeec98b23
diff --git a/src/hsm/sc_hsm.c b/src/hsm/sc_hsm.c
@@ -513,9 +513,8 @@ int store_keys(void *key_ctx, int type, uint8_t key_id) {
     }
     else if (type & PICO_KEYS_KEY_EC) {
         mbedtls_ecdsa_context *ecdsa = (mbedtls_ecdsa_context *) key_ctx;
-        key_size = (uint16_t)mbedtls_mpi_size(&ecdsa->d);
         kdata[0] = ecdsa->grp.id & 0xff;
-        mbedtls_ecp_write_key(ecdsa, kdata + 1, key_size);
+        mbedtls_ecp_write_key_ext(ecdsa, (size_t *)&key_size, kdata + 1, sizeof(kdata) - 1);
         key_size++;
     }
     else if (type & PICO_KEYS_KEY_AES) {

Original file line number	Diff line number	Diff line change
`@@ -513,9 +513,8 @@ int store_keys(void *key_ctx, int type, uint8_t key_id) {`
`513`	`513`	`}`
`514`	`514`	`else if (type & PICO_KEYS_KEY_EC) {`
`515`	`515`	`mbedtls_ecdsa_context ecdsa = (mbedtls_ecdsa_context ) key_ctx;`
`516`		`- key_size = (uint16_t)mbedtls_mpi_size(&ecdsa->d);`
`517`	`516`	`kdata[0] = ecdsa->grp.id & 0xff;`
`518`		`- mbedtls_ecp_write_key(ecdsa, kdata + 1, key_size);`
	`517`	`+ mbedtls_ecp_write_key_ext(ecdsa, (size_t *)&key_size, kdata + 1, sizeof(kdata) - 1);`
`519`	`518`	`key_size++;`
`520`	`519`	`}`
`521`	`520`	`else if (type & PICO_KEYS_KEY_AES) {`