Merge pull request #7632 from jepler/fix-picow-ssl-error-returns

dhalbert · web-flow · commit 9b6abea907dd · 2023-02-22T11:38:59.000-05:00
raspberrypi: SSLSocket: raise OSError when appropriate
diff --git a/ports/raspberrypi/common-hal/ssl/SSLSocket.c b/ports/raspberrypi/common-hal/ssl/SSLSocket.c
@@ -260,8 +260,8 @@ mp_uint_t common_hal_ssl_sslsocket_recv_into(ssl_sslsocket_obj_t *self, uint8_t
         // renegotation.
         ret = MP_EWOULDBLOCK;
     }
-    DEBUG("returning [error case] %d\n", -ret);
-    return -ret;
+    DEBUG("raising errno [error case] %d\n", ret);
+    mp_raise_OSError(ret);
 }
 
 mp_uint_t common_hal_ssl_sslsocket_send(ssl_sslsocket_obj_t *self, const uint8_t *buf, uint32_t len) {
@@ -279,8 +279,8 @@ mp_uint_t common_hal_ssl_sslsocket_send(ssl_sslsocket_obj_t *self, const uint8_t
         // renegotation.
         ret = MP_EWOULDBLOCK;
     }
-    DEBUG("returning [error case] %d\n", -ret);
-    return -ret;
+    DEBUG("raising errno [error case] %d\n", ret);
+    mp_raise_OSError(ret);
 }
 
 bool common_hal_ssl_sslsocket_bind(ssl_sslsocket_obj_t *self, const char *host, size_t hostlen, uint32_t port) {

Original file line number	Diff line number	Diff line change
`@@ -260,8 +260,8 @@ mp_uint_t common_hal_ssl_sslsocket_recv_into(ssl_sslsocket_obj_t *self, uint8_t`
`260`	`260`	`// renegotation.`
`261`	`261`	`ret = MP_EWOULDBLOCK;`
`262`	`262`	`}`
`263`		`- DEBUG("returning [error case] %d\n", -ret);`
`264`		`- return -ret;`
	`263`	`+ DEBUG("raising errno [error case] %d\n", ret);`
	`264`	`+ mp_raise_OSError(ret);`
`265`	`265`	`}`
`266`	`266`
`267`	`267`	`mp_uint_t common_hal_ssl_sslsocket_send(ssl_sslsocket_obj_t self, const uint8_t buf, uint32_t len) {`
`@@ -279,8 +279,8 @@ mp_uint_t common_hal_ssl_sslsocket_send(ssl_sslsocket_obj_t *self, const uint8_t`
`279`	`279`	`// renegotation.`
`280`	`280`	`ret = MP_EWOULDBLOCK;`
`281`	`281`	`}`
`282`		`- DEBUG("returning [error case] %d\n", -ret);`
`283`		`- return -ret;`
	`282`	`+ DEBUG("raising errno [error case] %d\n", ret);`
	`283`	`+ mp_raise_OSError(ret);`
`284`	`284`	`}`
`285`	`285`
`286`	`286`	`bool common_hal_ssl_sslsocket_bind(ssl_sslsocket_obj_t self, const char host, size_t hostlen, uint32_t port) {`