From d2f65d67cdcfcb37777a48931f8e8c8a6b053a2d Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 2 May 2016 18:55:32 +0200 Subject: [PATCH] rename buffer variables, add const where possible --- .../modtrezorcrypto/modtrezorcrypto-ed25519.h | 34 +++--- .../modtrezorcrypto-nist256p1.h | 34 +++--- .../modtrezorcrypto-ripemd160.h | 6 +- .../modtrezorcrypto-secp256k1.h | 34 +++--- .../modtrezorcrypto/modtrezorcrypto-sha256.h | 6 +- .../modtrezorcrypto-sha3-256.h | 6 +- .../modtrezorcrypto-sha3-512.h | 6 +- .../modtrezorcrypto/modtrezorcrypto-sha512.h | 6 +- extmod/modtrezormsg/modtrezormsg.c | 16 +-- extmod/modtrezorui/modtrezorui-display.h | 100 +++++++++--------- extmod/modtrezorui/modtrezorui-inflate.h | 2 +- 11 files changed, 125 insertions(+), 125 deletions(-) diff --git a/extmod/modtrezorcrypto/modtrezorcrypto-ed25519.h b/extmod/modtrezorcrypto/modtrezorcrypto-ed25519.h index 3a5e0b4aaa..e08fb84c82 100644 --- a/extmod/modtrezorcrypto/modtrezorcrypto-ed25519.h +++ b/extmod/modtrezorcrypto/modtrezorcrypto-ed25519.h @@ -24,48 +24,48 @@ STATIC mp_obj_t mod_TrezorCrypto_Ed25519_make_new(const mp_obj_type_t *type, siz // def Ed25519.publickey(self, secret_key: bytes) -> bytes STATIC mp_obj_t mod_TrezorCrypto_Ed25519_publickey(mp_obj_t self, mp_obj_t secret_key) { - mp_buffer_info_t skbuf; - mp_get_buffer_raise(secret_key, &skbuf, MP_BUFFER_READ); - if (skbuf.len != 32) { + mp_buffer_info_t sk; + mp_get_buffer_raise(secret_key, &sk, MP_BUFFER_READ); + if (sk.len != 32) { nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Invalid length of secret key")); } vstr_t vstr; vstr_init_len(&vstr, 32); - ed25519_publickey(*(const ed25519_secret_key *)skbuf.buf, *(ed25519_public_key *)vstr.buf); + ed25519_publickey(*(const ed25519_secret_key *)sk.buf, *(ed25519_public_key *)vstr.buf); return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr); } STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_TrezorCrypto_Ed25519_publickey_obj, mod_TrezorCrypto_Ed25519_publickey); // def Ed25519.sign(self, secret_key: bytes, message: bytes) -> bytes STATIC mp_obj_t mod_TrezorCrypto_Ed25519_sign(mp_obj_t self, mp_obj_t secret_key, mp_obj_t message) { - mp_buffer_info_t skbuf, messagebuf; - mp_get_buffer_raise(secret_key, &skbuf, MP_BUFFER_READ); - mp_get_buffer_raise(message, &messagebuf, MP_BUFFER_READ); - if (skbuf.len != 32) { + mp_buffer_info_t sk, msg; + mp_get_buffer_raise(secret_key, &sk, MP_BUFFER_READ); + mp_get_buffer_raise(message, &msg, MP_BUFFER_READ); + if (sk.len != 32) { nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Invalid length of secret key")); } ed25519_public_key pk; - ed25519_publickey(*(const ed25519_secret_key *)skbuf.buf, pk); + ed25519_publickey(*(const ed25519_secret_key *)sk.buf, pk); vstr_t vstr; vstr_init_len(&vstr, 64); - ed25519_sign(messagebuf.buf, messagebuf.len, *(const ed25519_secret_key *)skbuf.buf, pk, *(ed25519_signature *)vstr.buf); + ed25519_sign(msg.buf, msg.len, *(const ed25519_secret_key *)sk.buf, pk, *(ed25519_signature *)vstr.buf); return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr); } STATIC MP_DEFINE_CONST_FUN_OBJ_3(mod_TrezorCrypto_Ed25519_sign_obj, mod_TrezorCrypto_Ed25519_sign); // def Ed25519.verify(self, public_key: bytes, signature: bytes, message: bytes) -> bool STATIC mp_obj_t mod_TrezorCrypto_Ed25519_verify(size_t n_args, const mp_obj_t *args) { - mp_buffer_info_t pkbuf, sigbuf, messagebuf; - mp_get_buffer_raise(args[1], &pkbuf, MP_BUFFER_READ); - mp_get_buffer_raise(args[2], &sigbuf, MP_BUFFER_READ); - mp_get_buffer_raise(args[3], &messagebuf, MP_BUFFER_READ); - if (pkbuf.len != 32) { + mp_buffer_info_t pk, sig, msg; + mp_get_buffer_raise(args[1], &pk, MP_BUFFER_READ); + mp_get_buffer_raise(args[2], &sig, MP_BUFFER_READ); + mp_get_buffer_raise(args[3], &msg, MP_BUFFER_READ); + if (pk.len != 32) { nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Invalid length of public key")); } - if (sigbuf.len != 64) { + if (sig.len != 64) { nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Invalid length of signature")); } - return (0 == ed25519_sign_open(messagebuf.buf, messagebuf.len, *(const ed25519_public_key *)pkbuf.buf, *(const ed25519_signature *)sigbuf.buf)) ? mp_const_true : mp_const_false; + return (0 == ed25519_sign_open(msg.buf, msg.len, *(const ed25519_public_key *)pk.buf, *(const ed25519_signature *)sig.buf)) ? mp_const_true : mp_const_false; } STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_TrezorCrypto_Ed25519_verify_obj, 4, 4, mod_TrezorCrypto_Ed25519_verify); diff --git a/extmod/modtrezorcrypto/modtrezorcrypto-nist256p1.h b/extmod/modtrezorcrypto/modtrezorcrypto-nist256p1.h index 46b4894c61..8c6cdbe71f 100644 --- a/extmod/modtrezorcrypto/modtrezorcrypto-nist256p1.h +++ b/extmod/modtrezorcrypto/modtrezorcrypto-nist256p1.h @@ -25,19 +25,19 @@ STATIC mp_obj_t mod_TrezorCrypto_Nist256p1_make_new(const mp_obj_type_t *type, s // def Nist256p1.publickey(self, secret_key: bytes, compressed: bool=True) -> bytes STATIC mp_obj_t mod_TrezorCrypto_Nist256p1_publickey(size_t n_args, const mp_obj_t *args) { - mp_buffer_info_t skbuf; - mp_get_buffer_raise(args[1], &skbuf, MP_BUFFER_READ); - if (skbuf.len != 32) { + mp_buffer_info_t sk; + mp_get_buffer_raise(args[1], &sk, MP_BUFFER_READ); + if (sk.len != 32) { nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Invalid length of secret key")); } bool compressed = n_args < 3 || args[2] == mp_const_true; vstr_t vstr; if (compressed) { vstr_init_len(&vstr, 33); - ecdsa_get_public_key33(&nist256p1, (const uint8_t *)skbuf.buf, (uint8_t *)vstr.buf); + ecdsa_get_public_key33(&nist256p1, (const uint8_t *)sk.buf, (uint8_t *)vstr.buf); } else { vstr_init_len(&vstr, 65); - ecdsa_get_public_key65(&nist256p1, (const uint8_t *)skbuf.buf, (uint8_t *)vstr.buf); + ecdsa_get_public_key65(&nist256p1, (const uint8_t *)sk.buf, (uint8_t *)vstr.buf); } return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr); } @@ -45,16 +45,16 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_TrezorCrypto_Nist256p1_publickey_ // def Nist256p1.sign(self, secret_key: bytes, message: bytes) -> bytes STATIC mp_obj_t mod_TrezorCrypto_Nist256p1_sign(mp_obj_t self, mp_obj_t secret_key, mp_obj_t message) { - mp_buffer_info_t skbuf, messagebuf; - mp_get_buffer_raise(secret_key, &skbuf, MP_BUFFER_READ); - mp_get_buffer_raise(message, &messagebuf, MP_BUFFER_READ); - if (skbuf.len != 32) { + mp_buffer_info_t sk, msg; + mp_get_buffer_raise(secret_key, &sk, MP_BUFFER_READ); + mp_get_buffer_raise(message, &msg, MP_BUFFER_READ); + if (sk.len != 32) { nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Invalid length of secret key")); } vstr_t vstr; vstr_init_len(&vstr, 65); uint8_t pby; - if (0 != ecdsa_sign(&nist256p1, (const uint8_t *)skbuf.buf, (const uint8_t *)messagebuf.buf, messagebuf.len, (uint8_t *)vstr.buf, &pby)) { + if (0 != ecdsa_sign(&nist256p1, (const uint8_t *)sk.buf, (const uint8_t *)msg.buf, msg.len, (uint8_t *)vstr.buf, &pby)) { nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Signing failed")); } (void)pby; @@ -64,17 +64,17 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(mod_TrezorCrypto_Nist256p1_sign_obj, mod_Trezor // def Nist256p1.verify(self, public_key: bytes, signature: bytes, message: bytes) -> bool STATIC mp_obj_t mod_TrezorCrypto_Nist256p1_verify(size_t n_args, const mp_obj_t *args) { - mp_buffer_info_t pkbuf, sigbuf, messagebuf; - mp_get_buffer_raise(args[1], &pkbuf, MP_BUFFER_READ); - mp_get_buffer_raise(args[2], &sigbuf, MP_BUFFER_READ); - mp_get_buffer_raise(args[3], &messagebuf, MP_BUFFER_READ); - if (pkbuf.len != 33 && pkbuf.len != 65) { + mp_buffer_info_t pk, sig, msg; + mp_get_buffer_raise(args[1], &pk, MP_BUFFER_READ); + mp_get_buffer_raise(args[2], &sig, MP_BUFFER_READ); + mp_get_buffer_raise(args[3], &msg, MP_BUFFER_READ); + if (pk.len != 33 && pk.len != 65) { nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Invalid length of public key")); } - if (sigbuf.len != 65) { + if (sig.len != 65) { nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Invalid length of signature")); } - return mp_obj_new_bool(0 == ecdsa_verify(&nist256p1, (const uint8_t *)pkbuf.buf, (const uint8_t *)sigbuf.buf, (const uint8_t *)messagebuf.buf, messagebuf.len)); + return mp_obj_new_bool(0 == ecdsa_verify(&nist256p1, (const uint8_t *)pk.buf, (const uint8_t *)sig.buf, (const uint8_t *)msg.buf, msg.len)); } STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_TrezorCrypto_Nist256p1_verify_obj, 4, 4, mod_TrezorCrypto_Nist256p1_verify); diff --git a/extmod/modtrezorcrypto/modtrezorcrypto-ripemd160.h b/extmod/modtrezorcrypto/modtrezorcrypto-ripemd160.h index 8db83c66ff..2e4cb69278 100644 --- a/extmod/modtrezorcrypto/modtrezorcrypto-ripemd160.h +++ b/extmod/modtrezorcrypto/modtrezorcrypto-ripemd160.h @@ -36,9 +36,9 @@ STATIC mp_obj_t mod_TrezorCrypto_Ripemd160_make_new(const mp_obj_type_t *type, s // def Ripemd160.update(self, data: bytes) -> None STATIC mp_obj_t mod_TrezorCrypto_Ripemd160_update(mp_obj_t self, mp_obj_t data) { mp_obj_Ripemd160_t *o = MP_OBJ_TO_PTR(self); - mp_buffer_info_t databuf; - mp_get_buffer_raise(data, &databuf, MP_BUFFER_READ); - ripemd160_Update(&(o->ctx), databuf.buf, databuf.len); + mp_buffer_info_t msg; + mp_get_buffer_raise(data, &msg, MP_BUFFER_READ); + ripemd160_Update(&(o->ctx), msg.buf, msg.len); return mp_const_none; } STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_TrezorCrypto_Ripemd160_update_obj, mod_TrezorCrypto_Ripemd160_update); diff --git a/extmod/modtrezorcrypto/modtrezorcrypto-secp256k1.h b/extmod/modtrezorcrypto/modtrezorcrypto-secp256k1.h index 2305f3c680..2f5d773581 100644 --- a/extmod/modtrezorcrypto/modtrezorcrypto-secp256k1.h +++ b/extmod/modtrezorcrypto/modtrezorcrypto-secp256k1.h @@ -25,19 +25,19 @@ STATIC mp_obj_t mod_TrezorCrypto_Secp256k1_make_new(const mp_obj_type_t *type, s // def Secp256k1.publickey(self, secret_key: bytes, compressed: bool=True) -> bytes STATIC mp_obj_t mod_TrezorCrypto_Secp256k1_publickey(size_t n_args, const mp_obj_t *args) { - mp_buffer_info_t skbuf; - mp_get_buffer_raise(args[1], &skbuf, MP_BUFFER_READ); - if (skbuf.len != 32) { + mp_buffer_info_t sk; + mp_get_buffer_raise(args[1], &sk, MP_BUFFER_READ); + if (sk.len != 32) { nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Invalid length of secret key")); } bool compressed = n_args < 3 || args[2] == mp_const_true; vstr_t vstr; if (compressed) { vstr_init_len(&vstr, 33); - ecdsa_get_public_key33(&secp256k1, (const uint8_t *)skbuf.buf, (uint8_t *)vstr.buf); + ecdsa_get_public_key33(&secp256k1, (const uint8_t *)sk.buf, (uint8_t *)vstr.buf); } else { vstr_init_len(&vstr, 65); - ecdsa_get_public_key65(&secp256k1, (const uint8_t *)skbuf.buf, (uint8_t *)vstr.buf); + ecdsa_get_public_key65(&secp256k1, (const uint8_t *)sk.buf, (uint8_t *)vstr.buf); } return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr); } @@ -45,16 +45,16 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_TrezorCrypto_Secp256k1_publickey_ // def Secp256k1.sign(self, secret_key: bytes, message: bytes) -> bytes STATIC mp_obj_t mod_TrezorCrypto_Secp256k1_sign(mp_obj_t self, mp_obj_t secret_key, mp_obj_t message) { - mp_buffer_info_t skbuf, messagebuf; - mp_get_buffer_raise(secret_key, &skbuf, MP_BUFFER_READ); - mp_get_buffer_raise(message, &messagebuf, MP_BUFFER_READ); - if (skbuf.len != 32) { + mp_buffer_info_t sk, msg; + mp_get_buffer_raise(secret_key, &sk, MP_BUFFER_READ); + mp_get_buffer_raise(message, &msg, MP_BUFFER_READ); + if (sk.len != 32) { nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Invalid length of secret key")); } vstr_t vstr; vstr_init_len(&vstr, 65); uint8_t pby; - if (0 != ecdsa_sign(&secp256k1, (const uint8_t *)skbuf.buf, (const uint8_t *)messagebuf.buf, messagebuf.len, (uint8_t *)vstr.buf, &pby)) { + if (0 != ecdsa_sign(&secp256k1, (const uint8_t *)sk.buf, (const uint8_t *)msg.buf, msg.len, (uint8_t *)vstr.buf, &pby)) { nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Signing failed")); } (void)pby; @@ -64,17 +64,17 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(mod_TrezorCrypto_Secp256k1_sign_obj, mod_Trezor // def Secp256k1.verify(self, public_key: bytes, signature: bytes, message: bytes) -> bool STATIC mp_obj_t mod_TrezorCrypto_Secp256k1_verify(size_t n_args, const mp_obj_t *args) { - mp_buffer_info_t pkbuf, sigbuf, messagebuf; - mp_get_buffer_raise(args[1], &pkbuf, MP_BUFFER_READ); - mp_get_buffer_raise(args[2], &sigbuf, MP_BUFFER_READ); - mp_get_buffer_raise(args[3], &messagebuf, MP_BUFFER_READ); - if (pkbuf.len != 33 && pkbuf.len != 65) { + mp_buffer_info_t pk, sig, msg; + mp_get_buffer_raise(args[1], &pk, MP_BUFFER_READ); + mp_get_buffer_raise(args[2], &sig, MP_BUFFER_READ); + mp_get_buffer_raise(args[3], &msg, MP_BUFFER_READ); + if (pk.len != 33 && pk.len != 65) { nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Invalid length of public key")); } - if (sigbuf.len != 65) { + if (sig.len != 65) { nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Invalid length of signature")); } - return mp_obj_new_bool(0 == ecdsa_verify(&secp256k1, (const uint8_t *)pkbuf.buf, (const uint8_t *)sigbuf.buf, (const uint8_t *)messagebuf.buf, messagebuf.len)); + return mp_obj_new_bool(0 == ecdsa_verify(&secp256k1, (const uint8_t *)pk.buf, (const uint8_t *)sig.buf, (const uint8_t *)msg.buf, msg.len)); } STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_TrezorCrypto_Secp256k1_verify_obj, 4, 4, mod_TrezorCrypto_Secp256k1_verify); diff --git a/extmod/modtrezorcrypto/modtrezorcrypto-sha256.h b/extmod/modtrezorcrypto/modtrezorcrypto-sha256.h index 30cb78e048..c60fba62d2 100644 --- a/extmod/modtrezorcrypto/modtrezorcrypto-sha256.h +++ b/extmod/modtrezorcrypto/modtrezorcrypto-sha256.h @@ -36,9 +36,9 @@ STATIC mp_obj_t mod_TrezorCrypto_Sha256_make_new(const mp_obj_type_t *type, size // def Sha256.update(self, data: bytes) -> None STATIC mp_obj_t mod_TrezorCrypto_Sha256_update(mp_obj_t self, mp_obj_t data) { mp_obj_Sha256_t *o = MP_OBJ_TO_PTR(self); - mp_buffer_info_t databuf; - mp_get_buffer_raise(data, &databuf, MP_BUFFER_READ); - sha256_Update(&(o->ctx), databuf.buf, databuf.len); + mp_buffer_info_t msg; + mp_get_buffer_raise(data, &msg, MP_BUFFER_READ); + sha256_Update(&(o->ctx), msg.buf, msg.len); return mp_const_none; } STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_TrezorCrypto_Sha256_update_obj, mod_TrezorCrypto_Sha256_update); diff --git a/extmod/modtrezorcrypto/modtrezorcrypto-sha3-256.h b/extmod/modtrezorcrypto/modtrezorcrypto-sha3-256.h index 6bf28cee54..df8a54f6a4 100644 --- a/extmod/modtrezorcrypto/modtrezorcrypto-sha3-256.h +++ b/extmod/modtrezorcrypto/modtrezorcrypto-sha3-256.h @@ -36,9 +36,9 @@ STATIC mp_obj_t mod_TrezorCrypto_Sha3_256_make_new(const mp_obj_type_t *type, si // def Sha3_256.update(self, data: bytes) -> None STATIC mp_obj_t mod_TrezorCrypto_Sha3_256_update(mp_obj_t self, mp_obj_t data) { mp_obj_Sha3_256_t *o = MP_OBJ_TO_PTR(self); - mp_buffer_info_t databuf; - mp_get_buffer_raise(data, &databuf, MP_BUFFER_READ); - sha3_Update(&(o->ctx), databuf.buf, databuf.len); + mp_buffer_info_t msg; + mp_get_buffer_raise(data, &msg, MP_BUFFER_READ); + sha3_Update(&(o->ctx), msg.buf, msg.len); return mp_const_none; } STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_TrezorCrypto_Sha3_256_update_obj, mod_TrezorCrypto_Sha3_256_update); diff --git a/extmod/modtrezorcrypto/modtrezorcrypto-sha3-512.h b/extmod/modtrezorcrypto/modtrezorcrypto-sha3-512.h index 08e06dd79e..02f1fcebdf 100644 --- a/extmod/modtrezorcrypto/modtrezorcrypto-sha3-512.h +++ b/extmod/modtrezorcrypto/modtrezorcrypto-sha3-512.h @@ -36,9 +36,9 @@ STATIC mp_obj_t mod_TrezorCrypto_Sha3_512_make_new(const mp_obj_type_t *type, si // def Sha3_512.update(self, data: bytes) -> None STATIC mp_obj_t mod_TrezorCrypto_Sha3_512_update(mp_obj_t self, mp_obj_t data) { mp_obj_Sha3_512_t *o = MP_OBJ_TO_PTR(self); - mp_buffer_info_t databuf; - mp_get_buffer_raise(data, &databuf, MP_BUFFER_READ); - sha3_Update(&(o->ctx), databuf.buf, databuf.len); + mp_buffer_info_t msg; + mp_get_buffer_raise(data, &msg, MP_BUFFER_READ); + sha3_Update(&(o->ctx), msg.buf, msg.len); return mp_const_none; } STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_TrezorCrypto_Sha3_512_update_obj, mod_TrezorCrypto_Sha3_512_update); diff --git a/extmod/modtrezorcrypto/modtrezorcrypto-sha512.h b/extmod/modtrezorcrypto/modtrezorcrypto-sha512.h index 30dd5c313a..62db1e3e54 100644 --- a/extmod/modtrezorcrypto/modtrezorcrypto-sha512.h +++ b/extmod/modtrezorcrypto/modtrezorcrypto-sha512.h @@ -35,9 +35,9 @@ STATIC mp_obj_t mod_TrezorCrypto_Sha512_make_new(const mp_obj_type_t *type, size // def Sha512.hash(self, data: bytes) -> None STATIC mp_obj_t mod_TrezorCrypto_Sha512_update(mp_obj_t self, mp_obj_t data) { mp_obj_Sha512_t *o = MP_OBJ_TO_PTR(self); - mp_buffer_info_t databuf; - mp_get_buffer_raise(data, &databuf, MP_BUFFER_READ); - sha512_Update(&(o->ctx), databuf.buf, databuf.len); + mp_buffer_info_t msg; + mp_get_buffer_raise(data, &msg, MP_BUFFER_READ); + sha512_Update(&(o->ctx), msg.buf, msg.len); return mp_const_none; } STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_TrezorCrypto_Sha512_update_obj, mod_TrezorCrypto_Sha512_update); diff --git a/extmod/modtrezormsg/modtrezormsg.c b/extmod/modtrezormsg/modtrezormsg.c index 1aa8c0c527..a0b7931752 100644 --- a/extmod/modtrezormsg/modtrezormsg.c +++ b/extmod/modtrezormsg/modtrezormsg.c @@ -40,9 +40,9 @@ STATIC mp_obj_t mod_TrezorMsg_Msg_make_new(const mp_obj_type_t *type, size_t n_a // def Msg.send(self, message) -> int STATIC mp_obj_t mod_TrezorMsg_Msg_send(mp_obj_t self, mp_obj_t message) { - mp_buffer_info_t buf; - mp_get_buffer_raise(message, &buf, MP_BUFFER_READ); - int r = msg_send(buf.buf, buf.len); + mp_buffer_info_t msg; + mp_get_buffer_raise(message, &msg, MP_BUFFER_READ); + int r = msg_send(msg.buf, msg.len); return MP_OBJ_NEW_SMALL_INT(r); } STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_TrezorMsg_Msg_send_obj, mod_TrezorMsg_Msg_send); @@ -51,9 +51,9 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_TrezorMsg_Msg_send_obj, mod_TrezorMsg_Msg_s // def Msg.select(self, timeout_us: int) -> None/tuple/bytes STATIC mp_obj_t mod_TrezorMsg_Msg_select(mp_obj_t self, mp_obj_t timeout_us) { - int to = mp_obj_get_int(timeout_us); - if (to < 0) { - to = 0; + int timeout = mp_obj_get_int(timeout_us); + if (timeout < 0) { + timeout = 0; } for(;;) { uint32_t e = msg_poll_ui_event(); @@ -74,11 +74,11 @@ STATIC mp_obj_t mod_TrezorMsg_Msg_select(mp_obj_t self, mp_obj_t timeout_us) { tuple->items[1] = mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr); return MP_OBJ_FROM_PTR(tuple); } - if (to <= 0) { + if (timeout <= 0) { break; } mp_hal_delay_us_fast(TICK_RESOLUTION); - to -= TICK_RESOLUTION; + timeout -= TICK_RESOLUTION; } return mp_const_none; } diff --git a/extmod/modtrezorui/modtrezorui-display.h b/extmod/modtrezorui/modtrezorui-display.h index 58c523f33b..cf510d0fba 100644 --- a/extmod/modtrezorui/modtrezorui-display.h +++ b/extmod/modtrezorui/modtrezorui-display.h @@ -14,7 +14,7 @@ // common display functions -static void DATAS(void *bytes, int len) { +static void DATAS(const void *bytes, int len) { const uint8_t *c = (const uint8_t *)bytes; while (len-- > 0) { DATA(*c); @@ -31,7 +31,7 @@ static void display_bar(uint8_t x, uint8_t y, uint8_t w, uint8_t h, uint16_t c) display_update(); } -static void display_blit(uint8_t x, uint8_t y, uint8_t w, uint8_t h, void *data, int datalen) { +static void display_blit(uint8_t x, uint8_t y, uint8_t w, uint8_t h, const void *data, int datalen) { display_set_window(x, y, w, h); DATAS(data, datalen); display_update(); @@ -42,7 +42,7 @@ static void inflate_callback_image(uint8_t byte, uint32_t pos, void *userdata) DATA(byte); } -static void display_image(uint8_t x, uint8_t y, uint8_t w, uint8_t h, void *data, int datalen) { +static void display_image(uint8_t x, uint8_t y, uint8_t w, uint8_t h, const void *data, int datalen) { display_set_window(x, y, w, h); sinf_inflate(data, inflate_callback_image, NULL); display_update(); @@ -68,7 +68,7 @@ static void inflate_callback_icon(uint8_t byte, uint32_t pos, void *userdata) DATA(colortable[byte & 0x0F] & 0xFF); } -static void display_icon(uint8_t x, uint8_t y, uint8_t w, uint8_t h, void *data, int datalen, uint16_t fgcolor, uint16_t bgcolor) { +static void display_icon(uint8_t x, uint8_t y, uint8_t w, uint8_t h, const void *data, int datalen, uint16_t fgcolor, uint16_t bgcolor) { display_set_window(x, y, w, h); uint16_t colortable[16]; set_color_table(colortable, fgcolor, bgcolor); @@ -102,7 +102,7 @@ static const uint8_t *get_glyph(uint8_t font, uint8_t c) { // first two bytes are width and height of the glyph // third, fourth and fifth bytes are advance, bearingX and bearingY of the horizontal metrics of the glyph // rest is packed 4-bit glyph data -static void display_text(uint8_t x, uint8_t y, uint8_t *text, int textlen, uint8_t font, uint16_t fgcolor, uint16_t bgcolor) { +static void display_text(uint8_t x, uint8_t y, const uint8_t *text, int textlen, uint8_t font, uint16_t fgcolor, uint16_t bgcolor) { uint32_t px = x; uint16_t colortable[16]; set_color_table(colortable, fgcolor, bgcolor); @@ -133,7 +133,7 @@ static void display_text(uint8_t x, uint8_t y, uint8_t *text, int textlen, uint8 } // compute the width of the text (in pixels) -static uint32_t display_text_width(uint8_t *text, int textlen, uint8_t font) { +static uint32_t display_text_width(const uint8_t *text, int textlen, uint8_t font) { uint32_t w = 0; for (int i = 0; i < textlen; i++) { const uint8_t *g = get_glyph(font, text[i]); @@ -143,7 +143,7 @@ static uint32_t display_text_width(uint8_t *text, int textlen, uint8_t font) { return w; } -static void display_qrcode(uint8_t x, uint8_t y, char *data, int datalen, int scale) { +static void display_qrcode(uint8_t x, uint8_t y, const char *data, int datalen, int scale) { uint8_t bitdata[QR_MAX_BITDATA]; int side = qr_encode(QR_LEVEL_M, 0, data, datalen, bitdata); display_set_window(x, y, side * scale, side * scale); @@ -215,7 +215,7 @@ static void display_loader(uint16_t progress, uint16_t fgcolor, uint16_t bgcolor display_update(); } -static void display_raw(uint8_t reg, uint8_t *data, int datalen) +static void display_raw(uint8_t reg, const uint8_t *data, int datalen) { if (reg) { CMD(reg); @@ -258,12 +258,12 @@ STATIC mp_obj_t mod_TrezorUi_Display_blit(size_t n_args, const mp_obj_t *args) { mp_int_t y = mp_obj_get_int(args[2]); mp_int_t w = mp_obj_get_int(args[3]); mp_int_t h = mp_obj_get_int(args[4]); - mp_buffer_info_t bufinfo; - mp_get_buffer_raise(args[5], &bufinfo, MP_BUFFER_READ); - if (bufinfo.len != 2 * w * h) { - nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "Wrong data size (got %d bytes, expected %d bytes)", bufinfo.len, 2 * w * h)); + mp_buffer_info_t data; + mp_get_buffer_raise(args[5], &data, MP_BUFFER_READ); + if (data.len != 2 * w * h) { + nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "Wrong data size (got %d bytes, expected %d bytes)", data.len, 2 * w * h)); } - display_blit(x, y, w, h, bufinfo.buf, bufinfo.len); + display_blit(x, y, w, h, data.buf, data.len); return mp_const_none; } STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_TrezorUi_Display_blit_obj, 6, 6, mod_TrezorUi_Display_blit); @@ -272,10 +272,10 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_TrezorUi_Display_blit_obj, 6, 6, STATIC mp_obj_t mod_TrezorUi_Display_image(size_t n_args, const mp_obj_t *args) { mp_int_t x = mp_obj_get_int(args[1]); mp_int_t y = mp_obj_get_int(args[2]); - mp_buffer_info_t bufinfo; - mp_get_buffer_raise(args[3], &bufinfo, MP_BUFFER_READ); - uint8_t *data = bufinfo.buf; - if (bufinfo.len < 8 || memcmp(data, "TOIf", 4) != 0) { + mp_buffer_info_t image; + mp_get_buffer_raise(args[3], &image, MP_BUFFER_READ); + const uint8_t *data = image.buf; + if (image.len < 8 || memcmp(data, "TOIf", 4) != 0) { nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Invalid image format")); } mp_int_t w = *(uint16_t *)(data + 4); @@ -284,10 +284,10 @@ STATIC mp_obj_t mod_TrezorUi_Display_image(size_t n_args, const mp_obj_t *args) if ((x < 0) || (y < 0) || (x + w > RESX) || (y + h > RESY)) { nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Out of bounds")); } - if (datalen != bufinfo.len - 12) { + if (datalen != image.len - 12) { nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Invalid size of data")); } - display_image(x, y, w, h, data + 12, bufinfo.len - 12); + display_image(x, y, w, h, data + 12, image.len - 12); return mp_const_none; } STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_TrezorUi_Display_image_obj, 4, 4, mod_TrezorUi_Display_image); @@ -296,10 +296,10 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_TrezorUi_Display_image_obj, 4, 4, STATIC mp_obj_t mod_TrezorUi_Display_icon(size_t n_args, const mp_obj_t *args) { mp_int_t x = mp_obj_get_int(args[1]); mp_int_t y = mp_obj_get_int(args[2]); - mp_buffer_info_t bufinfo; - mp_get_buffer_raise(args[3], &bufinfo, MP_BUFFER_READ); - uint8_t *data = bufinfo.buf; - if (bufinfo.len < 8 || memcmp(data, "TOIg", 4) != 0) { + mp_buffer_info_t icon; + mp_get_buffer_raise(args[3], &icon, MP_BUFFER_READ); + const uint8_t *data = icon.buf; + if (icon.len < 8 || memcmp(data, "TOIg", 4) != 0) { nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Invalid image format")); } mp_int_t w = *(uint16_t *)(data + 4); @@ -308,12 +308,12 @@ STATIC mp_obj_t mod_TrezorUi_Display_icon(size_t n_args, const mp_obj_t *args) { if ((x < 0) || (y < 0) || (x + w > RESX) || (y + h > RESY)) { nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Out of bounds")); } - if (datalen != bufinfo.len - 12) { + if (datalen != icon.len - 12) { nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Invalid size of data")); } mp_int_t fgcolor = mp_obj_get_int(args[4]); mp_int_t bgcolor = mp_obj_get_int(args[5]); - display_icon(x, y, w, h, data + 12, bufinfo.len - 12, fgcolor, bgcolor); + display_icon(x, y, w, h, data + 12, icon.len - 12, fgcolor, bgcolor); return mp_const_none; } STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_TrezorUi_Display_icon_obj, 6, 6, mod_TrezorUi_Display_icon); @@ -322,12 +322,12 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_TrezorUi_Display_icon_obj, 6, 6, STATIC mp_obj_t mod_TrezorUi_Display_text(size_t n_args, const mp_obj_t *args) { mp_int_t x = mp_obj_get_int(args[1]); mp_int_t y = mp_obj_get_int(args[2]); - mp_buffer_info_t bufinfo; - mp_get_buffer_raise(args[3], &bufinfo, MP_BUFFER_READ); + mp_buffer_info_t text; + mp_get_buffer_raise(args[3], &text, MP_BUFFER_READ); mp_int_t font = mp_obj_get_int(args[4]); mp_int_t fgcolor = mp_obj_get_int(args[5]); mp_int_t bgcolor = mp_obj_get_int(args[6]); - display_text(x, y, bufinfo.buf, bufinfo.len, font, fgcolor, bgcolor); + display_text(x, y, text.buf, text.len, font, fgcolor, bgcolor); return mp_const_none; } STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_TrezorUi_Display_text_obj, 7, 7, mod_TrezorUi_Display_text); @@ -336,13 +336,13 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_TrezorUi_Display_text_obj, 7, 7, STATIC mp_obj_t mod_TrezorUi_Display_text_center(size_t n_args, const mp_obj_t *args) { mp_int_t x = mp_obj_get_int(args[1]); mp_int_t y = mp_obj_get_int(args[2]); - mp_buffer_info_t bufinfo; - mp_get_buffer_raise(args[3], &bufinfo, MP_BUFFER_READ); + mp_buffer_info_t text; + mp_get_buffer_raise(args[3], &text, MP_BUFFER_READ); mp_int_t font = mp_obj_get_int(args[4]); mp_int_t fgcolor = mp_obj_get_int(args[5]); mp_int_t bgcolor = mp_obj_get_int(args[6]); - uint32_t w = display_text_width(bufinfo.buf, bufinfo.len, font); - display_text(x - w / 2, y, bufinfo.buf, bufinfo.len, font, fgcolor, bgcolor); + uint32_t w = display_text_width(text.buf, text.len, font); + display_text(x - w / 2, y, text.buf, text.len, font, fgcolor, bgcolor); return mp_const_none; } STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_TrezorUi_Display_text_center_obj, 7, 7, mod_TrezorUi_Display_text_center); @@ -351,23 +351,23 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_TrezorUi_Display_text_center_obj, STATIC mp_obj_t mod_TrezorUi_Display_text_right(size_t n_args, const mp_obj_t *args) { mp_int_t x = mp_obj_get_int(args[1]); mp_int_t y = mp_obj_get_int(args[2]); - mp_buffer_info_t bufinfo; - mp_get_buffer_raise(args[3], &bufinfo, MP_BUFFER_READ); + mp_buffer_info_t text; + mp_get_buffer_raise(args[3], &text, MP_BUFFER_READ); mp_int_t font = mp_obj_get_int(args[4]); mp_int_t fgcolor = mp_obj_get_int(args[5]); mp_int_t bgcolor = mp_obj_get_int(args[6]); - uint32_t w = display_text_width(bufinfo.buf, bufinfo.len, font); - display_text(x - w, y, bufinfo.buf, bufinfo.len, font, fgcolor, bgcolor); + uint32_t w = display_text_width(text.buf, text.len, font); + display_text(x - w, y, text.buf, text.len, font, fgcolor, bgcolor); return mp_const_none; } STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_TrezorUi_Display_text_right_obj, 7, 7, mod_TrezorUi_Display_text_right); // def Display.text_width(self, text: bytes, font: int) -> int STATIC mp_obj_t mod_TrezorUi_Display_text_width(mp_obj_t self, mp_obj_t text, mp_obj_t font) { - mp_buffer_info_t bufinfo; - mp_get_buffer_raise(text, &bufinfo, MP_BUFFER_READ); + mp_buffer_info_t txt; + mp_get_buffer_raise(text, &txt, MP_BUFFER_READ); mp_int_t f = mp_obj_get_int(font); - uint32_t w = display_text_width(bufinfo.buf, bufinfo.len, f); + uint32_t w = display_text_width(txt.buf, txt.len, f); return MP_OBJ_NEW_SMALL_INT(w); } STATIC MP_DEFINE_CONST_FUN_OBJ_3(mod_TrezorUi_Display_text_width_obj, mod_TrezorUi_Display_text_width); @@ -380,9 +380,9 @@ STATIC mp_obj_t mod_TrezorUi_Display_qrcode(size_t n_args, const mp_obj_t *args) if (scale < 1 || scale > 10) { nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Scale has to be between 1 and 10")); } - mp_buffer_info_t bufinfo; - mp_get_buffer_raise(args[3], &bufinfo, MP_BUFFER_READ); - display_qrcode(x, y, bufinfo.buf, bufinfo.len, scale); + mp_buffer_info_t data; + mp_get_buffer_raise(args[3], &data, MP_BUFFER_READ); + display_qrcode(x, y, data.buf, data.len, scale); return mp_const_none; } STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_TrezorUi_Display_qrcode_obj, 5, 5, mod_TrezorUi_Display_qrcode); @@ -400,10 +400,10 @@ STATIC mp_obj_t mod_TrezorUi_Display_loader(size_t n_args, const mp_obj_t *args) mp_int_t fgcolor = mp_obj_get_int(args[2]); mp_int_t bgcolor = mp_obj_get_int(args[3]); if (n_args > 4) { // icon provided - mp_buffer_info_t bufinfo; - mp_get_buffer_raise(args[4], &bufinfo, MP_BUFFER_READ); - uint8_t *data = bufinfo.buf; - if (bufinfo.len < 8 || memcmp(data, "TOIg", 4) != 0) { + mp_buffer_info_t icon; + mp_get_buffer_raise(args[4], &icon, MP_BUFFER_READ); + const uint8_t *data = icon.buf; + if (icon.len < 8 || memcmp(data, "TOIg", 4) != 0) { nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Invalid image format")); } mp_int_t w = *(uint16_t *)(data + 4); @@ -412,7 +412,7 @@ STATIC mp_obj_t mod_TrezorUi_Display_loader(size_t n_args, const mp_obj_t *args) if (w != 96 || h != 96) { nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Invalid icon size")); } - if (datalen != bufinfo.len - 12) { + if (datalen != icon.len - 12) { nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Invalid size of data")); } uint8_t icondata[96 * 96 /2]; @@ -445,9 +445,9 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_TrezorUi_Display_orientation_obj, mod_Trezo // def Display.raw(self, reg: int, data: bytes) -> None STATIC mp_obj_t mod_TrezorUi_Display_raw(mp_obj_t self, mp_obj_t reg, mp_obj_t data) { mp_int_t r = mp_obj_get_int(reg); - mp_buffer_info_t bufinfo; - mp_get_buffer_raise(data, &bufinfo, MP_BUFFER_READ); - display_raw(r, bufinfo.buf, bufinfo.len); + mp_buffer_info_t raw; + mp_get_buffer_raise(data, &raw, MP_BUFFER_READ); + display_raw(r, raw.buf, raw.len); return mp_const_none; } STATIC MP_DEFINE_CONST_FUN_OBJ_3(mod_TrezorUi_Display_raw_obj, mod_TrezorUi_Display_raw); diff --git a/extmod/modtrezorui/modtrezorui-inflate.h b/extmod/modtrezorui/modtrezorui-inflate.h index 221e525599..4d6a4b2e79 100644 --- a/extmod/modtrezorui/modtrezorui-inflate.h +++ b/extmod/modtrezorui/modtrezorui-inflate.h @@ -394,7 +394,7 @@ static int sinf_inflate_dynamic_block(SINF_DATA *d) * ---------------------- */ /* inflate stream from source */ -static int sinf_inflate(uint8_t *data, void (*write_callback)(uint8_t byte, uint32_t pos, void *userdata), void *userdata) +static int sinf_inflate(const uint8_t *data, void (*write_callback)(uint8_t byte, uint32_t pos, void *userdata), void *userdata) { SINF_DATA d; int bfinal;