From 41af56222af1758fb98898cd2c1e5f502433ce3b Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 28 Mar 2017 23:09:17 +0200 Subject: [PATCH] modtrezorcrypto: update trezor-crypto --- Makefile.bootloader | 1 + Makefile.loader | 1 + .../extmod/modtrezorcrypto/modtrezorcrypto-curve25519.h | 4 ++-- vendor/trezor-crypto | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile.bootloader b/Makefile.bootloader index 95acd85a..69c154e9 100644 --- a/Makefile.bootloader +++ b/Makefile.bootloader @@ -75,6 +75,7 @@ CFLAGS_MOD += \ -DAES_128 \ -DAES_192 \ -DUSE_KECCAK=1 \ + -DED25519_NO_PRECOMP=1 \ -Wno-sequence-point OBJ_MOD += \ diff --git a/Makefile.loader b/Makefile.loader index f2e4213c..aa587b2e 100644 --- a/Makefile.loader +++ b/Makefile.loader @@ -73,6 +73,7 @@ CFLAGS_MOD += \ -DAES_128 \ -DAES_192 \ -DUSE_KECCAK=1 \ + -DED25519_NO_PRECOMP=1 \ -Wno-sequence-point OBJ_MOD += \ diff --git a/micropython/extmod/modtrezorcrypto/modtrezorcrypto-curve25519.h b/micropython/extmod/modtrezorcrypto/modtrezorcrypto-curve25519.h index a7da365d..5e14baa4 100644 --- a/micropython/extmod/modtrezorcrypto/modtrezorcrypto-curve25519.h +++ b/micropython/extmod/modtrezorcrypto/modtrezorcrypto-curve25519.h @@ -50,7 +50,7 @@ STATIC mp_obj_t mod_TrezorCrypto_Curve25519_publickey(mp_obj_t self, mp_obj_t se } vstr_t vstr; vstr_init_len(&vstr, 32); - curve25519_donna_basepoint((uint8_t *)vstr.buf, (const uint8_t *)sk.buf); + curve25519_scalarmult_basepoint((uint8_t *)vstr.buf, (const uint8_t *)sk.buf); return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr); } STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_TrezorCrypto_Curve25519_publickey_obj, mod_TrezorCrypto_Curve25519_publickey); @@ -72,7 +72,7 @@ STATIC mp_obj_t mod_TrezorCrypto_Curve25519_multiply(mp_obj_t self, mp_obj_t sec } vstr_t vstr; vstr_init_len(&vstr, 32); - curve25519_donna((uint8_t *)vstr.buf, (const uint8_t *)sk.buf, (const uint8_t *)pk.buf); + curve25519_scalarmult((uint8_t *)vstr.buf, (const uint8_t *)sk.buf, (const uint8_t *)pk.buf); return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr); } STATIC MP_DEFINE_CONST_FUN_OBJ_3(mod_TrezorCrypto_Curve25519_multiply_obj, mod_TrezorCrypto_Curve25519_multiply); diff --git a/vendor/trezor-crypto b/vendor/trezor-crypto index b1bee409..c200ce12 160000 --- a/vendor/trezor-crypto +++ b/vendor/trezor-crypto @@ -1 +1 @@ -Subproject commit b1bee409e72bf92283803ff53aef754040a54a2e +Subproject commit c200ce121ac268d7b201dddc89b42758ccfc40bf