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

coap/oscore: fix conflict 

'oscore.opt.object_security_kid' exists multiple times with NOT compatible types: FT_BYTES and FT_BOOLEAN

Change-Id: Iba511c0804a8904a33deefecf75231ccdde938d2
Reviewed-on: https://code.wireshark.org/review/28840
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
This commit is contained in:
Alexis La Goutte 2018-07-24 07:55:58 +02:00 committed by Peter Wu
parent 0c0dadb2ee
commit 461d9be5bf
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/packet-coap.h
View File

@ -275,7 +275,7 @@ coap_common_dissect_t name = { \
NULL, HFILL } \
}, \
{ & name .hf.opt_object_security_kid_present, \
{ "Key ID Present", prefix ".opt.object_security_kid", \
{ "Key ID Present", prefix ".opt.object_security_kid_present", \
FT_BOOLEAN, 8, NULL, COAP_OBJECT_SECURITY_KID_MASK, \
NULL, HFILL } \
}, \