osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Revert "WOW: Refactor reconnect proof client to server packet into struct" 

This reverts commit e0164783e497142906dbfb1267e68979e1e9e896.

See discussion on issue tracker https://gitlab.com/wireshark/wireshark/-/merge_requests/3039#note_580145729
This commit is contained in:
Gtker 2021-05-20 08:08:49 +02:00 committed by Wireshark GitLab Utility
parent 4688922527
commit b6ee285fd6
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
epan/dissectors/packet-wow.c
View File

@ -169,17 +169,15 @@ static struct {
int checksum_salt;
} hf_wow_reconnect_challenge_server_to_client = {-1};
static struct {
int client_proof;
int client_checksum;
} hf_wow_reconnect_proof_client_to_server = {-1, -1};
static int hf_wow_two_factor_enabled = -1;
static int hf_wow_num_keys = -1;
static int hf_wow_challenge_data = -1;
static int hf_wow_client_proof = -1;
static int hf_wow_client_checksum = -1;
static int hf_wow_two_factor_pin_salt = -1;
static int hf_wow_num_realms = -1;
@ -338,11 +336,11 @@ parse_logon_reconnect_proof(tvbuff_t *tvb, packet_info *pinfo, proto_tree *wow_t
offset, 16, ENC_NA);
offset += 16;
proto_tree_add_item(wow_tree, hf_wow_reconnect_proof_client_to_server.client_proof, tvb,
proto_tree_add_item(wow_tree, hf_wow_client_proof, tvb,
offset, 20, ENC_NA);
offset += 20;
proto_tree_add_item(wow_tree, hf_wow_reconnect_proof_client_to_server.client_checksum, tvb,
proto_tree_add_item(wow_tree, hf_wow_client_checksum, tvb,
offset, 20, ENC_NA);
offset += 20;
@ -847,12 +845,12 @@ proto_register_wow(void)
FT_BYTES, BASE_NONE, 0, 0,
"Unknown. Unused in 1.12", HFILL }
},
{ &hf_wow_reconnect_proof_client_to_server.client_proof,
{ &hf_wow_client_proof,
{ "Reconnection Client Proof", "wow.reconnect_proof",
FT_BYTES, BASE_NONE, 0, 0,
"Client proof of knowing session key based on challenge data", HFILL }
},
{ &hf_wow_reconnect_proof_client_to_server.client_checksum,
{ &hf_wow_client_checksum,
{ "Reconnection Checksum", "wow.reconnect_checksum",
FT_BYTES, BASE_NONE, 0, 0,
NULL, HFILL }