[update] Branch develop | Commit 29389646ec61264be5f1af2fb4c32210b9e92c9c

[update] Branch develop | Commit 831eee239c65d80b8e9c294bccab68489b0c9667

Author: ldg-github-ci

CHANGELOG.md

@@ -5,7 +5,15 @@
 | :rotating_light:     | Breaks build                  |
 | :warning:            | Breaks compatibility with app |
 
-## [latest](/) - 2024/02/07
+## [latest](/) - 2024/03/27
+
+### Changed
+
+* Add new functions `getEthAddressFromRawKey` and `getEthAddressStringFromRawKey`
+* Simplify crypto calls in `getEthAddressStringFromBinary`
+* Cleanup useless `cx_sha3_t` useless parameter
+
+## [0a98664](/../../commit/0a98664) - 2024/02/07
 
 ### Removed
 

src/common_utils.c

@@ -20,6 +20,8 @@
 
 #include "asset_info.h"
 #include "common_utils.h"
+#include "lcx_ecfp.h"
+#include "lcx_sha3.h"
 
 void array_hexstr(char *strbuf, const void *bin, unsigned int len) {
     while (len--) {
@@ -214,55 +216,23 @@ bool amountToString(const uint8_t *amount,
     return true;
 }
 
-bool getEthAddressFromKey(cx_ecfp_public_key_t *publicKey, uint8_t *out, cx_sha3_t *sha3Context) {
-    uint8_t hashAddress[INT256_LENGTH];
-
-    if (cx_keccak_init_no_throw(sha3Context, 256) != CX_OK) {
-        return false;
-    }
-
-    if (cx_hash_no_throw((cx_hash_t *) sha3Context,
-                         CX_LAST,
-                         publicKey->W + 1,
-                         64,
-                         hashAddress,
-                         32) != CX_OK) {
-        return false;
-    }
-
-    memmove(out, hashAddress + 12, 20);
-    return true;
+void getEthAddressFromRawKey(const uint8_t raw_pubkey[static 65],
+                             uint8_t out[static ADDRESS_LENGTH]) {
+    uint8_t hashAddress[CX_KECCAK_256_SIZE];
+    CX_ASSERT(cx_keccak_256_hash(raw_pubkey + 1, 64, hashAddress));
+    memmove(out, hashAddress + 12, ADDRESS_LENGTH);
 }
 
-bool getEthAddressStringFromKey(cx_ecfp_public_key_t *publicKey,
-                                char *out,
-                                cx_sha3_t *sha3Context,
-                                uint64_t chainId) {
-    uint8_t hashAddress[INT256_LENGTH];
-
-    if (cx_keccak_init_no_throw(sha3Context, 256) != CX_OK) {
-        return false;
-    }
-
-    if (cx_hash_no_throw((cx_hash_t *) sha3Context,
-                         CX_LAST,
-                         publicKey->W + 1,
-                         64,
-                         hashAddress,
-                         32) != CX_OK) {
-        return false;
-    }
-
-    if (!getEthAddressStringFromBinary(hashAddress + 12, out, sha3Context, chainId)) {
-        return false;
-    }
-
-    return true;
+void getEthAddressStringFromRawKey(const uint8_t raw_pubkey[static 65],
+                                   char out[static ADDRESS_LENGTH * 2],
+                                   uint64_t chainId) {
+    uint8_t hashAddress[CX_KECCAK_256_SIZE];
+    CX_ASSERT(cx_keccak_256_hash(raw_pubkey + 1, 64, hashAddress));
+    getEthAddressStringFromBinary(hashAddress + 12, out, chainId);
 }
 
 bool getEthAddressStringFromBinary(uint8_t *address,
-                                   char *out,
-                                   cx_sha3_t *sha3Context,
+                                   char out[static ADDRESS_LENGTH * 2],
                                    uint64_t chainId) {
     // save some precious stack space
     union locals_union {
@@ -292,18 +262,10 @@ bool getEthAddressStringFromBinary(uint8_t *address,
         locals_union.tmp[offset + 2 * i] = HEXDIGITS[(digit >> 4) & 0x0f];
         locals_union.tmp[offset + 2 * i + 1] = HEXDIGITS[digit & 0x0f];
     }
-    if (cx_keccak_init_no_throw(sha3Context, 256) != CX_OK) {
+    if (cx_keccak_256_hash(locals_union.tmp, offset + 40, locals_union.hashChecksum) != CX_OK) {
         return false;
     }
 
-    if (cx_hash_no_throw((cx_hash_t *) sha3Context,
-                         CX_LAST,
-                         locals_union.tmp,
-                         offset + 40,
-                         locals_union.hashChecksum,
-                         32) != CX_OK) {
-        return false;
-    }
     for (i = 0; i < 40; i++) {
         uint8_t digit = address[i / 2];
         if ((i % 2) == 0) {
@@ -329,20 +291,15 @@ bool getEthAddressStringFromBinary(uint8_t *address,
 
 /* Fills the `out` buffer with the lowercase string representation of the pubkey passed in as binary
 format by `in`. (eg: uint8_t*:0xb47e3cd837dDF8e4c57F05d70Ab865de6e193BBB ->
-char*:"0xb47e3cd837dDF8e4c57F05d70Ab865de6e193BBB\0" )
-`sha3` context doesn't have have to be initialized prior to call.*/
-bool getEthDisplayableAddress(uint8_t *in,
-                              char *out,
-                              size_t out_len,
-                              cx_sha3_t *sha3,
-                              uint64_t chainId) {
+char*:"0xb47e3cd837dDF8e4c57F05d70Ab865de6e193BBB\0" ).*/
+bool getEthDisplayableAddress(uint8_t *in, char *out, size_t out_len, uint64_t chainId) {
     if (out_len < 43) {
         strlcpy(out, "ERROR", out_len);
         return false;
     }
     out[0] = '0';
     out[1] = 'x';
-    if (!getEthAddressStringFromBinary(in, out + 2, sha3, chainId)) {
+    if (!getEthAddressStringFromBinary(in, out + 2, chainId)) {
         strlcpy(out, "ERROR", out_len);
         return false;
     }

src/common_utils.h

@@ -56,23 +56,18 @@ bool adjustDecimals(const char *src,
                     size_t targetLength,
                     uint8_t decimals);
 
-bool getEthAddressFromKey(cx_ecfp_public_key_t *publicKey, uint8_t *out, cx_sha3_t *sha3Context);
+void getEthAddressFromRawKey(const uint8_t raw_pubkey[static 65],
+                             uint8_t out[static ADDRESS_LENGTH]);
 
-bool getEthAddressStringFromKey(cx_ecfp_public_key_t *publicKey,
-                                char *out,
-                                cx_sha3_t *sha3Context,
-                                uint64_t chainId);
+void getEthAddressStringFromRawKey(const uint8_t raw_pubkey[static 65],
+                                   char out[static ADDRESS_LENGTH * 2],
+                                   uint64_t chainId);
 
 bool getEthAddressStringFromBinary(uint8_t *address,
-                                   char *out,
-                                   cx_sha3_t *sha3Context,
+                                   char out[static ADDRESS_LENGTH * 2],
                                    uint64_t chainId);
 
-bool getEthDisplayableAddress(uint8_t *in,
-                              char *out,
-                              size_t out_len,
-                              cx_sha3_t *sha3,
-                              uint64_t chainId);
+bool getEthDisplayableAddress(uint8_t *in, char *out, size_t out_len, uint64_t chainId);
 
 static __attribute__((no_instrument_function)) inline int allzeroes(const void *buf, size_t n) {
     uint8_t *p = (uint8_t *) buf;

src/eth_plugin_interface.h

@@ -90,7 +90,7 @@ typedef struct ethPluginSharedRO_s {
 
 // Plugin-only memory allocated by the Ethereum application and used by the plugin.
 #define PLUGIN_CONTEXT_SIZE (5 * INT256_LENGTH)
-// It is recommended to cast the raw uin8_t array to a structure meaningfull for your plugin
+// It is recommended to cast the raw uin8_t array to a structure meaningful for your plugin
 // Helper to check that the actual plugin context structure is not bigger than the allocated memory
 #define ASSERT_SIZEOF_PLUGIN_CONTEXT(s) \
     _Static_assert(sizeof(s) <= PLUGIN_CONTEXT_SIZE, "Plugin context structure is too big.")