diff options
| author | Jason Cohen <7011141-kryojenik@users.noreply.gitlab.com> | 2022-05-18 08:28:57 +0000 |
|---|---|---|
| committer | A Wireshark GitLab Utility <6629907-ws-gitlab-utility@users.noreply.gitlab.com> | 2022-05-18 08:28:57 +0000 |
| commit | 44433d3c9c2f45e0ba19b6012f73eeb42608e852 (patch) | |
| tree | 1e7e1657415fbe9fbac10a858035b34ced137da0 /epan/dissectors | |
| parent | cc6a749fdad85cb8e850768b431a82bf2f925097 (diff) | |
f5ethtrailer: Decode TLS 1.3 trailer info on some versions
Diffstat (limited to 'epan/dissectors')
| -rw-r--r-- | epan/dissectors/packet-f5ethtrailer.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/epan/dissectors/packet-f5ethtrailer.c b/epan/dissectors/packet-f5ethtrailer.c index 92a26dc9d7..8c7a78bccc 100644 --- a/epan/dissectors/packet-f5ethtrailer.c +++ b/epan/dissectors/packet-f5ethtrailer.c @@ -3038,6 +3038,7 @@ found_trailer: #define F5TLS_RANDOM_LEN 32 #define F5TLS_HASH_LEN 64 #define F5TLS_ZEROS_LEN 256 +#define F5TLS_T2V1_LEN 393 typedef struct _F5TLS_ELEMENT { guchar *data; /* Pointer to a string of bytes wmem_file_scope allocated as needed. */ @@ -3216,7 +3217,7 @@ f5eth_add_tls_element( } /* f5eth_add_tls_element() */ /*----------------------------------------------------------------------*/ -/** TLS <= 1.2 trailer +/** TLS <= 1.2 trailer - Type 0 * * @param tvb The tvbuff containing the DPT TLV block (header and data). * @param pinfo The pinfo structure for the frame. @@ -3294,7 +3295,7 @@ dissect_dpt_trailer_tls_type0(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre } /* dissect_dpt_trailer_tls_type0() */ /*----------------------------------------------------------------------*/ -/** TLS 1.3 trailer +/** TLS 1.3 trailer - Type 2 * * @param tvb The tvbuff containing the DPT TLV block (header and data). * @param pinfo The pinfo structure for the frame. @@ -3341,6 +3342,8 @@ dissect_dpt_trailer_tls_type2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre if (ver == 1) { proto_tree_add_item(tree, hf_f5tls_early_traffic_sec, tvb, o, secret_len, ENC_NA); o += F5TLS_HASH_LEN; + } else if (ver == 0 && len == F5TLS_T2V1_LEN) { + o += F5TLS_HASH_LEN; } proto_tree_add_item(tree, hf_f5tls_clnt_hs_sec, tvb, o, secret_len, ENC_NA); o += F5TLS_HASH_LEN; @@ -3379,6 +3382,8 @@ dissect_dpt_trailer_tls_type2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre ets_changed = f5eth_add_tls_element(&conv_data->erly_traf_sec, pinfo, tvb, o, secret_len); o += F5TLS_HASH_LEN; + } else if (ver == 0 && len == F5TLS_T2V1_LEN) { + o += F5TLS_HASH_LEN; } chs_changed = f5eth_add_tls_element(&conv_data->clnt_hs_sec, pinfo, tvb, o, secret_len); @@ -3449,7 +3454,7 @@ dissect_dpt_trailer_tls_type2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre } /* dissect_dpt_trailer_tls_type2() */ /*----------------------------------------------------------------------*/ -/** TLS extended trailer +/** TLS extended trailer - Types 1 and 3 * * Render as <DATA> - No dissection * |