extmod/modssl_mbedtls: Fix cipher iteration in SSLContext.get_ciphers.

dpgeorge · dpgeorge · commit 2531a15200ca · 2024-02-16T10:48:30.000+11:00
Prior to this commit it would skip every second cipher returned from
mbedtls.

The corresponding test is also updated and now passes on esp32, rp2, stm32
and unix.

Signed-off-by: Damien George &lt;damien@micropython.org&gt;
diff --git a/extmod/modssl_mbedtls.c b/extmod/modssl_mbedtls.c
@@ -311,10 +311,6 @@ STATIC mp_obj_t ssl_context_get_ciphers(mp_obj_t self_in) {
     for (const int *cipher_list = mbedtls_ssl_list_ciphersuites(); *cipher_list; ++cipher_list) {
         const char *cipher_name = mbedtls_ssl_get_ciphersuite_name(*cipher_list);
         mp_obj_list_append(list, MP_OBJ_FROM_PTR(mp_obj_new_str(cipher_name, strlen(cipher_name))));
-        cipher_list++;
-        if (!*cipher_list) {
-            break;
-        }
     }
     return list;
 }
diff --git a/tests/extmod/ssl_sslcontext_ciphers.py b/tests/extmod/ssl_sslcontext_ciphers.py
@@ -12,7 +12,9 @@
 ciphers = ctx.get_ciphers()
 
 for ci in ciphers:
-    print(ci)
+    # Only print those ciphers know to exist on all ports.
+    if ("TLS-ECDHE-ECDSA-WITH-AES" in ci or "TLS-RSA-WITH-AES" in ci) and "CBC" in ci:
+        print(ci)
 
 ctx.set_ciphers(ciphers[:1])
 
diff --git a/tests/extmod/ssl_sslcontext_ciphers.py.exp b/tests/extmod/ssl_sslcontext_ciphers.py.exp
@@ -1,6 +1,10 @@
 TLS-ECDHE-ECDSA-WITH-AES-256-CBC-SHA384
+TLS-ECDHE-ECDSA-WITH-AES-256-CBC-SHA
 TLS-ECDHE-ECDSA-WITH-AES-128-CBC-SHA256
+TLS-ECDHE-ECDSA-WITH-AES-128-CBC-SHA
 TLS-RSA-WITH-AES-256-CBC-SHA256
+TLS-RSA-WITH-AES-256-CBC-SHA
 TLS-RSA-WITH-AES-128-CBC-SHA256
+TLS-RSA-WITH-AES-128-CBC-SHA
 object 'str' isn't a tuple or list
 (-24192, 'MBEDTLS_ERR_SSL_BAD_CONFIG')

Original file line number	Diff line number	Diff line change
`@@ -311,10 +311,6 @@ STATIC mp_obj_t ssl_context_get_ciphers(mp_obj_t self_in) {`
`311`	`311`	`for (const int cipher_list = mbedtls_ssl_list_ciphersuites(); cipher_list; ++cipher_list) {`
`312`	`312`	`const char cipher_name = mbedtls_ssl_get_ciphersuite_name(cipher_list);`
`313`	`313`	`mp_obj_list_append(list, MP_OBJ_FROM_PTR(mp_obj_new_str(cipher_name, strlen(cipher_name))));`
`314`		`- cipher_list++;`
`315`		`- if (!*cipher_list) {`
`316`		`- break;`
`317`		`- }`
`318`	`314`	`}`
`319`	`315`	`return list;`
`320`	`316`	`}`