From d11bbde2e176c073149c2cdb8ef6f58f231d88b1 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 12 Jan 2018 13:50:34 +0100 Subject: [PATCH] trezor.crypto: fix sha3-{256,512} argument handling --- embed/extmod/modtrezorcrypto/modtrezorcrypto-sha3-256.h | 2 +- embed/extmod/modtrezorcrypto/modtrezorcrypto-sha3-512.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/embed/extmod/modtrezorcrypto/modtrezorcrypto-sha3-256.h b/embed/extmod/modtrezorcrypto/modtrezorcrypto-sha3-256.h index 8d27fcff..f5815d99 100644 --- a/embed/extmod/modtrezorcrypto/modtrezorcrypto-sha3-256.h +++ b/embed/extmod/modtrezorcrypto/modtrezorcrypto-sha3-256.h @@ -60,7 +60,7 @@ STATIC mp_obj_t mod_trezorcrypto_Sha3_256_digest(size_t n_args, const mp_obj_t * uint8_t out[SHA3_256_DIGEST_LENGTH]; SHA3_CTX ctx; memcpy(&ctx, &(o->ctx), sizeof(SHA3_CTX)); - if (n_args >= 1 && args[1] == mp_const_true) { + if (n_args > 1 && args[1] == mp_const_true) { keccak_Final(&ctx, out); } else { sha3_Final(&ctx, out); diff --git a/embed/extmod/modtrezorcrypto/modtrezorcrypto-sha3-512.h b/embed/extmod/modtrezorcrypto/modtrezorcrypto-sha3-512.h index c44cb106..5e720f59 100644 --- a/embed/extmod/modtrezorcrypto/modtrezorcrypto-sha3-512.h +++ b/embed/extmod/modtrezorcrypto/modtrezorcrypto-sha3-512.h @@ -60,7 +60,7 @@ STATIC mp_obj_t mod_trezorcrypto_Sha3_512_digest(size_t n_args, const mp_obj_t * uint8_t out[SHA3_512_DIGEST_LENGTH]; SHA3_CTX ctx; memcpy(&ctx, &(o->ctx), sizeof(SHA3_CTX)); - if (n_args >= 1 && args[1] == mp_const_true) { + if (n_args > 1 && args[1] == mp_const_true) { keccak_Final(&ctx, out); } else { sha3_Final(&ctx, out);