arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-22 14:28:07 +00:00
Code Issues Releases Wiki Activity

modtrezorcrypto: update to new trezor-crypto

Browse Source
This commit is contained in:
Pavol Rusnak 2017-03-28 19:53:00 +02:00
parent d47e9fb855
commit 4d4a351ba6
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
7 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.bootloader
View File

@ -71,12 +71,7 @@ OBJ_FW += $(addprefix $(BUILD_FW)/, \
# OBJ micropython/extmod/modtrezorcrypto # OBJ micropython/extmod/modtrezorcrypto
CFLAGS_MOD += \ CFLAGS_MOD += \
-I$(SRCDIR_FW)/extmod/modtrezorcrypto/trezor-crypto \ -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 \ -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_128 \
-DAES_192 \ -DAES_192 \
-DUSE_KECCAK=1 \ -DUSE_KECCAK=1 \

6
Makefile.firmware
View File

@ -42,12 +42,7 @@ endif
ifeq ($(MICROPY_PY_TREZORCRYPTO),1) ifeq ($(MICROPY_PY_TREZORCRYPTO),1)
CFLAGS_MOD += \ CFLAGS_MOD += \
-I$(SRCDIR_FW)/extmod/modtrezorcrypto/trezor-crypto \ -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 \ -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_128 \
-DAES_192 \ -DAES_192 \
-DUSE_KECCAK=1 \ -DUSE_KECCAK=1 \
@ -67,7 +62,6 @@ OBJ_MOD += \
$(BUILD_FW)/extmod/modtrezorcrypto/trezor-crypto/bip39.o \ $(BUILD_FW)/extmod/modtrezorcrypto/trezor-crypto/bip39.o \
$(BUILD_FW)/extmod/modtrezorcrypto/trezor-crypto/blake2b.o \ $(BUILD_FW)/extmod/modtrezorcrypto/trezor-crypto/blake2b.o \
$(BUILD_FW)/extmod/modtrezorcrypto/trezor-crypto/blake2s.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/curves.o \
$(BUILD_FW)/extmod/modtrezorcrypto/trezor-crypto/ecdsa.o \ $(BUILD_FW)/extmod/modtrezorcrypto/trezor-crypto/ecdsa.o \
$(BUILD_FW)/extmod/modtrezorcrypto/trezor-crypto/ed25519-donna/ed25519.o \ $(BUILD_FW)/extmod/modtrezorcrypto/trezor-crypto/ed25519-donna/ed25519.o \

5
Makefile.loader
View File

@ -69,12 +69,7 @@ OBJ_FW += $(addprefix $(BUILD_FW)/, \
# OBJ micropython/extmod/modtrezorcrypto # OBJ micropython/extmod/modtrezorcrypto
CFLAGS_MOD += \ CFLAGS_MOD += \
-I$(SRCDIR_FW)/extmod/modtrezorcrypto/trezor-crypto \ -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 \ -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_128 \
-DAES_192 \ -DAES_192 \
-DUSE_KECCAK=1 \ -DUSE_KECCAK=1 \

2
micropython/extmod/modtrezorcrypto/modtrezorcrypto-curve25519.h
View File

@ -7,7 +7,7 @@
#include "py/objstr.h" #include "py/objstr.h"
#include "trezor-crypto/curve25519-donna/curve25519.h" #include "trezor-crypto/ed25519-donna/ed25519.h"
#include "rand.h" #include "rand.h"

6
micropython/unix/Makefile
View File

@ -25,12 +25,7 @@ endif
# OBJ micropython/extmod/modtrezorcrypto # OBJ micropython/extmod/modtrezorcrypto
ifeq ($(MICROPY_PY_TREZORCRYPTO),1) ifeq ($(MICROPY_PY_TREZORCRYPTO),1)
CFLAGS_MOD += -I../$(EXTMOD_DIR)/modtrezorcrypto/trezor-crypto 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 += -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_128
CFLAGS_MOD += -DAES_192 CFLAGS_MOD += -DAES_192
CFLAGS_MOD += -DUSE_KECCAK=1 CFLAGS_MOD += -DUSE_KECCAK=1
@ -50,7 +45,6 @@ SRC_MOD += \
$(EXTMOD_DIR)/modtrezorcrypto/trezor-crypto/bip39.c \ $(EXTMOD_DIR)/modtrezorcrypto/trezor-crypto/bip39.c \
$(EXTMOD_DIR)/modtrezorcrypto/trezor-crypto/blake2b.c \ $(EXTMOD_DIR)/modtrezorcrypto/trezor-crypto/blake2b.c \
$(EXTMOD_DIR)/modtrezorcrypto/trezor-crypto/blake2s.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/curves.c \
$(EXTMOD_DIR)/modtrezorcrypto/trezor-crypto/ecdsa.c \ $(EXTMOD_DIR)/modtrezorcrypto/trezor-crypto/ecdsa.c \
$(EXTMOD_DIR)/modtrezorcrypto/trezor-crypto/ed25519-donna/ed25519.c \ $(EXTMOD_DIR)/modtrezorcrypto/trezor-crypto/ed25519-donna/ed25519.c \

2
vendor/norcow vendored

@ -1 +1 @@
Subproject commit 5543b20345cfd2f8e4660c04bd8c5e588c9b9dd6 Subproject commit da337b157c1b61564a01bba5156a043e687caedb

2
vendor/trezor-crypto vendored

@ -1 +1 @@
Subproject commit 87c920a7e747f7ed40b6ae841327868ab914435b Subproject commit b1bee409e72bf92283803ff53aef754040a54a2e