From fd072d7103c0b45a6f016fd89c2e51fe527f6520 Mon Sep 17 00:00:00 2001 From: Valerio Setti Date: Tue, 23 Jun 2026 22:49:11 +0200 Subject: [PATCH] tests: generate_ssl_session_reset_check: order rules as fields in the struct Signed-off-by: Valerio Setti --- .../generate_ssl_session_reset_check.py | 80 ++++++++----------- 1 file changed, 35 insertions(+), 45 deletions(-) diff --git a/tests/scripts/generate_ssl_session_reset_check.py b/tests/scripts/generate_ssl_session_reset_check.py index 303f27e251..96a5d3b078 100755 --- a/tests/scripts/generate_ssl_session_reset_check.py +++ b/tests/scripts/generate_ssl_session_reset_check.py @@ -9,23 +9,45 @@ import scripts_path # pylint: disable=unused-import from mbedtls_framework import ssl_session_reset_check RULES = { - # Fields that are reset + 'conf': ssl_session_reset_check.ResetBehavior.KEEP, 'state': ssl_session_reset_check.ResetBehavior.RESET, + 'flags': ssl_session_reset_check.ResetBehavior.SPECIAL, 'renego_status': ssl_session_reset_check.ResetBehavior.RESET, 'renego_records_seen': ssl_session_reset_check.ResetBehavior.RESET, + 'tls_version': ssl_session_reset_check.ResetBehavior.SPECIAL, 'early_data_state': ssl_session_reset_check.ResetBehavior.RESET, 'badmac_seen': ssl_session_reset_check.ResetBehavior.RESET, + 'f_vrfy': ssl_session_reset_check.ResetBehavior.KEEP, + 'p_vrfy': ssl_session_reset_check.ResetBehavior.KEEP, + 'f_send': ssl_session_reset_check.ResetBehavior.KEEP, + 'f_recv': ssl_session_reset_check.ResetBehavior.KEEP, + 'f_recv_timeout': ssl_session_reset_check.ResetBehavior.KEEP, + 'p_bio': ssl_session_reset_check.ResetBehavior.KEEP, 'session_in': ssl_session_reset_check.ResetBehavior.RESET, 'session_out': ssl_session_reset_check.ResetBehavior.RESET, 'session': ssl_session_reset_check.ResetBehavior.RESET, + 'session_negotiate': ssl_session_reset_check.ResetBehavior.REALLOCATE, + 'handshake': ssl_session_reset_check.ResetBehavior.REALLOCATE, 'transform_in': ssl_session_reset_check.ResetBehavior.RESET, 'transform_out': ssl_session_reset_check.ResetBehavior.RESET, 'transform': ssl_session_reset_check.ResetBehavior.RESET, + 'transform_negotiate': ssl_session_reset_check.ResetBehavior.REALLOCATE, 'transform_application': ssl_session_reset_check.ResetBehavior.RESET, + 'p_timer': ssl_session_reset_check.ResetBehavior.KEEP, + 'f_set_timer': ssl_session_reset_check.ResetBehavior.KEEP, + 'f_get_timer': ssl_session_reset_check.ResetBehavior.KEEP, + 'in_buf': ssl_session_reset_check.ResetBehavior.REALLOCATE, + 'in_ctr': ssl_session_reset_check.ResetBehavior.REALLOCATE, + 'in_hdr': ssl_session_reset_check.ResetBehavior.REALLOCATE, + 'in_cid': ssl_session_reset_check.ResetBehavior.REALLOCATE, + 'in_len': ssl_session_reset_check.ResetBehavior.REALLOCATE, + 'in_iv': ssl_session_reset_check.ResetBehavior.REALLOCATE, + 'in_msg': ssl_session_reset_check.ResetBehavior.REALLOCATE, 'in_offt': ssl_session_reset_check.ResetBehavior.RESET, 'in_msgtype': ssl_session_reset_check.ResetBehavior.RESET, 'in_msglen': ssl_session_reset_check.ResetBehavior.RESET, 'in_left': ssl_session_reset_check.ResetBehavior.RESET, + 'in_buf_len': ssl_session_reset_check.ResetBehavior.SPECIAL, 'in_epoch': ssl_session_reset_check.ResetBehavior.RESET, 'next_record_offset': ssl_session_reset_check.ResetBehavior.RESET, 'in_window_top': ssl_session_reset_check.ResetBehavior.RESET, @@ -39,12 +61,23 @@ RULES = { 'send_alert': ssl_session_reset_check.ResetBehavior.RESET, 'alert_type': ssl_session_reset_check.ResetBehavior.RESET, 'alert_reason': ssl_session_reset_check.ResetBehavior.RESET, + 'disable_datagram_packing': ssl_session_reset_check.ResetBehavior.KEEP, 'discard_early_data_record': ssl_session_reset_check.ResetBehavior.RESET, 'total_early_data_size': ssl_session_reset_check.ResetBehavior.RESET, + 'out_buf': ssl_session_reset_check.ResetBehavior.REALLOCATE, + 'out_ctr': ssl_session_reset_check.ResetBehavior.REALLOCATE, + 'out_hdr': ssl_session_reset_check.ResetBehavior.REALLOCATE, + 'out_cid': ssl_session_reset_check.ResetBehavior.REALLOCATE, + 'out_len': ssl_session_reset_check.ResetBehavior.REALLOCATE, + 'out_iv': ssl_session_reset_check.ResetBehavior.REALLOCATE, + 'out_msg': ssl_session_reset_check.ResetBehavior.REALLOCATE, 'out_msgtype': ssl_session_reset_check.ResetBehavior.RESET, 'out_msglen': ssl_session_reset_check.ResetBehavior.RESET, 'out_left': ssl_session_reset_check.ResetBehavior.RESET, + 'out_buf_len': ssl_session_reset_check.ResetBehavior.SPECIAL, 'cur_out_ctr': ssl_session_reset_check.ResetBehavior.RESET, + 'mtu': ssl_session_reset_check.ResetBehavior.KEEP, + 'hostname': ssl_session_reset_check.ResetBehavior.KEEP, 'alpn_chosen': ssl_session_reset_check.ResetBehavior.RESET, 'dtls_srtp_info': ssl_session_reset_check.ResetBehavior.RESET, 'cli_id': ssl_session_reset_check.ResetBehavior.RESET, @@ -53,56 +86,13 @@ RULES = { 'verify_data_len': ssl_session_reset_check.ResetBehavior.RESET, 'own_verify_data': ssl_session_reset_check.ResetBehavior.RESET, 'peer_verify_data': ssl_session_reset_check.ResetBehavior.RESET, - - # Fields that are preserved during reset - 'conf': ssl_session_reset_check.ResetBehavior.KEEP, - 'f_vrfy': ssl_session_reset_check.ResetBehavior.KEEP, - 'p_vrfy': ssl_session_reset_check.ResetBehavior.KEEP, - 'f_send': ssl_session_reset_check.ResetBehavior.KEEP, - 'f_recv': ssl_session_reset_check.ResetBehavior.KEEP, - 'f_recv_timeout': ssl_session_reset_check.ResetBehavior.KEEP, - 'p_bio': ssl_session_reset_check.ResetBehavior.KEEP, - 'p_timer': ssl_session_reset_check.ResetBehavior.KEEP, - 'f_set_timer': ssl_session_reset_check.ResetBehavior.KEEP, - 'f_get_timer': ssl_session_reset_check.ResetBehavior.KEEP, - 'disable_datagram_packing': ssl_session_reset_check.ResetBehavior.KEEP, - 'mtu': ssl_session_reset_check.ResetBehavior.KEEP, - 'hostname': ssl_session_reset_check.ResetBehavior.KEEP, 'own_cid': ssl_session_reset_check.ResetBehavior.KEEP, 'own_cid_len': ssl_session_reset_check.ResetBehavior.KEEP, 'negotiate_cid': ssl_session_reset_check.ResetBehavior.KEEP, 'f_export_keys': ssl_session_reset_check.ResetBehavior.KEEP, 'p_export_keys': ssl_session_reset_check.ResetBehavior.KEEP, - - # Fields which are intentionally not checked. - 'unused': ssl_session_reset_check.ResetBehavior.IGNORE, - - # Pointers which might be reallocated during reset - 'in_buf': ssl_session_reset_check.ResetBehavior.REALLOCATE, - 'in_ctr': ssl_session_reset_check.ResetBehavior.REALLOCATE, - 'in_hdr': ssl_session_reset_check.ResetBehavior.REALLOCATE, - 'in_cid': ssl_session_reset_check.ResetBehavior.REALLOCATE, - 'in_len': ssl_session_reset_check.ResetBehavior.REALLOCATE, - 'in_iv': ssl_session_reset_check.ResetBehavior.REALLOCATE, - 'in_msg': ssl_session_reset_check.ResetBehavior.REALLOCATE, - 'out_buf': ssl_session_reset_check.ResetBehavior.REALLOCATE, - 'out_ctr': ssl_session_reset_check.ResetBehavior.REALLOCATE, - 'out_hdr': ssl_session_reset_check.ResetBehavior.REALLOCATE, - 'out_cid': ssl_session_reset_check.ResetBehavior.REALLOCATE, - 'out_len': ssl_session_reset_check.ResetBehavior.REALLOCATE, - 'out_iv': ssl_session_reset_check.ResetBehavior.REALLOCATE, - 'out_msg': ssl_session_reset_check.ResetBehavior.REALLOCATE, - 'session_negotiate': ssl_session_reset_check.ResetBehavior.REALLOCATE, - 'handshake': ssl_session_reset_check.ResetBehavior.REALLOCATE, - 'transform_negotiate': ssl_session_reset_check.ResetBehavior.REALLOCATE, - - # Fields with custom check rules. Rules must be defined in the - # SPECIAL_BEHAVIORS dictionary below. - 'flags': ssl_session_reset_check.ResetBehavior.SPECIAL, - 'tls_version': ssl_session_reset_check.ResetBehavior.SPECIAL, 'user_data': ssl_session_reset_check.ResetBehavior.SPECIAL, - 'in_buf_len': ssl_session_reset_check.ResetBehavior.SPECIAL, - 'out_buf_len': ssl_session_reset_check.ResetBehavior.SPECIAL, + 'unused': ssl_session_reset_check.ResetBehavior.IGNORE, } SPECIAL_BEHAVIORS = {