diff options
| author | Guy Harris <guy@alum.mit.edu> | 2018-09-10 21:29:09 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2018-09-11 04:29:54 +0000 |
| commit | e1ef55f2fc4f4b7b0e67e1da941aaeb2a7268306 (patch) | |
| tree | 4eff4e93607d64238674e284d4c53a20346d188a /epan/dissectors/packet-ssl-utils.c | |
| parent | fe0539b41f533d78a5206b79b4f7f6c78dd0ed5e (diff) | |
Avoid collision between parameter names and function names.
Change-Id: I206d05c47c9f9089a201783ae2d0856c97a5e502
Reviewed-on: https://code.wireshark.org/review/29588
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-ssl-utils.c')
| -rw-r--r-- | epan/dissectors/packet-ssl-utils.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index b2db4ec2f2..21db213572 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -6265,7 +6265,7 @@ ssl_dissect_hnd_hello_ext_supported_versions(ssl_common_dissect_t *hf, tvbuff_t proto_tree_add_item_ret_uint(tree, hf->hf.hs_ext_supported_version, tvb, offset, 2, ENC_BIG_ENDIAN, &version); offset += 2; - draft_version = tls13_draft_version(version); + draft_version = extract_tls13_draft_version(version); max_draft_version = MAX(draft_version, max_draft_version); } if (!ssl_end_vector(hf, tvb, pinfo, tree, offset, next_offset)) { @@ -7278,7 +7278,7 @@ ssl_try_set_version(SslSession *session, SslDecryptSession *ssl, return; if (handshake_type == SSL_HND_SERVER_HELLO) { - tls13_draft = tls13_draft_version(version); + tls13_draft = extract_tls13_draft_version(version); if (tls13_draft != 0) { /* This is TLS 1.3 (a draft version). */ version = TLSV1DOT3_VERSION; @@ -7657,7 +7657,7 @@ ssl_dissect_hnd_hello_retry_request(ssl_common_dissect_t *hf, tvbuff_t *tvb, proto_tree_add_item_ret_uint(tree, hf->hf.hs_server_version, tvb, offset, 2, ENC_BIG_ENDIAN, &version); - draft_version = tls13_draft_version(version); + draft_version = extract_tls13_draft_version(version); offset += 2; if (draft_version == 0 || draft_version >= 19) { |