diff options
Diffstat (limited to 'extmod')
| -rw-r--r-- | extmod/asyncio/core.py | 2 | ||||
| -rw-r--r-- | extmod/modtls_mbedtls.c | 2 | ||||
| -rw-r--r-- | extmod/modwebsocket.c | 28 | ||||
| -rw-r--r-- | extmod/vfs.c | 2 |
4 files changed, 21 insertions, 13 deletions
diff --git a/extmod/asyncio/core.py b/extmod/asyncio/core.py index 5d46b4b80..7b70b43bc 100644 --- a/extmod/asyncio/core.py +++ b/extmod/asyncio/core.py @@ -50,7 +50,7 @@ class SingletonGenerator: raise self.exc -# Pause task execution for the given time (integer in milliseconds, uPy extension) +# Pause task execution for the given time (integer in milliseconds, MicroPython extension) # Use a SingletonGenerator to do it without allocating on the heap def sleep_ms(t, sgen=SingletonGenerator()): assert sgen.state is None diff --git a/extmod/modtls_mbedtls.c b/extmod/modtls_mbedtls.c index 586342573..e2f7254f7 100644 --- a/extmod/modtls_mbedtls.c +++ b/extmod/modtls_mbedtls.c @@ -304,7 +304,7 @@ static mp_obj_t ssl_context_make_new(const mp_obj_type_t *type_in, size_t n_args psa_crypto_init(); #endif - const byte seed[] = "upy"; + const byte seed[] = "mpy"; int ret = mbedtls_ctr_drbg_seed(&self->ctr_drbg, mbedtls_entropy_func, &self->entropy, seed, sizeof(seed)); if (ret != 0) { mbedtls_raise_error(ret); diff --git a/extmod/modwebsocket.c b/extmod/modwebsocket.c index d31d00160..6a35dc1db 100644 --- a/extmod/modwebsocket.c +++ b/extmod/modwebsocket.c @@ -76,6 +76,7 @@ static mp_obj_t websocket_make_new(const mp_obj_type_t *type, size_t n_args, siz static mp_uint_t websocket_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) { mp_obj_websocket_t *self = MP_OBJ_TO_PTR(self_in); + const mp_stream_p_t *stream_p = mp_get_stream(self->sock); while (1) { if (self->to_recv != 0) { @@ -93,9 +94,6 @@ static mp_uint_t websocket_read(mp_obj_t self_in, void *buf, mp_uint_t size, int switch (self->state) { case FRAME_HEADER: { - // TODO: Split frame handling below is untested so far, so conservatively disable it - assert(self->buf[0] & 0x80); - // "Control frames MAY be injected in the middle of a fragmented message." // So, they must be processed before data frames (and not alter // self->ws_flags) @@ -120,14 +118,15 @@ static mp_uint_t websocket_read(mp_obj_t self_in, void *buf, mp_uint_t size, int // Msg size is next 2 bytes to_recv += 2; } else if (sz == 127) { - // Msg size is next 8 bytes - assert(0); + // Msg size is next 8 bytes (unsupported, no way to recover) + mp_stream_close(self->sock); + *errcode = MP_EIO; + return MP_STREAM_ERROR; } if (self->buf[1] & 0x80) { // Next 4 bytes is mask to_recv += 4; } - self->buf_pos = 0; self->to_recv = to_recv; self->msg_sz = sz; // May be overridden by FRAME_OPT @@ -144,11 +143,13 @@ static mp_uint_t websocket_read(mp_obj_t self_in, void *buf, mp_uint_t size, int } case FRAME_OPT: { - if ((self->buf_pos & 3) == 2) { - // First two bytes are message length + if (self->buf_pos & 2) { // to_recv was 2 or 6 + assert(self->buf_pos == 2 || self->buf_pos == 6); + // First two bytes are message length. Technically the size must be at least 126 per RFC6455 + // but MicroPython skips checking that. self->msg_sz = (self->buf[0] << 8) | self->buf[1]; } - if (self->buf_pos >= 4) { + if (self->buf_pos & 4) { // Last 4 bytes is mask memcpy(self->mask, self->buf + self->buf_pos - 4, 4); } @@ -218,9 +219,16 @@ static mp_uint_t websocket_read(mp_obj_t self_in, void *buf, mp_uint_t size, int static mp_uint_t websocket_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) { mp_obj_websocket_t *self = MP_OBJ_TO_PTR(self_in); - assert(size < 0x10000); + if (size >= 0x10000) { + *errcode = MP_ENOBUFS; + return MP_STREAM_ERROR; + } byte header[4] = {0x80 | (self->opts & FRAME_OPCODE_MASK)}; int hdr_sz; + // "Note that in all cases, the minimal number of bytes MUST be used to + // encode the length, for example, the length of a 124-byte-long string + // can't be encoded as the sequence 126, 0, 124." + // -- https://www.rfc-editor.org/rfc/rfc6455.html if (size < 126) { header[1] = size; hdr_sz = 2; diff --git a/extmod/vfs.c b/extmod/vfs.c index aebf5ed29..d2a7af5de 100644 --- a/extmod/vfs.c +++ b/extmod/vfs.c @@ -96,7 +96,7 @@ mp_vfs_mount_t *mp_vfs_lookup_path(const char *path, const char **path_out) { return MP_STATE_VM(vfs_cur); } -// Version of mp_vfs_lookup_path that takes and returns uPy string objects. +// Version of mp_vfs_lookup_path that takes and returns MicroPython string objects. static mp_vfs_mount_t *lookup_path(mp_obj_t path_in, mp_obj_t *path_out) { const char *path = mp_obj_str_get_str(path_in); const char *p_out; |