Skip to content

Commit b90e94c

Browse files
committed
extmod/modussl_mbedtls.c: Switch ca_certs to cadata.
Rename ca_certs kwarg in ssl.wrap_socket to cadata to avoid name clash with CPython ca_certs. Signed-off-by: Carlos Gil <[email protected]>
1 parent 76037a3 commit b90e94c

File tree

6 files changed

+14
-255
lines changed

6 files changed

+14
-255
lines changed

docs/library/ssl.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ facilities for network sockets, both client-side and server-side.
1313
Functions
1414
---------
1515

16-
.. function:: ssl.wrap_socket(sock, server_side=False, keyfile=None, certfile=None, cert_reqs=CERT_NONE, ca_certs=None, do_handshake=True)
16+
.. function:: ssl.wrap_socket(sock, server_side=False, keyfile=None, certfile=None, cert_reqs=CERT_NONE, cadata=None, do_handshake=True)
1717

1818
Takes a `stream` *sock* (usually socket.socket instance of ``SOCK_STREAM`` type),
1919
and returns an instance of ssl.SSLSocket, which wraps the underlying stream in
@@ -35,7 +35,7 @@ Functions
3535
Note that for mbedtls based ports, ``ssl.CERT_NONE`` and ``ssl.CERT_OPTIONAL`` will not
3636
validate any certificate, only ``ssl.CERT_REQUIRED`` will.
3737

38-
- *ca_certs* is the CA certificate chain that will validate the peer's certificate.
38+
- *cadata* is the CA certificate chain that will validate the peer's certificate.
3939

4040

4141
Depending on the underlying module implementation in a particular

extmod/modussl_mbedtls.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ struct ssl_args {
6464
mp_arg_val_t server_side;
6565
mp_arg_val_t server_hostname;
6666
mp_arg_val_t cert_reqs;
67-
mp_arg_val_t ca_certs;
67+
mp_arg_val_t cadata;
6868
mp_arg_val_t do_handshake;
6969
};
7070

@@ -242,9 +242,9 @@ STATIC mp_obj_ssl_socket_t *socket_new(mp_obj_t sock, struct ssl_args *args) {
242242
}
243243
}
244244

245-
if (args->ca_certs.u_obj != mp_const_none) {
245+
if (args->cadata.u_obj != mp_const_none) {
246246
size_t cacert_len;
247-
const byte *cacert = (const byte *)mp_obj_str_get_data(args->ca_certs.u_obj, &cacert_len);
247+
const byte *cacert = (const byte *)mp_obj_str_get_data(args->cadata.u_obj, &cacert_len);
248248
// len should include terminating null
249249
ret = mbedtls_x509_crt_parse(&o->cacert, cacert, cacert_len + 1);
250250
if (ret != 0) {
@@ -415,7 +415,7 @@ STATIC mp_obj_t mod_ssl_wrap_socket(size_t n_args, const mp_obj_t *pos_args, mp_
415415
{ MP_QSTR_server_side, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
416416
{ MP_QSTR_server_hostname, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
417417
{ MP_QSTR_cert_reqs, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = MBEDTLS_SSL_VERIFY_NONE}},
418-
{ MP_QSTR_ca_certs, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
418+
{ MP_QSTR_cadata, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
419419
{ MP_QSTR_do_handshake, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = true} },
420420
};
421421

tests/multi_net/ssl_cert_ecc.py

Lines changed: 0 additions & 98 deletions
This file was deleted.

tests/multi_net/ssl_cert_ecc.py.exp

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)