osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Guy Harris 2018-09-10 21:29:09 -07:00
parent fe0539b41f
commit e1ef55f2fc
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/dissectors/packet-ssl-utils.c
View File

@ -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) {

2
epan/dissectors/packet-ssl-utils.h
View File

@ -271,7 +271,7 @@ typedef struct _StringInfo {
#define DTLSV1DOT2_VERSION 0xfefd
/* Returns the TLS 1.3 draft version or 0 if not applicable. */
static inline guint8 tls13_draft_version(guint32 version) {
static inline guint8 extract_tls13_draft_version(guint32 version) {
if ((version & 0xff00) == 0x7f00) {
return (guint8) version;
}