Skip to content

mpy v1.28.0 #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
scgbckbone wants to merge 15 commits into
base: master
Choose a base branch
from
Open

mpy v1.28.0 #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
0b1b032
update mpy to v1.28
scgbckbone Apr 21, 2026
c783a6b
fix MP_REGISTER_MODULE
scgbckbone Apr 21, 2026
9e1fb66
vibed: modngu_hash_sha512_make_new
scgbckbone Apr 21, 2026
d26c1aa
vibe fix
scgbckbone Apr 21, 2026
5d696da
STATIC -> static
scgbckbone Apr 21, 2026
a7470a3
DEFINE_CONST_OBJ_TYPE
scgbckbone Apr 21, 2026
6b80f72
get rid of vstr
scgbckbone Apr 21, 2026
7047d71
m_new_obj_with_finaliser -> m_malloc_with_finaliser
scgbckbone Apr 21, 2026
10b8e3d
mbedtls related fixes
scgbckbone Apr 21, 2026
43ab96a
define port mpconfigvariant.h
scgbckbone Apr 21, 2026
53da5dc
cert test issue
scgbckbone Apr 21, 2026
5ea42f7
remove mpy.patch
scgbckbone Apr 21, 2026
0089f0c
with zlib
scgbckbone Apr 21, 2026
61b11d2
mac compat
scgbckbone May 4, 2026
b374d6a
no longer needed
scgbckbone May 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ S_TOP ?= libs/secp256k1
MBED_TOP ?= $(MPY_TOP)/lib/mbedtls

BECH32_PATCH ?= cd libs/bech32; git apply ../../bech32.patch || true
MPY_PATCH ?= cd libs/mpy; git apply ../../mpy.patch || true

all: $(TARGET)

Expand Down Expand Up @@ -36,7 +35,6 @@ K1_CONF_FLAGS = --with-ecmult-window=2 --with-ecmult-gen-kb=2 --enable-module-re
one-time:
cd $(MPY_TOP); git submodule update
$(BECH32_PATCH)
$(MPY_PATCH)
cd $(MPY_TOP)/mpy-cross; make
cd $(S_TOP); ./autogen.sh && ./configure $(K1_CONF_FLAGS) && make precomp

Expand All @@ -45,7 +43,6 @@ one-time:
min-one-time:
cd libs; git submodule update --init bech32 cifra secp256k1
$(BECH32_PATCH)
$(MPY_PATCH)
cd $(S_TOP); ./autogen.sh && ./configure $(K1_CONF_FLAGS) && make precomp

esp:
Expand Down
2 changes: 1 addition & 1 deletion libs/mpy
Open in desktop
Submodule mpy updated 5660 files
13 changes: 0 additions & 13 deletions mpy.patch
View file
Open in desktop

This file was deleted.

94 changes: 47 additions & 47 deletions ngu/aes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ typedef struct {
cf_ctr mode_ctx;
} mp_obj_CTR_t;

STATIC const mp_obj_type_t s_CBC_type, s_CTR_type;
static const mp_obj_type_t s_CBC_type, s_CTR_type;

static void _aes_setup(cf_aes_context *aes_ctx, const mp_obj_t key_in)
{
Expand All @@ -45,11 +45,11 @@ static void _aes_setup(cf_aes_context *aes_ctx, const mp_obj_t key_in)
cf_aes_init(aes_ctx, key.buf, key.len);
}

STATIC mp_obj_t s_CBC_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
static mp_obj_t s_CBC_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
// args: is_encrypt, key, iv?
mp_arg_check_num(n_args, n_kw, 3, 3, false);

mp_obj_CBC_t *o = m_new_obj_with_finaliser(mp_obj_CBC_t);
mp_obj_CBC_t *o = (mp_obj_CBC_t *)m_malloc_with_finaliser(sizeof(mp_obj_CBC_t));
o->base.type = type;

o->is_encrypt = !!mp_obj_get_int_truncated(args[0]);
Expand All @@ -66,11 +66,11 @@ STATIC mp_obj_t s_CBC_make_new(const mp_obj_type_t *type, size_t n_args, size_t

return MP_OBJ_FROM_PTR(o);
}
STATIC mp_obj_t s_CTR_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
static mp_obj_t s_CTR_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
// args: key, nonce
mp_arg_check_num(n_args, n_kw, 1, 2, false);

mp_obj_CTR_t *o = m_new_obj_with_finaliser(mp_obj_CTR_t);
mp_obj_CTR_t *o = (mp_obj_CTR_t *)m_malloc_with_finaliser(sizeof(mp_obj_CTR_t));
o->base.type = type;

_aes_setup(&o->aes_ctx, args[0]);
Expand All @@ -91,49 +91,48 @@ STATIC mp_obj_t s_CTR_make_new(const mp_obj_type_t *type, size_t n_args, size_t
return MP_OBJ_FROM_PTR(o);
}

STATIC mp_obj_t s_CBC_cipher(mp_obj_t self_in, mp_obj_t buf_in)
static mp_obj_t s_CBC_cipher(mp_obj_t self_in, mp_obj_t buf_in)
{
mp_buffer_info_t buf;
mp_get_buffer_raise(buf_in, &buf, MP_BUFFER_READ);
mp_obj_CBC_t *self = MP_OBJ_TO_PTR(self_in);

assert(self->aes_ctx.rounds);

vstr_t rv;
vstr_init_len(&rv, buf.len);
uint8_t rv[buf.len];

if(buf.len % CF_MAXBLOCK) { // 16
mp_raise_ValueError(NULL);
}

if(self->is_encrypt) {
cf_cbc_encrypt(&self->mode_ctx, buf.buf, (uint8_t *)rv.buf, buf.len/CF_MAXBLOCK);
cf_cbc_encrypt(&self->mode_ctx, buf.buf, rv, buf.len/CF_MAXBLOCK);
} else {
cf_cbc_decrypt(&self->mode_ctx, buf.buf, (uint8_t *)rv.buf, buf.len/CF_MAXBLOCK);
cf_cbc_decrypt(&self->mode_ctx, buf.buf, rv, buf.len/CF_MAXBLOCK);
}

return mp_obj_new_str_from_vstr(&mp_type_bytes, &rv);
return mp_obj_new_bytes(rv, buf.len);
}
STATIC MP_DEFINE_CONST_FUN_OBJ_2(s_CBC_cipher_obj, s_CBC_cipher);
static MP_DEFINE_CONST_FUN_OBJ_2(s_CBC_cipher_obj, s_CBC_cipher);

STATIC mp_obj_t s_CTR_cipher(mp_obj_t self_in, mp_obj_t buf_in)
static mp_obj_t s_CTR_cipher(mp_obj_t self_in, mp_obj_t buf_in)
{
mp_buffer_info_t buf;
mp_get_buffer_raise(buf_in, &buf, MP_BUFFER_READ);
mp_obj_CTR_t *self = MP_OBJ_TO_PTR(self_in);

assert(self->aes_ctx.rounds);

vstr_t rv;
vstr_init_len(&rv, buf.len);
uint8_t rv[buf.len];

// any size i/o works
cf_ctr_cipher(&self->mode_ctx, buf.buf, (uint8_t *)rv.buf, buf.len);
cf_ctr_cipher(&self->mode_ctx, buf.buf, rv, buf.len);

return mp_obj_new_str_from_vstr(&mp_type_bytes, &rv);
return mp_obj_new_bytes(rv, buf.len);
}
STATIC MP_DEFINE_CONST_FUN_OBJ_2(s_CTR_cipher_obj, s_CTR_cipher);
static MP_DEFINE_CONST_FUN_OBJ_2(s_CTR_cipher_obj, s_CTR_cipher);

STATIC mp_obj_t s_CBC_blank(mp_obj_t self_in) {
static mp_obj_t s_CBC_blank(mp_obj_t self_in) {
mp_obj_CBC_t *self = MP_OBJ_TO_PTR(self_in);

// cf_aes_finish is just this anyway
Expand All @@ -142,20 +141,20 @@ STATIC mp_obj_t s_CBC_blank(mp_obj_t self_in) {

return MP_OBJ_FROM_PTR(self);
}
STATIC MP_DEFINE_CONST_FUN_OBJ_1(s_CBC_blank_obj, s_CBC_blank);
static MP_DEFINE_CONST_FUN_OBJ_1(s_CBC_blank_obj, s_CBC_blank);

STATIC mp_obj_t s_CBC_copy(mp_obj_t self_in) {
static mp_obj_t s_CBC_copy(mp_obj_t self_in) {
mp_obj_CBC_t *self = MP_OBJ_TO_PTR(self_in);

mp_obj_CBC_t *rv = m_new_obj_with_finaliser(mp_obj_CBC_t);
mp_obj_CBC_t *rv = (mp_obj_CBC_t *)m_malloc_with_finaliser(sizeof(mp_obj_CBC_t));
*rv = *self;
rv->base.type = &s_CBC_type;

return MP_OBJ_FROM_PTR(rv);
}
STATIC MP_DEFINE_CONST_FUN_OBJ_1(s_CBC_copy_obj, s_CBC_copy);
static MP_DEFINE_CONST_FUN_OBJ_1(s_CBC_copy_obj, s_CBC_copy);

STATIC mp_obj_t s_CTR_blank(mp_obj_t self_in) {
static mp_obj_t s_CTR_blank(mp_obj_t self_in) {
mp_obj_CTR_t *self = MP_OBJ_TO_PTR(self_in);

// cf_aes_finish is just this anyway
Expand All @@ -164,59 +163,60 @@ STATIC mp_obj_t s_CTR_blank(mp_obj_t self_in) {

return MP_OBJ_FROM_PTR(self);
}
STATIC MP_DEFINE_CONST_FUN_OBJ_1(s_CTR_blank_obj, s_CTR_blank);
static MP_DEFINE_CONST_FUN_OBJ_1(s_CTR_blank_obj, s_CTR_blank);

STATIC mp_obj_t s_CTR_copy(mp_obj_t self_in) {
static mp_obj_t s_CTR_copy(mp_obj_t self_in) {
mp_obj_CTR_t *self = MP_OBJ_TO_PTR(self_in);

mp_obj_CTR_t *rv = m_new_obj_with_finaliser(mp_obj_CTR_t);
mp_obj_CTR_t *rv = (mp_obj_CTR_t *)m_malloc_with_finaliser(sizeof(mp_obj_CTR_t));
*rv = *self;
rv->base.type = &s_CTR_type;

return MP_OBJ_FROM_PTR(rv);
}
STATIC MP_DEFINE_CONST_FUN_OBJ_1(s_CTR_copy_obj, s_CTR_copy);
static MP_DEFINE_CONST_FUN_OBJ_1(s_CTR_copy_obj, s_CTR_copy);


STATIC const mp_rom_map_elem_t s_CBC_locals_dict_table[] = {
static const mp_rom_map_elem_t s_CBC_locals_dict_table[] = {
{ MP_ROM_QSTR(MP_QSTR_cipher), MP_ROM_PTR(&s_CBC_cipher_obj) },
{ MP_ROM_QSTR(MP_QSTR_blank), MP_ROM_PTR(&s_CBC_blank_obj) },
{ MP_ROM_QSTR(MP_QSTR_copy), MP_ROM_PTR(&s_CBC_copy_obj) },
{ MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&s_CBC_blank_obj) },
};
STATIC MP_DEFINE_CONST_DICT(s_CBC_locals_dict, s_CBC_locals_dict_table);
static MP_DEFINE_CONST_DICT(s_CBC_locals_dict, s_CBC_locals_dict_table);

STATIC const mp_obj_type_t s_CBC_type = {
{ &mp_type_type },
.name = MP_QSTR_CBC,
.make_new = s_CBC_make_new,
.locals_dict = (void *)&s_CBC_locals_dict,
};
static MP_DEFINE_CONST_OBJ_TYPE(
s_CBC_type,
MP_QSTR_CBC,
MP_TYPE_FLAG_NONE,
make_new, s_CBC_make_new,
locals_dict, &s_CBC_locals_dict
);

STATIC const mp_rom_map_elem_t s_CTR_locals_dict_table[] = {
static const mp_rom_map_elem_t s_CTR_locals_dict_table[] = {
{ MP_ROM_QSTR(MP_QSTR_cipher), MP_ROM_PTR(&s_CTR_cipher_obj) },
{ MP_ROM_QSTR(MP_QSTR_blank), MP_ROM_PTR(&s_CTR_blank_obj) },
{ MP_ROM_QSTR(MP_QSTR_copy), MP_ROM_PTR(&s_CTR_copy_obj) },
{ MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&s_CTR_blank_obj) },
};
STATIC MP_DEFINE_CONST_DICT(s_CTR_locals_dict, s_CTR_locals_dict_table);

STATIC const mp_obj_type_t s_CTR_type = {
{ &mp_type_type },
.name = MP_QSTR_CTR,
.make_new = s_CTR_make_new,
.locals_dict = (void *)&s_CTR_locals_dict,
};
static MP_DEFINE_CONST_DICT(s_CTR_locals_dict, s_CTR_locals_dict_table);

static MP_DEFINE_CONST_OBJ_TYPE(
s_CTR_type,
MP_QSTR_CTR,
MP_TYPE_FLAG_NONE,
make_new, s_CTR_make_new,
locals_dict, &s_CTR_locals_dict
);

STATIC const mp_rom_map_elem_t mp_module_aes_globals_table[] = {
static const mp_rom_map_elem_t mp_module_aes_globals_table[] = {
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_aes) },

{ MP_ROM_QSTR(MP_QSTR_CTR), MP_ROM_PTR(&s_CTR_type) },
{ MP_ROM_QSTR(MP_QSTR_CBC), MP_ROM_PTR(&s_CBC_type) },
};

STATIC MP_DEFINE_CONST_DICT(mp_module_aes_globals, mp_module_aes_globals_table);
static MP_DEFINE_CONST_DICT(mp_module_aes_globals, mp_module_aes_globals_table);

const mp_obj_module_t mp_module_aes = {
.base = { &mp_type_module },
Expand Down
62 changes: 31 additions & 31 deletions ngu/cert.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
if(rv) nlr_raise(mp_obj_new_exception_arg1(&mp_type_RuntimeError, \
MP_OBJ_NEW_SMALL_INT(rv))); }

STATIC const mp_obj_type_t cert_type;
static const mp_obj_type_t cert_type;

typedef struct {
mp_obj_base_t base;
Expand All @@ -28,10 +28,10 @@ typedef struct {


// Constructor
STATIC mp_obj_t cert_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
static mp_obj_t cert_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
mp_arg_check_num(n_args, n_kw, 0, 0, false);

mp_obj_cert_t *o = m_new_obj_with_finaliser(mp_obj_cert_t);
mp_obj_cert_t *o = (mp_obj_cert_t *)m_malloc_with_finaliser(sizeof(mp_obj_cert_t));
o->base.type = type;

mbedtls_x509_crt_init(&o->mcert);
Expand All @@ -40,18 +40,18 @@ STATIC mp_obj_t cert_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
}

// Finalizer
STATIC mp_obj_t cert_del(mp_obj_t self_in) {
static mp_obj_t cert_del(mp_obj_t self_in) {
mp_obj_cert_t *self = MP_OBJ_TO_PTR(self_in);

mbedtls_x509_crt_free(&self->mcert);

return mp_const_none;
}
STATIC MP_DEFINE_CONST_FUN_OBJ_1(cert_del_obj, cert_del);
static MP_DEFINE_CONST_FUN_OBJ_1(cert_del_obj, cert_del);


// Parse PEM (base64)
STATIC mp_obj_t parse(mp_obj_t self_in, mp_obj_t data_in)
static mp_obj_t parse(mp_obj_t self_in, mp_obj_t data_in)
{
mp_obj_cert_t *self = MP_OBJ_TO_PTR(self_in);

Expand All @@ -62,10 +62,10 @@ STATIC mp_obj_t parse(mp_obj_t self_in, mp_obj_t data_in)

return mp_const_none;
}
STATIC MP_DEFINE_CONST_FUN_OBJ_2(parse_obj, parse);
static MP_DEFINE_CONST_FUN_OBJ_2(parse_obj, parse);

// Verify chain
STATIC mp_obj_t verify_chain(mp_obj_t self_in, mp_obj_t trust_ca_in)
static mp_obj_t verify_chain(mp_obj_t self_in, mp_obj_t trust_ca_in)
{
// TODO: add ca_crl, profile, etc.
mp_obj_cert_t *self = MP_OBJ_TO_PTR(self_in);
Expand All @@ -87,10 +87,10 @@ STATIC mp_obj_t verify_chain(mp_obj_t self_in, mp_obj_t trust_ca_in)

return MP_OBJ_NEW_SMALL_INT(rv);
}
STATIC MP_DEFINE_CONST_FUN_OBJ_2(verify_chain_obj, verify_chain);
static MP_DEFINE_CONST_FUN_OBJ_2(verify_chain_obj, verify_chain);

// get_ec_pubkey
STATIC mp_obj_t get_ec_pubkey(mp_obj_t self_in)
static mp_obj_t get_ec_pubkey(mp_obj_t self_in)
{
mp_obj_cert_t *self = MP_OBJ_TO_PTR(self_in);
mbedtls_pk_context *pk = &self->mcert.pk;
Expand All @@ -105,23 +105,22 @@ STATIC mp_obj_t get_ec_pubkey(mp_obj_t self_in)
mp_raise_TypeError(MP_ERROR_TEXT("only EC for now"));
}


vstr_t vstr;
vstr_init_len(&vstr, 65);
unsigned char pk_buf[65];

const mbedtls_ecp_keypair *pair = mbedtls_pk_ec(*pk);
size_t actual = 0;
CHECK_RESULT(mbedtls_ecp_point_write_binary(&pair->grp, &pair->Q,
MBEDTLS_ECP_PF_UNCOMPRESSED, &actual, (uint8_t *)vstr.buf, vstr.len));

CHECK_RESULT(mbedtls_ecp_point_write_binary(&pair->MBEDTLS_PRIVATE(grp), &pair->MBEDTLS_PRIVATE(Q),
MBEDTLS_ECP_PF_UNCOMPRESSED, &actual, pk_buf, 65));

assert(actual == 65);

return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
return mp_obj_new_bytes(pk_buf, 65);
}
STATIC MP_DEFINE_CONST_FUN_OBJ_1(get_ec_pubkey_obj, get_ec_pubkey);
static MP_DEFINE_CONST_FUN_OBJ_1(get_ec_pubkey_obj, get_ec_pubkey);

// __repr__
STATIC void cert_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
static void cert_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
(void)kind;
mp_obj_cert_t *self = MP_OBJ_TO_PTR(self_in);

Expand All @@ -132,28 +131,29 @@ STATIC void cert_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_
}


STATIC const mp_rom_map_elem_t cert_locals_dict_table[] = {
static const mp_rom_map_elem_t cert_locals_dict_table[] = {
{ MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&cert_del_obj) },
{ MP_ROM_QSTR(MP_QSTR_parse), MP_ROM_PTR(&parse_obj) },
{ MP_ROM_QSTR(MP_QSTR_verify_chain), MP_ROM_PTR(&verify_chain_obj) },
{ MP_ROM_QSTR(MP_QSTR_get_ec_pubkey), MP_ROM_PTR(&get_ec_pubkey_obj) },
};
STATIC MP_DEFINE_CONST_DICT(cert_locals_dict, cert_locals_dict_table);

STATIC const mp_obj_type_t cert_type = {
{ &mp_type_type },
.name = MP_QSTR_x509_cert,
.print = cert_print,
.make_new = cert_make_new,
.locals_dict = (void *)&cert_locals_dict,
};

STATIC const mp_rom_map_elem_t globals_table[] = {
static MP_DEFINE_CONST_DICT(cert_locals_dict, cert_locals_dict_table);

static MP_DEFINE_CONST_OBJ_TYPE(
cert_type,
MP_QSTR_x509_cert,
MP_TYPE_FLAG_NONE,
print, cert_print,
make_new, cert_make_new,
locals_dict, &cert_locals_dict
);

static const mp_rom_map_elem_t globals_table[] = {
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_cert) },
{ MP_ROM_QSTR(MP_QSTR_x509), MP_ROM_PTR(&cert_type) },
};

STATIC MP_DEFINE_CONST_DICT(mod_globals, globals_table);
static MP_DEFINE_CONST_DICT(mod_globals, globals_table);

const mp_obj_module_t mp_module_cert = {
.base = { &mp_type_module },
Expand Down
Loading