From 11d424cdef7992dee5bfad833d08e2b2117767f1 Mon Sep 17 00:00:00 2001 From: Saleem Rashid Date: Wed, 26 Jul 2017 16:54:04 +0100 Subject: [PATCH] vendor: Update trezor-crypto --- firmware/ethereum.c | 2 +- firmware/layout2.c | 15 ++++----------- vendor/trezor-crypto | 2 +- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/firmware/ethereum.c b/firmware/ethereum.c index ede2c27..cf8e9a7 100644 --- a/firmware/ethereum.c +++ b/firmware/ethereum.c @@ -228,7 +228,7 @@ static void ethereumFormatAmount(const bignum256 *amnt, const TokenType *token, default: suffix = " UNKN"; break; // unknown chain } } - bn_format(amnt, NULL, suffix, decimals, buf, buflen); + bn_format(amnt, NULL, suffix, decimals, 0, false, buf, buflen); } static void layoutEthereumConfirmTx(const uint8_t *to, uint32_t to_len, const uint8_t *value, uint32_t value_len, const TokenType *token) diff --git a/firmware/layout2.c b/firmware/layout2.c index e9a5578..c456987 100644 --- a/firmware/layout2.c +++ b/firmware/layout2.c @@ -98,9 +98,7 @@ void layoutHome(void) void layoutConfirmOutput(const CoinType *coin, const TxOutputType *out) { char str_out[32]; - bignum256 amnt; - bn_read_uint64(out->amount, &amnt); - bn_format(&amnt, NULL, coin->has_coin_shortcut ? coin->coin_shortcut : NULL, BITCOIN_DIVISIBILITY, str_out, sizeof(str_out)); + bn_format_uint64(out->amount, NULL, coin->has_coin_shortcut ? coin->coin_shortcut : NULL, BITCOIN_DIVISIBILITY, 0, false, str_out, sizeof(str_out)); static char first_half[17 + 1]; strlcpy(first_half, out->address, sizeof(first_half)); layoutDialogSwipe(&bmp_icon_question, @@ -119,11 +117,8 @@ void layoutConfirmOutput(const CoinType *coin, const TxOutputType *out) void layoutConfirmTx(const CoinType *coin, uint64_t amount_out, uint64_t amount_fee) { char str_out[32], str_fee[32]; - bignum256 amnt; - bn_read_uint64(amount_out, &amnt); - bn_format(&amnt, NULL, coin->has_coin_shortcut ? coin->coin_shortcut : NULL, BITCOIN_DIVISIBILITY, str_out, sizeof(str_out)); - bn_read_uint64(amount_fee, &amnt); - bn_format(&amnt, NULL, coin->has_coin_shortcut ? coin->coin_shortcut : NULL, BITCOIN_DIVISIBILITY, str_fee, sizeof(str_fee)); + bn_format_uint64(amount_out, NULL, coin->has_coin_shortcut ? coin->coin_shortcut : NULL, BITCOIN_DIVISIBILITY, 0, false, str_out, sizeof(str_out)); + bn_format_uint64(amount_fee, NULL, coin->has_coin_shortcut ? coin->coin_shortcut : NULL, BITCOIN_DIVISIBILITY, 0, false, str_fee, sizeof(str_fee)); layoutDialogSwipe(&bmp_icon_question, _("Cancel"), _("Confirm"), @@ -140,9 +135,7 @@ void layoutConfirmTx(const CoinType *coin, uint64_t amount_out, uint64_t amount_ void layoutFeeOverThreshold(const CoinType *coin, uint64_t fee) { char str_fee[32]; - bignum256 amnt; - bn_read_uint64(fee, &amnt); - bn_format(&amnt, NULL, coin->has_coin_shortcut ? coin->coin_shortcut : NULL, BITCOIN_DIVISIBILITY, str_fee, sizeof(str_fee)); + bn_format_uint64(fee, NULL, coin->has_coin_shortcut ? coin->coin_shortcut : NULL, BITCOIN_DIVISIBILITY, 0, false, str_fee, sizeof(str_fee)); layoutDialogSwipe(&bmp_icon_question, _("Cancel"), _("Confirm"), diff --git a/vendor/trezor-crypto b/vendor/trezor-crypto index dfdb4d2..66993f9 160000 --- a/vendor/trezor-crypto +++ b/vendor/trezor-crypto @@ -1 +1 @@ -Subproject commit dfdb4d2d766506e9f54dd2c69c5e664fe4e39304 +Subproject commit 66993f9e9248d9d74a0c9997a95461bcd4a9dbe8