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

BTMESH: fix unused compile error without/older GCrypt 

Change-Id: Ic9f9e323420bf6add83c7a8f7b56a6206eeb2c67
Reviewed-on: https://code.wireshark.org/review/33295
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Joakim Karlsson 2019-05-21 10:43:49 +02:00 committed by Anders Broman
parent 39b142512c
commit 41813ba202
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/packet-btmesh.c
View File

@ -2064,12 +2064,10 @@ uat_btmesh_record_update_cb(void *r, char **err _U_)
if (rec->application_key_string) {
g_free(rec->application_key);
rec->application_key_length = compute_ascii_key(&rec->application_key, rec->application_key_string);
#if GCRYPT_VERSION_NUMBER >= 0x010600 /* 1.6.0 */
/* compute AID */
if (k4(rec)) {
rec->valid++;
}
#endif
} else {
rec->application_key_length = 0;
rec->application_key = NULL;
@ -2208,11 +2206,9 @@ uat_btmesh_label_uuid_record_update_cb(void *r, char **err _U_)
if (rec->label_uuid_string) {
g_free(rec->label_uuid);
rec->label_uuid_length = compute_ascii_key(&rec->label_uuid, rec->label_uuid_string);
#if GCRYPT_VERSION_NUMBER >= 0x010600 /* 1.6.0 */
if (label_uuid_hash(rec)) {
rec->valid++;
}
#endif
} else {
rec->label_uuid_length = 0;
rec->label_uuid = NULL;