mirror of
https://github.com/licsber/micropython.git
synced 2024-09-20 00:50:24 +08:00
9c7c082396
For this, add wrap_socket(do_handshake=False) param. CPython doesn't have such a param at a module's global function, and at SSLContext.wrap_socket() it has do_handshake_on_connect param, but that uselessly long. Beyond that, make write() handle not just MBEDTLS_ERR_SSL_WANT_WRITE, but also MBEDTLS_ERR_SSL_WANT_READ, as during handshake, write call may be actually preempted by need to read next handshake message from peer. Likewise, for read(). And even after the initial negotiation, situations like that may happen e.g. with renegotiation. Both MBEDTLS_ERR_SSL_WANT_READ and MBEDTLS_ERR_SSL_WANT_WRITE are however mapped to the same None return code. The idea is that if the same read()/write() method is called repeatedly, the progress will be made step by step anyway. The caveat is if user wants to add the underlying socket to uselect.poll(). To be reliable, in this case, the socket should be polled for both POLL_IN and POLL_OUT, as we don't know the actual expected direction. But that's actually problematic. Consider for example that write() ends with MBEDTLS_ERR_SSL_WANT_READ, but gets converted to None. We put the underlying socket on pull using POLL_IN|POLL_OUT but that probably returns immediately with POLL_OUT, as underlyings socket is writable. We call the same ussl write() again, which again results in MBEDTLS_ERR_SSL_WANT_READ, etc. We thus go into busy-loop. So, the handling in this patch is temporary and needs fixing. But exact way to fix it is not clear. One way is to provide explicit function for handshake (CPython has do_handshake()), and let *that* return distinct codes like WANT_READ/WANT_WRITE. But as mentioned above, past the initial handshake, such situation may happen again with at least renegotiation. So apparently, the only robust solution is to return "out of bound" special sentinels like WANT_READ/WANT_WRITE from read()/write() directly. CPython throws exceptions for these, but those are expensive to adopt that way for efficiency-conscious implementation like MicroPython. |
||
|---|---|---|
| .. | ||
| axtls-include | ||
| crypto-algorithms | ||
| lwip-include | ||
| re1.5 | ||
| uzlib | ||
| machine_i2c.c | ||
| machine_i2c.h | ||
| machine_mem.c | ||
| machine_mem.h | ||
| machine_pinbase.c | ||
| machine_pinbase.h | ||
| machine_pulse.c | ||
| machine_pulse.h | ||
| machine_signal.c | ||
| machine_signal.h | ||
| machine_spi.c | ||
| machine_spi.h | ||
| misc.h | ||
| modbtree.c | ||
| modframebuf.c | ||
| modlwip.c | ||
| modonewire.c | ||
| modubinascii.c | ||
| modubinascii.h | ||
| moducryptolib.c | ||
| moductypes.c | ||
| moduhashlib.c | ||
| moduheapq.c | ||
| modujson.c | ||
| modurandom.c | ||
| modure.c | ||
| moduselect.c | ||
| modussl_axtls.c | ||
| modussl_mbedtls.c | ||
| modutimeq.c | ||
| moduwebsocket.c | ||
| moduwebsocket.h | ||
| moduzlib.c | ||
| modwebrepl.c | ||
| uos_dupterm.c | ||
| utime_mphal.c | ||
| utime_mphal.h | ||
| vfs_fat_diskio.c | ||
| vfs_fat_file.c | ||
| vfs_fat.c | ||
| vfs_fat.h | ||
| vfs_posix_file.c | ||
| vfs_posix.c | ||
| vfs_posix.h | ||
| vfs_reader.c | ||
| vfs.c | ||
| vfs.h | ||
| virtpin.c | ||
| virtpin.h | ||