diff options
| author | pengtian <pengtianabc@hotmail.com> | 2021-05-15 08:39:40 +0000 |
|---|---|---|
| committer | Wireshark GitLab Utility <6629907-ws-gitlab-utility@users.noreply.gitlab.com> | 2021-05-15 08:39:40 +0000 |
| commit | fb41f052bb3054edac5853595178e58adfdd4171 (patch) | |
| tree | ed57638b7ab8d64e7f09a3befddf00b129783169 /epan/dissectors/packet-tls.c | |
| parent | 1a7b9c28d3382bffc7fae84c83d3cf2783c39d58 (diff) | |
Add Chinese GMTLSv1(1.1) protocol in tls dissector
Diffstat (limited to 'epan/dissectors/packet-tls.c')
| -rw-r--r-- | epan/dissectors/packet-tls.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/epan/dissectors/packet-tls.c b/epan/dissectors/packet-tls.c index 42f2eefb68..6b21841012 100644 --- a/epan/dissectors/packet-tls.c +++ b/epan/dissectors/packet-tls.c @@ -714,6 +714,7 @@ dissect_ssl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) case TLSV1_VERSION: case TLSV1DOT1_VERSION: case TLSV1DOT2_VERSION: + case GMTLSV1_VERSION: /* SSLv3/TLS record headers need at least 1+2+2 = 5 bytes. */ if (tvb_reported_length_remaining(tvb, offset) < 5) { if (tls_desegment && pinfo->can_desegment) { @@ -904,7 +905,8 @@ is_sslv3_or_tls(tvbuff_t *tvb) if (protocol_version != SSLV3_VERSION && protocol_version != TLSV1_VERSION && protocol_version != TLSV1DOT1_VERSION && - protocol_version != TLSV1DOT2_VERSION) { + protocol_version != TLSV1DOT2_VERSION && + protocol_version != GMTLSV1_VERSION ) { return FALSE; } @@ -1779,7 +1781,8 @@ dissect_ssl3_record(tvbuff_t *tvb, packet_info *pinfo, /* TLS 1.0/1.1 just ignores unknown records - RFC 2246 chapter 6. The TLS Record Protocol */ if ((session->version==TLSV1_VERSION || session->version==TLSV1DOT1_VERSION || - session->version==TLSV1DOT2_VERSION) && + session->version==TLSV1DOT2_VERSION || + session->version==GMTLSV1_VERSION ) && (available_bytes >=1 ) && !ssl_is_valid_content_type(tvb_get_guint8(tvb, offset))) { proto_tree_add_expert(tree, pinfo, &ei_tls_ignored_unknown_record, tvb, offset, available_bytes); col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Ignored Unknown Record"); @@ -3489,6 +3492,7 @@ void ssl_set_master_secret(guint32 frame_num, address *addr_srv, address *addr_c case TLSV1_VERSION: case TLSV1DOT1_VERSION: case TLSV1DOT2_VERSION: + case GMTLSV1_VERSION: ssl->session.version = version; ssl->state |= SSL_VERSION; ssl_debug_printf("%s set version 0x%04X -> state 0x%02X\n", G_STRFUNC, ssl->session.version, ssl->state); @@ -3671,6 +3675,7 @@ ssl_looks_like_sslv3(tvbuff_t *tvb, const guint32 offset) case TLSV1_VERSION: case TLSV1DOT1_VERSION: case TLSV1DOT2_VERSION: + case GMTLSV1_VERSION: return 1; } return 0; |