From 4d4a351ba696b10cf062d357fd1cd4dbc548ac3d Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 28 Mar 2017 19:53:00 +0200 Subject: [PATCH] modtrezorcrypto: update to new trezor-crypto --- Makefile.bootloader | 5 ----- Makefile.firmware | 6 ------ Makefile.loader | 5 ----- .../extmod/modtrezorcrypto/modtrezorcrypto-curve25519.h | 2 +- micropython/unix/Makefile | 6 ------ vendor/norcow | 2 +- vendor/trezor-crypto | 2 +- 7 files changed, 3 insertions(+), 25 deletions(-) diff --git a/Makefile.bootloader b/Makefile.bootloader index 7dd6feb0d2..95acd85af7 100644 --- a/Makefile.bootloader +++ b/Makefile.bootloader @@ -71,12 +71,7 @@ OBJ_FW += $(addprefix $(BUILD_FW)/, \ # OBJ micropython/extmod/modtrezorcrypto CFLAGS_MOD += \ -I$(SRCDIR_FW)/extmod/modtrezorcrypto/trezor-crypto \ - -I$(SRCDIR_FW)/extmod/modtrezorcrypto/trezor-crypto/curve25519-donna \ -I$(SRCDIR_FW)/extmod/modtrezorcrypto/trezor-crypto/ed25519-donna \ - -DED25519_CUSTOMRANDOM=1 \ - -DED25519_CUSTOMHASH=1 \ - -DED25519_NO_INLINE_ASM \ - -DED25519_FORCE_32BIT=1 \ -DAES_128 \ -DAES_192 \ -DUSE_KECCAK=1 \ diff --git a/Makefile.firmware b/Makefile.firmware index 005766cfd2..8735859b85 100644 --- a/Makefile.firmware +++ b/Makefile.firmware @@ -42,12 +42,7 @@ endif ifeq ($(MICROPY_PY_TREZORCRYPTO),1) CFLAGS_MOD += \ -I$(SRCDIR_FW)/extmod/modtrezorcrypto/trezor-crypto \ - -I$(SRCDIR_FW)/extmod/modtrezorcrypto/trezor-crypto/curve25519-donna \ -I$(SRCDIR_FW)/extmod/modtrezorcrypto/trezor-crypto/ed25519-donna \ - -DED25519_CUSTOMRANDOM=1 \ - -DED25519_CUSTOMHASH=1 \ - -DED25519_NO_INLINE_ASM \ - -DED25519_FORCE_32BIT=1 \ -DAES_128 \ -DAES_192 \ -DUSE_KECCAK=1 \ @@ -67,7 +62,6 @@ OBJ_MOD += \ $(BUILD_FW)/extmod/modtrezorcrypto/trezor-crypto/bip39.o \ $(BUILD_FW)/extmod/modtrezorcrypto/trezor-crypto/blake2b.o \ $(BUILD_FW)/extmod/modtrezorcrypto/trezor-crypto/blake2s.o \ - $(BUILD_FW)/extmod/modtrezorcrypto/trezor-crypto/curve25519-donna/curve25519.o \ $(BUILD_FW)/extmod/modtrezorcrypto/trezor-crypto/curves.o \ $(BUILD_FW)/extmod/modtrezorcrypto/trezor-crypto/ecdsa.o \ $(BUILD_FW)/extmod/modtrezorcrypto/trezor-crypto/ed25519-donna/ed25519.o \ diff --git a/Makefile.loader b/Makefile.loader index 0c20b9ddc3..f2e4213ce8 100644 --- a/Makefile.loader +++ b/Makefile.loader @@ -69,12 +69,7 @@ OBJ_FW += $(addprefix $(BUILD_FW)/, \ # OBJ micropython/extmod/modtrezorcrypto CFLAGS_MOD += \ -I$(SRCDIR_FW)/extmod/modtrezorcrypto/trezor-crypto \ - -I$(SRCDIR_FW)/extmod/modtrezorcrypto/trezor-crypto/curve25519-donna \ -I$(SRCDIR_FW)/extmod/modtrezorcrypto/trezor-crypto/ed25519-donna \ - -DED25519_CUSTOMRANDOM=1 \ - -DED25519_CUSTOMHASH=1 \ - -DED25519_NO_INLINE_ASM \ - -DED25519_FORCE_32BIT=1 \ -DAES_128 \ -DAES_192 \ -DUSE_KECCAK=1 \ diff --git a/micropython/extmod/modtrezorcrypto/modtrezorcrypto-curve25519.h b/micropython/extmod/modtrezorcrypto/modtrezorcrypto-curve25519.h index 038f090b73..a7da365d1e 100644 --- a/micropython/extmod/modtrezorcrypto/modtrezorcrypto-curve25519.h +++ b/micropython/extmod/modtrezorcrypto/modtrezorcrypto-curve25519.h @@ -7,7 +7,7 @@ #include "py/objstr.h" -#include "trezor-crypto/curve25519-donna/curve25519.h" +#include "trezor-crypto/ed25519-donna/ed25519.h" #include "rand.h" diff --git a/micropython/unix/Makefile b/micropython/unix/Makefile index 999be8f372..5d27cd02d1 100644 --- a/micropython/unix/Makefile +++ b/micropython/unix/Makefile @@ -25,12 +25,7 @@ endif # OBJ micropython/extmod/modtrezorcrypto ifeq ($(MICROPY_PY_TREZORCRYPTO),1) CFLAGS_MOD += -I../$(EXTMOD_DIR)/modtrezorcrypto/trezor-crypto - CFLAGS_MOD += -I../$(EXTMOD_DIR)/modtrezorcrypto/trezor-crypto/curve25519-donna CFLAGS_MOD += -I../$(EXTMOD_DIR)/modtrezorcrypto/trezor-crypto/ed25519-donna - CFLAGS_MOD += -DED25519_CUSTOMRANDOM=1 - CFLAGS_MOD += -DED25519_CUSTOMHASH=1 - CFLAGS_MOD += -DED25519_NO_INLINE_ASM - CFLAGS_MOD += -DED25519_FORCE_32BIT=1 CFLAGS_MOD += -DAES_128 CFLAGS_MOD += -DAES_192 CFLAGS_MOD += -DUSE_KECCAK=1 @@ -50,7 +45,6 @@ SRC_MOD += \ $(EXTMOD_DIR)/modtrezorcrypto/trezor-crypto/bip39.c \ $(EXTMOD_DIR)/modtrezorcrypto/trezor-crypto/blake2b.c \ $(EXTMOD_DIR)/modtrezorcrypto/trezor-crypto/blake2s.c \ - $(EXTMOD_DIR)/modtrezorcrypto/trezor-crypto/curve25519-donna/curve25519.c \ $(EXTMOD_DIR)/modtrezorcrypto/trezor-crypto/curves.c \ $(EXTMOD_DIR)/modtrezorcrypto/trezor-crypto/ecdsa.c \ $(EXTMOD_DIR)/modtrezorcrypto/trezor-crypto/ed25519-donna/ed25519.c \ diff --git a/vendor/norcow b/vendor/norcow index 5543b20345..da337b157c 160000 --- a/vendor/norcow +++ b/vendor/norcow @@ -1 +1 @@ -Subproject commit 5543b20345cfd2f8e4660c04bd8c5e588c9b9dd6 +Subproject commit da337b157c1b61564a01bba5156a043e687caedb diff --git a/vendor/trezor-crypto b/vendor/trezor-crypto index 87c920a7e7..b1bee409e7 160000 --- a/vendor/trezor-crypto +++ b/vendor/trezor-crypto @@ -1 +1 @@ -Subproject commit 87c920a7e747f7ed40b6ae841327868ab914435b +Subproject commit b1bee409e72bf92283803ff53aef754040a54a2e