base58: use base58 encoding from ledger SDK

trilitech · Mar 4, 2024 · bba3c8a · bba3c8a
1 parent 993358a
commit bba3c8a
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 78 deletions.
diff --git a/src/apdu_sign.c b/src/apdu_sign.c
@@ -2,7 +2,6 @@
 
 #include "apdu.h"
 #include "baking_auth.h"
-#include "base58_encoding.h"
 #include "globals.h"
 #include "keys.h"
 #include "memory.h"

diff --git a/src/base58_encoding.c b/src/base58_encoding.c
diff --git a/src/base58_encoding.h b/src/base58_encoding.h
diff --git a/src/to_string.c b/src/to_string.c
@@ -1,7 +1,8 @@
 #include "to_string.h"
 
+#include <base58.h>
+
 #include "apdu.h"
-#include "base58_encoding.h"
 #include "keys.h"
 
 #include <string.h>
@@ -107,8 +108,7 @@ void pkh_to_string(char *const buff,
     memcpy(data.hash, hash, sizeof(data.hash));
     compute_hash_checksum(data.checksum, &data, sizeof(data) - sizeof(data.checksum));
 
-    size_t out_size = buff_size;
-    if (!b58enc(buff, &out_size, &data, sizeof(data))) {
+    if (base58_encode((const uint8_t *) &data, sizeof(data), buff, buff_size) == -1) {
         THROW(EXC_WRONG_LENGTH);
     }
 }
@@ -131,8 +131,7 @@ void chain_id_to_string(char *const buff, size_t const buff_size, chain_id_t con
 
     compute_hash_checksum(data.checksum, &data, sizeof(data) - sizeof(data.checksum));
 
-    size_t out_size = buff_size;
-    if (!b58enc(buff, &out_size, &data, sizeof(data))) {
+    if (base58_encode((const uint8_t *) &data, sizeof(data), buff, buff_size) == -1) {
         THROW(EXC_WRONG_LENGTH);
     }
 }

diff --git a/src/ui_sign_bagl.c b/src/ui_sign_bagl.c
@@ -3,7 +3,6 @@
 
 #include "apdu.h"
 #include "baking_auth.h"
-#include "base58_encoding.h"
 #include "globals.h"
 #include "keys.h"
 #include "memory.h"

diff --git a/src/ui_sign_nbgl.c b/src/ui_sign_nbgl.c
@@ -4,7 +4,6 @@
 
 #include "apdu.h"
 #include "baking_auth.h"
-#include "base58_encoding.h"
 #include "globals.h"
 #include "keys.h"
 #include "memory.h"