Export cx_cipher_reset and CMAC functions to the crypto library

LedgerHQ · May 14, 2024 · 4e31bc4 · 4e31bc4
1 parent 5cf15f5
commit 4e31bc4
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git a/include/cx_stubs.h b/include/cx_stubs.h
@@ -141,3 +141,7 @@
 #define _NR_cx_eddsa_verify_init_hash            0x89
 #define _NR_cx_eddsa_verify_hash                 0x8a
 #define _NR_cx_aes_siv_update_mac                0x8b
+#define _NR_cx_cipher_reset                      0x8c
+#define _NR_cx_cmac_start                        0x8d
+#define _NR_cx_cmac_update                       0x8e
+#define _NR_cx_cmac_finish                       0x8f
diff --git a/lib_cxng/cx.export b/lib_cxng/cx.export
@@ -144,3 +144,7 @@ cx_eddsa_update_hash
 cx_eddsa_verify_init_hash
 cx_eddsa_verify_hash
 cx_aes_siv_update_mac
+cx_cipher_reset
+cx_cmac_start
+cx_cmac_update
+cx_cmac_finish
diff --git a/lib_cxng/src/cx_exported_functions.c b/lib_cxng/src/cx_exported_functions.c
@@ -165,4 +165,8 @@ unsigned long __attribute((section("._cx_exported_functions"))) cx_exported_func
     [_NR_cx_eddsa_verify_init_hash]       = (unsigned long) cx_eddsa_verify_init_hash,
     [_NR_cx_eddsa_verify_hash]            = (unsigned long) cx_eddsa_verify_hash,
     [_NR_cx_aes_siv_update_mac]           = (unsigned long) cx_aes_siv_update_mac,
+    [_NR_cx_cipher_reset]                 = (unsigned long) cx_cipher_reset,
+    [_NR_cx_cmac_start]                   = (unsigned long) cx_cmac_start,
+    [_NR_cx_cmac_update]                  = (unsigned long) cx_cmac_update,
+    [_NR_cx_cmac_finish]                  = (unsigned long) cx_cmac_finish,
 };
diff --git a/src/cx_stubs.S b/src/cx_stubs.S
@@ -156,6 +156,10 @@ CX_TRAMPOLINE _NR_cx_eddsa_update_hash                     cx_eddsa_update_hash
 CX_TRAMPOLINE _NR_cx_eddsa_verify_init_hash                cx_eddsa_verify_init_hash
 CX_TRAMPOLINE _NR_cx_eddsa_verify_hash                     cx_eddsa_verify_hash
 CX_TRAMPOLINE _NR_cx_aes_siv_update_mac                    cx_aes_siv_update_mac
+CX_TRAMPOLINE _NR_cx_cipher_reset                          cx_cipher_reset
+CX_TRAMPOLINE _NR_cx_cmac_start                            cx_cmac_start
+CX_TRAMPOLINE _NR_cx_cmac_update                           cx_cmac_update
+CX_TRAMPOLINE _NR_cx_cmac_finish                           cx_cmac_finish
 
 .thumb_func
 cx_trampoline_helper: