From 8e9ae534c0d5633d36735910a6c2a1420d1457cf Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 15 Jun 2018 10:31:21 +0200 Subject: [PATCH] embed/extmod/modtrezorcrypto: fix last commit, update trezor-crypto --- SConscript.firmware | 1 + SConscript.unix | 1 + embed/extmod/modtrezorcrypto/modtrezorcrypto-blake2b.h | 2 +- vendor/trezor-crypto | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/SConscript.firmware b/SConscript.firmware index be4bb8f42..6d660631f 100644 --- a/SConscript.firmware +++ b/SConscript.firmware @@ -62,6 +62,7 @@ SOURCE_MOD += [ 'vendor/trezor-crypto/ed25519-donna/ed25519-keccak.c', 'vendor/trezor-crypto/ed25519-donna/ed25519-sha3.c', 'vendor/trezor-crypto/ed25519-donna/modm-donna-32bit.c', + 'vendor/trezor-crypto/groestl.c', 'vendor/trezor-crypto/hasher.c', 'vendor/trezor-crypto/hmac.c', 'vendor/trezor-crypto/memzero.c', diff --git a/SConscript.unix b/SConscript.unix index 818d511ac..83f1a3c84 100644 --- a/SConscript.unix +++ b/SConscript.unix @@ -59,6 +59,7 @@ SOURCE_MOD += [ 'vendor/trezor-crypto/ed25519-donna/ed25519-keccak.c', 'vendor/trezor-crypto/ed25519-donna/ed25519-sha3.c', 'vendor/trezor-crypto/ed25519-donna/modm-donna-32bit.c', + 'vendor/trezor-crypto/groestl.c', 'vendor/trezor-crypto/hasher.c', 'vendor/trezor-crypto/hmac.c', 'vendor/trezor-crypto/memzero.c', diff --git a/embed/extmod/modtrezorcrypto/modtrezorcrypto-blake2b.h b/embed/extmod/modtrezorcrypto/modtrezorcrypto-blake2b.h index 516596d68..eb4a219c2 100644 --- a/embed/extmod/modtrezorcrypto/modtrezorcrypto-blake2b.h +++ b/embed/extmod/modtrezorcrypto/modtrezorcrypto-blake2b.h @@ -49,7 +49,7 @@ STATIC mp_obj_t mod_trezorcrypto_Blake2b_make_new(const mp_obj_type_t *type, siz size_t outlen = trezor_obj_get_uint(args[1]); mp_buffer_info_t personal; mp_get_buffer_raise(args[2], &personal, MP_BUFFER_READ); - res = blake2b_InitPersonal(&(o->ctx), outlen, personal.buf); + res = blake2b_InitPersonal(&(o->ctx), outlen, personal.buf, personal.len); } else if (n_args == 2) { size_t outlen = trezor_obj_get_uint(args[1]); res = blake2b_Init(&(o->ctx), outlen); diff --git a/vendor/trezor-crypto b/vendor/trezor-crypto index 8b61a7e36..669acd733 160000 --- a/vendor/trezor-crypto +++ b/vendor/trezor-crypto @@ -1 +1 @@ -Subproject commit 8b61a7e36572b176f60e70d00fba9d368a601fb4 +Subproject commit 669acd7331fc02b6ef41c4a91112e6e6d6e831be