Merge pull request #995 from LedgerHQ/feat/tlv_from_apdu_improvements

apaillier-ledger · web-flow · commit de180109364e · 2026-04-17T10:59:48.000+02:00
tlv_from_apdu improvements
diff --git a/src/features/generic_tx_parser/gtp_data_path.c b/src/features/generic_tx_parser/gtp_data_path.c
@@ -8,7 +8,7 @@
 #include "app_mem_utils.h"
 #include "tx_ctx.h"
 #include "tlv_library.h"
-#include "tlv_apdu.h"
+#include "tlv_utils.h"
 
 #define DATA_PATH_TAGS(X)                                    \
     X(0x00, TAG_VERSION, handle_version, ENFORCE_UNIQUE_TAG) \
diff --git a/src/features/generic_tx_parser/gtp_field.c b/src/features/generic_tx_parser/gtp_field.c
@@ -7,7 +7,7 @@
 #include "mem_utils.h"  // mem_buffer_cleanup
 #include "lists.h"
 #include "tlv_library.h"
-#include "tlv_apdu.h"
+#include "tlv_utils.h"
 
 typedef union {
     s_param_raw_context raw_ctx;
diff --git a/src/features/generic_tx_parser/gtp_param_calldata.c b/src/features/generic_tx_parser/gtp_param_calldata.c
@@ -9,7 +9,7 @@
 #include "read.h"
 #include "tx_ctx.h"
 #include "app_mem_utils.h"
-#include "tlv_apdu.h"
+#include "tlv_utils.h"
 
 #define PARAM_CALLDATA_TAGS(X)                                 \
     X(0x00, TAG_VERSION, handle_version, ENFORCE_UNIQUE_TAG)   \
diff --git a/src/features/generic_tx_parser/gtp_param_datetime.c b/src/features/generic_tx_parser/gtp_param_datetime.c
@@ -5,7 +5,7 @@
 #include "utils.h"
 #include "shared_context.h"
 #include "tlv_library.h"
-#include "tlv_apdu.h"
+#include "tlv_utils.h"
 
 #define PARAM_DATETIME_TAGS(X)                               \
     X(0x00, TAG_VERSION, handle_version, ENFORCE_UNIQUE_TAG) \
diff --git a/src/features/generic_tx_parser/gtp_param_duration.c b/src/features/generic_tx_parser/gtp_param_duration.c
@@ -4,7 +4,7 @@
 #include "utils.h"
 #include "shared_context.h"
 #include "tlv_library.h"
-#include "tlv_apdu.h"
+#include "tlv_utils.h"
 
 #define SECONDS_IN_MINUTE 60
 #define MINUTES_IN_HOUR   60
diff --git a/src/features/generic_tx_parser/gtp_param_enum.c b/src/features/generic_tx_parser/gtp_param_enum.c
@@ -6,7 +6,7 @@
 #include "shared_context.h"
 #include "tx_ctx.h"
 #include "tlv_library.h"
-#include "tlv_apdu.h"
+#include "tlv_utils.h"
 
 #define PARAM_ENUM_TAGS(X)                                   \
     X(0x00, TAG_VERSION, handle_version, ENFORCE_UNIQUE_TAG) \
diff --git a/src/features/generic_tx_parser/gtp_param_network.c b/src/features/generic_tx_parser/gtp_param_network.c
@@ -16,7 +16,7 @@
 #include "gtp_field_table.h"
 #include "tx_ctx.h"
 #include "apdu_constants.h"
-#include "tlv_apdu.h"
+#include "tlv_utils.h"
 #include "chain_config.h"
 
 /**
diff --git a/src/features/generic_tx_parser/gtp_param_nft.c b/src/features/generic_tx_parser/gtp_param_nft.c
@@ -3,7 +3,7 @@
 #include "utils.h"
 #include "gtp_field_table.h"
 #include "tlv_library.h"
-#include "tlv_apdu.h"
+#include "tlv_utils.h"
 
 #define PARAM_NFT_TAGS(X)                                    \
     X(0x00, TAG_VERSION, handle_version, ENFORCE_UNIQUE_TAG) \
diff --git a/src/features/generic_tx_parser/gtp_param_raw.c b/src/features/generic_tx_parser/gtp_param_raw.c
@@ -8,7 +8,7 @@
 #include "utils.h"
 #include "shared_context.h"
 #include "tlv_library.h"
-#include "tlv_apdu.h"
+#include "tlv_utils.h"
 
 #define PARAM_RAW_TAGS(X)                                    \
     X(0x00, TAG_VERSION, handle_version, ENFORCE_UNIQUE_TAG) \
diff --git a/src/features/generic_tx_parser/gtp_param_token.c b/src/features/generic_tx_parser/gtp_param_token.c
@@ -7,7 +7,7 @@
 #include "gtp_field_table.h"
 #include "tx_ctx.h"
 #include "tlv_library.h"
-#include "tlv_apdu.h"
+#include "tlv_utils.h"
 
 #define PARAM_TOKEN_TAGS(X)                                  \
     X(0x00, TAG_VERSION, handle_version, ENFORCE_UNIQUE_TAG) \
diff --git a/src/features/generic_tx_parser/gtp_param_token_amount.c b/src/features/generic_tx_parser/gtp_param_token_amount.c
@@ -6,7 +6,7 @@
 #include "gtp_field_table.h"
 #include "manage_asset_info.h"
 #include "tx_ctx.h"
-#include "tlv_apdu.h"
+#include "tlv_utils.h"
 
 #define PARAM_TOKEN_AMOUNT_TAGS(X)                                           \
     X(0x00, TAG_VERSION, handle_version, ENFORCE_UNIQUE_TAG)                 \
diff --git a/src/features/generic_tx_parser/gtp_param_trusted_name.c b/src/features/generic_tx_parser/gtp_param_trusted_name.c
@@ -9,7 +9,7 @@
 #include "get_public_key.h"
 #include "apdu_constants.h"
 #include "tx_ctx.h"
-#include "tlv_apdu.h"
+#include "tlv_utils.h"
 
 #define PARAM_TRUSTED_NAME_TAGS(X)                           \
     X(0x00, TAG_VERSION, handle_version, ENFORCE_UNIQUE_TAG) \
diff --git a/src/features/generic_tx_parser/gtp_param_unit.c b/src/features/generic_tx_parser/gtp_param_unit.c
@@ -2,7 +2,7 @@
 #include "gtp_field_table.h"
 #include "shared_context.h"
 #include "tlv_library.h"
-#include "tlv_apdu.h"
+#include "tlv_utils.h"
 
 #define PARAM_UNIT_TAGS(X)                                     \
     X(0x00, TAG_VERSION, handle_version, ENFORCE_UNIQUE_TAG)   \
diff --git a/src/features/generic_tx_parser/gtp_tx_info.c b/src/features/generic_tx_parser/gtp_tx_info.c
@@ -10,7 +10,7 @@
 #include "app_mem_utils.h"
 #include "tx_ctx.h"
 #include "tlv_library.h"
-#include "tlv_apdu.h"
+#include "tlv_utils.h"
 
 #define TX_INFO_TAGS(X)                                                            \
     X(0x00, TAG_VERSION, handle_version, ENFORCE_UNIQUE_TAG)                       \
diff --git a/src/features/generic_tx_parser/gtp_value.c b/src/features/generic_tx_parser/gtp_value.c
@@ -8,7 +8,7 @@
 #include "ui_utils.h"
 #include "tx_ctx.h"
 #include "tlv_library.h"
-#include "tlv_apdu.h"
+#include "tlv_utils.h"
 
 #define VALUE_TAGS(X)                                                      \
     X(0x00, TAG_VERSION, handle_version, ENFORCE_UNIQUE_TAG)               \
diff --git a/src/features/provide_enum_value/enum_value.c b/src/features/provide_enum_value/enum_value.c
@@ -5,7 +5,7 @@
 #include "app_mem_utils.h"
 #include "proxy_info.h"
 #include "hash_bytes.h"
-#include "tlv_apdu.h"
+#include "tlv_utils.h"
 #include "lcx_ecdsa.h"
 
 #define STRUCT_VERSION 0x01
diff --git a/src/features/provide_gating/cmd_get_gating.c b/src/features/provide_gating/cmd_get_gating.c
@@ -26,6 +26,7 @@
 #include "get_public_key.h"
 #include "tlv_library.h"
 #include "tlv_apdu.h"
+#include "tlv_utils.h"
 #include "utils.h"
 #include "nbgl_use_case.h"
 #include "os_pki.h"
diff --git a/src/features/provide_network_info/network_info.c b/src/features/provide_network_info/network_info.c
@@ -8,7 +8,7 @@
 #include "ui_utils.h"
 #include "mem_utils.h"
 #include "tlv_library.h"
-#include "tlv_apdu.h"
+#include "tlv_utils.h"
 #include "lcx_ecdsa.h"
 
 #define TYPE_DYNAMIC_NETWORK   0x08
diff --git a/src/features/provide_proxy_info/proxy_info.c b/src/features/provide_proxy_info/proxy_info.c
@@ -5,7 +5,7 @@
 #include "ui_utils.h"
 #include "app_mem_utils.h"
 #include "hash_bytes.h"
-#include "tlv_apdu.h"
+#include "tlv_utils.h"
 #include "lcx_ecdsa.h"
 
 #define TYPE_PROXY_INFO 0x26
diff --git a/src/features/provide_safe_account/safe_descriptor.c b/src/features/provide_safe_account/safe_descriptor.c
@@ -6,7 +6,7 @@
 #include "public_keys.h"
 #include "lcx_ecdsa.h"
 #include "tlv_library.h"
-#include "tlv_apdu.h"
+#include "tlv_utils.h"
 #include "utils.h"
 
 #define TYPE_LESM_ACCOUNT_INFO 0x27
diff --git a/src/features/provide_safe_account/signer_descriptor.c b/src/features/provide_safe_account/signer_descriptor.c
@@ -7,7 +7,7 @@
 #include "public_keys.h"
 #include "lcx_ecdsa.h"
 #include "tlv_library.h"
-#include "tlv_apdu.h"
+#include "tlv_utils.h"
 #include "utils.h"
 
 #define TYPE_VERIFIABLE_ADDRESS 0x0A
diff --git a/src/features/provide_trusted_name/trusted_name.c b/src/features/provide_trusted_name/trusted_name.c
@@ -10,7 +10,7 @@
 #include "ui_utils.h"
 #include "app_mem_utils.h"
 #include "crypto_helpers.h"
-#include "tlv_apdu.h"
+#include "tlv_utils.h"
 #include "lcx_ecdsa.h"
 #include "shared_context.h"  // CX_SECP256_PUB_KEY_SIZE
 #include "ox_ec.h"
diff --git a/src/features/provide_tx_simulation/cmd_get_tx_simulation.c b/src/features/provide_tx_simulation/cmd_get_tx_simulation.c
@@ -7,6 +7,7 @@
 #include "get_public_key.h"
 #include "tlv_library.h"
 #include "tlv_apdu.h"
+#include "tlv_utils.h"
 #include "utils.h"
 #include "nbgl_use_case.h"
 #include "os_pki.h"
diff --git a/src/features/sign_authorization_eip7702/auth_7702.c b/src/features/sign_authorization_eip7702/auth_7702.c
@@ -1,6 +1,6 @@
 #include "auth_7702.h"
 #include "utils.h"
-#include "tlv_apdu.h"
+#include "tlv_utils.h"
 
 #define STRUCT_VERSION 0x01
 
diff --git a/src/tlv_apdu.c b/src/tlv_apdu.c
diff --git a/src/tlv_apdu.h b/src/tlv_apdu.h
diff --git a/src/tlv_utils.c b/src/tlv_utils.c
diff --git a/src/tlv_utils.h b/src/tlv_utils.h
diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt
