embed/extmod/modtrezorcrypto: fix last commit, update trezor-crypto

6 years ago · 8e9ae534c0
parent 565d60d004
commit 8e9ae534c0
4 changed files with 4 additions and 2 deletions
--- 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',
--- 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',
--- 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);
--- a/vendor/trezor-crypto
+++ b/vendor/trezor-crypto
@ -1 +1 @@
-Subproject commit 8b61a7e36572b176f60e70d00fba9d368a601fb4
+Subproject commit 669acd7331fc02b6ef41c4a91112e6e6d6e831be