From 9ea1217d3fa084a470da92d5de0c175bd0f12b02 Mon Sep 17 00:00:00 2001 From: Carlos Medeiros Date: Thu, 22 Feb 2024 15:57:24 +0000 Subject: [PATCH] use ripemd160 oneshot and update makefile --- app/Makefile | 1 - app/src/crypto.c | 9 +-------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/app/Makefile b/app/Makefile index 8b86d4e7..de57f0fc 100755 --- a/app/Makefile +++ b/app/Makefile @@ -69,7 +69,6 @@ endif include $(CURDIR)/../deps/ledger-zxlib/makefiles/Makefile.platform -DEFINES += HAVE_SHA3 HAVE_HASH HAVE_BLAKE2 HAVE_SHA256 HAVE_SHA512 APP_SOURCE_PATH += $(MY_DIR)/../deps/jsmn/src .PHONY: rust diff --git a/app/src/crypto.c b/app/src/crypto.c index c49d8142..fc20dc2b 100644 --- a/app/src/crypto.c +++ b/app/src/crypto.c @@ -163,13 +163,6 @@ zxerr_t crypto_sign(uint8_t *output, return error; } -static zxerr_t ripemd160_32(uint8_t *out, uint8_t *in) { - cx_ripemd160_t rip160; - CHECK_CX_OK(cx_ripemd160_init_no_throw(&rip160)); - CHECK_CX_OK(cx_hash_no_throw(&rip160.header, CX_LAST, in, CX_SHA256_SIZE, out, CX_RIPEMD160_SIZE)); - return zxerr_ok; -} - zxerr_t crypto_fillAddress(uint8_t *buffer, uint16_t buffer_len, uint16_t *addrResponseLen) { if (buffer_len < PK_LEN_SECP256K1 + 50) { return zxerr_buffer_too_small; @@ -188,7 +181,7 @@ zxerr_t crypto_fillAddress(uint8_t *buffer, uint16_t buffer_len, uint16_t *addrR // Hash it cx_hash_sha256(buffer, PK_LEN_SECP256K1, hashed1_pk, CX_SHA256_SIZE); uint8_t hashed2_pk[CX_RIPEMD160_SIZE] = {0}; - CHECK_ZXERR(ripemd160_32(hashed2_pk, hashed1_pk)); + CHECK_CX_OK(cx_ripemd160_hash(hashed1_pk, CX_SHA256_SIZE, hashed2_pk)); CHECK_ZXERR(bech32EncodeFromBytes(addr, buffer_len - PK_LEN_SECP256K1, bech32_hrp, hashed2_pk, CX_RIPEMD160_SIZE, 1, BECH32_ENCODING_BECH32)); break; }