arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-01-25 23:01:02 +00:00
Code Issues Releases Wiki Activity

chore(core): Remove USE_SECP256K1_ZKP_BIP340 build option.

Browse Source
This commit is contained in:
Andrew Kozlik 2021-11-04 11:14:35 +01:00 committed by Andrew Kozlik
parent ae35086bb9
commit aaceb5bcc6
3 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/SConscript.unix
View File

@ -118,7 +118,6 @@ if FEATURE_FLAGS["SECP256K1_ZKP"]:
CPPDEFINES_MOD += [ CPPDEFINES_MOD += [
'USE_SECP256K1_ZKP', 'USE_SECP256K1_ZKP',
'USE_SECP256K1_ZKP_ECDSA', 'USE_SECP256K1_ZKP_ECDSA',
'USE_SECP256K1_ZKP_BIP340',
('SECP256K1_CONTEXT_SIZE', '8416'), ('SECP256K1_CONTEXT_SIZE', '8416'),
'USE_NUM_NONE', 'USE_NUM_NONE',
'USE_FIELD_INV_BUILTIN', 'USE_FIELD_INV_BUILTIN',

6
core/embed/extmod/modtrezorcrypto/modtrezorcrypto.c
View File

@ -38,6 +38,7 @@ static void wrapped_ui_wait_callback(uint32_t current, uint32_t total) {
#include "modtrezorcrypto-aes.h" #include "modtrezorcrypto-aes.h"
#include "modtrezorcrypto-bip32.h" #include "modtrezorcrypto-bip32.h"
#include "modtrezorcrypto-bip340.h"
#include "modtrezorcrypto-bip39.h" #include "modtrezorcrypto-bip39.h"
#include "modtrezorcrypto-blake256.h" #include "modtrezorcrypto-blake256.h"
#include "modtrezorcrypto-blake2b.h" #include "modtrezorcrypto-blake2b.h"
@ -52,9 +53,6 @@ static void wrapped_ui_wait_callback(uint32_t current, uint32_t total) {
#include "modtrezorcrypto-pbkdf2.h" #include "modtrezorcrypto-pbkdf2.h"
#include "modtrezorcrypto-random.h" #include "modtrezorcrypto-random.h"
#include "modtrezorcrypto-ripemd160.h" #include "modtrezorcrypto-ripemd160.h"
#ifdef USE_SECP256K1_ZKP_BIP340
#include "modtrezorcrypto-bip340.h"
#endif
#include "modtrezorcrypto-secp256k1.h" #include "modtrezorcrypto-secp256k1.h"
#include "modtrezorcrypto-sha1.h" #include "modtrezorcrypto-sha1.h"
#include "modtrezorcrypto-sha256.h" #include "modtrezorcrypto-sha256.h"
@ -106,9 +104,7 @@ STATIC const mp_rom_map_elem_t mp_module_trezorcrypto_globals_table[] = {
MP_ROM_PTR(&mod_trezorcrypto_Ripemd160_type)}, MP_ROM_PTR(&mod_trezorcrypto_Ripemd160_type)},
{MP_ROM_QSTR(MP_QSTR_secp256k1), {MP_ROM_QSTR(MP_QSTR_secp256k1),
MP_ROM_PTR(&mod_trezorcrypto_secp256k1_module)}, MP_ROM_PTR(&mod_trezorcrypto_secp256k1_module)},
#ifdef USE_SECP256K1_ZKP_BIP340
{MP_ROM_QSTR(MP_QSTR_bip340), MP_ROM_PTR(&mod_trezorcrypto_bip340_module)}, {MP_ROM_QSTR(MP_QSTR_bip340), MP_ROM_PTR(&mod_trezorcrypto_bip340_module)},
#endif
{MP_ROM_QSTR(MP_QSTR_sha1), MP_ROM_PTR(&mod_trezorcrypto_Sha1_type)}, {MP_ROM_QSTR(MP_QSTR_sha1), MP_ROM_PTR(&mod_trezorcrypto_Sha1_type)},
{MP_ROM_QSTR(MP_QSTR_sha256), MP_ROM_PTR(&mod_trezorcrypto_Sha256_type)}, {MP_ROM_QSTR(MP_QSTR_sha256), MP_ROM_PTR(&mod_trezorcrypto_Sha256_type)},
{MP_ROM_QSTR(MP_QSTR_sha512), MP_ROM_PTR(&mod_trezorcrypto_Sha512_type)}, {MP_ROM_QSTR(MP_QSTR_sha512), MP_ROM_PTR(&mod_trezorcrypto_Sha512_type)},

7
core/src/trezor/crypto/curve.py
View File

@ -1,6 +1 @@
from trezorcrypto import curve25519, ed25519, nist256p1, secp256k1 # noqa: F401 from trezorcrypto import bip340, curve25519, ed25519, nist256p1, secp256k1 # noqa: F401
try:
from trezorcrypto import bip340 # noqa: F401
except ImportError:
pass