arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-23 06:48:16 +00:00
Code Issues Releases Wiki Activity

src/apps/ethereum: implement Ethereum canonical signatures, fix max_chain_id

Browse Source
This commit is contained in:
Pavol Rusnak 2018-08-20 15:49:19 +02:00
parent af494a65b8
commit 1bf1a76973
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
embed/extmod/modtrezorcrypto/modtrezorcrypto-secp256k1.h
View File

@ -62,7 +62,13 @@ STATIC mp_obj_t mod_trezorcrypto_secp256k1_publickey(size_t n_args, const mp_obj
} }
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorcrypto_secp256k1_publickey_obj, 1, 2, mod_trezorcrypto_secp256k1_publickey); STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorcrypto_secp256k1_publickey_obj, 1, 2, mod_trezorcrypto_secp256k1_publickey);
/// def sign(secret_key: bytes, digest: bytes, compressed: bool = True) -> bytes: static int ethereum_is_canonic(uint8_t v, uint8_t signature[64])
{
(void) signature;
return (v & 2) == 0;
}
/// def sign(secret_key: bytes, digest: bytes, compressed: bool = True, ethereum_canonical: bool = False) -> bytes:
/// ''' /// '''
/// Uses secret key to produce the signature of the digest. /// Uses secret key to produce the signature of the digest.
/// ''' /// '''
@ -70,7 +76,12 @@ STATIC mp_obj_t mod_trezorcrypto_secp256k1_sign(size_t n_args, const mp_obj_t *a
mp_buffer_info_t sk, dig; mp_buffer_info_t sk, dig;
mp_get_buffer_raise(args[0], &sk, MP_BUFFER_READ); mp_get_buffer_raise(args[0], &sk, MP_BUFFER_READ);
mp_get_buffer_raise(args[1], &dig, MP_BUFFER_READ); mp_get_buffer_raise(args[1], &dig, MP_BUFFER_READ);
bool compressed = n_args < 3 || args[2] == mp_const_true; bool compressed = (n_args < 3) || (args[2] == mp_const_true);
bool ethereum_canonical = (n_args > 3) && (args[3] == mp_const_true);
int (*is_canonical)(uint8_t by, uint8_t sig[64]) = NULL;
if (ethereum_canonical) {
is_canonical = ethereum_is_canonic;
}
if (sk.len != 32) { if (sk.len != 32) {
mp_raise_ValueError("Invalid length of secret key"); mp_raise_ValueError("Invalid length of secret key");
} }
@ -78,13 +89,13 @@ STATIC mp_obj_t mod_trezorcrypto_secp256k1_sign(size_t n_args, const mp_obj_t *a
mp_raise_ValueError("Invalid length of digest"); mp_raise_ValueError("Invalid length of digest");
} }
uint8_t out[65], pby; uint8_t out[65], pby;
if (0 != ecdsa_sign_digest(&secp256k1, (const uint8_t *)sk.buf, (const uint8_t *)dig.buf, out + 1, &pby, NULL)) { if (0 != ecdsa_sign_digest(&secp256k1, (const uint8_t *)sk.buf, (const uint8_t *)dig.buf, out + 1, &pby, is_canonical)) {
mp_raise_ValueError("Signing failed"); mp_raise_ValueError("Signing failed");
} }
out[0] = 27 + pby + compressed * 4; out[0] = 27 + pby + compressed * 4;
return mp_obj_new_bytes(out, sizeof(out)); return mp_obj_new_bytes(out, sizeof(out));
} }
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorcrypto_secp256k1_sign_obj, 2, 3, mod_trezorcrypto_secp256k1_sign); STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorcrypto_secp256k1_sign_obj, 2, 4, mod_trezorcrypto_secp256k1_sign);
/// def verify(public_key: bytes, signature: bytes, digest: bytes) -> bool: /// def verify(public_key: bytes, signature: bytes, digest: bytes) -> bool:
/// ''' /// '''

4
src/apps/ethereum/sign_tx.py
View File

@ -12,7 +12,7 @@ from apps.ethereum.layout import (
) )
# maximum supported chain id # maximum supported chain id
MAX_CHAIN_ID = 2147483630 MAX_CHAIN_ID = 2147483629
async def ethereum_sign_tx(ctx, msg): async def ethereum_sign_tx(ctx, msg):
@ -134,7 +134,7 @@ async def send_signature(ctx, msg: EthereumSignTx, digest):
address_n = msg.address_n or () address_n = msg.address_n or ()
node = await seed.derive_node(ctx, address_n) node = await seed.derive_node(ctx, address_n)
signature = secp256k1.sign(node.private_key(), digest, False) signature = secp256k1.sign(node.private_key(), digest, False, True)
req = EthereumTxRequest() req = EthereumTxRequest()
req.signature_v = signature[0] req.signature_v = signature[0]