Bluetooth: Mesh: Fix pointer signedness compiler warnings
Fix compiler warnings resulting from passing C string literals to
functions expecting an unsigned char pointer.
Jira: 2443
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
diff --git a/subsys/bluetooth/host/mesh/crypto.c b/subsys/bluetooth/host/mesh/crypto.c
index 57a0d43..c3f61de 100644
--- a/subsys/bluetooth/host/mesh/crypto.c
+++ b/subsys/bluetooth/host/mesh/crypto.c
@@ -56,7 +56,7 @@
}
int bt_mesh_k1(const u8_t *ikm, size_t ikm_len, const u8_t salt[16],
- const u8_t *info, size_t info_len, u8_t okm[16])
+ const char *info, u8_t okm[16])
{
int err;
@@ -65,7 +65,7 @@
return err;
}
- return bt_mesh_aes_cmac_one(okm, info, info_len, okm);
+ return bt_mesh_aes_cmac_one(okm, info, strlen(info), okm);
}
int bt_mesh_k2(const u8_t n[16], const u8_t *p, size_t p_len,
@@ -189,7 +189,7 @@
int bt_mesh_id128(const u8_t n[16], const char *s, u8_t out[16])
{
- u8_t id128[] = { 'i', 'd', '1', '2', '8', 0x01 };
+ const char *id128 = "id128\x01";
u8_t salt[16];
int err;
@@ -198,7 +198,7 @@
return err;
}
- return bt_mesh_k1(n, 16, salt, id128, sizeof(id128), out);
+ return bt_mesh_k1(n, 16, salt, id128, out);
}
static int bt_mesh_ccm_decrypt(const u8_t key[16], u8_t nonce[13],
@@ -830,7 +830,7 @@
int bt_mesh_prov_conf_key(const u8_t dhkey[32], const u8_t conf_salt[16],
u8_t conf_key[16])
{
- return bt_mesh_k1(dhkey, 32, conf_salt, "prck", 4, conf_key);
+ return bt_mesh_k1(dhkey, 32, conf_salt, "prck", conf_key);
}
int bt_mesh_prov_conf(const u8_t conf_key[16], const u8_t rand[16],
diff --git a/subsys/bluetooth/host/mesh/crypto.h b/subsys/bluetooth/host/mesh/crypto.h
index 27694aa..e60ef33 100644
--- a/subsys/bluetooth/host/mesh/crypto.h
+++ b/subsys/bluetooth/host/mesh/crypto.h
@@ -30,12 +30,12 @@
}
int bt_mesh_k1(const u8_t *ikm, size_t ikm_len, const u8_t salt[16],
- const u8_t *info, size_t info_len, u8_t okm[16]);
+ const char *info, u8_t okm[16]);
#define bt_mesh_k1_str(ikm, ikm_len, salt_str, info, okm) \
({ \
const u8_t salt[16] = salt_str; \
- bt_mesh_k1(ikm, ikm_len, salt, info, strlen(info), okm); \
+ bt_mesh_k1(ikm, ikm_len, salt, info, okm); \
})
int bt_mesh_k2(const u8_t n[16], const u8_t *p, size_t p_len,
@@ -78,7 +78,7 @@
const u8_t prov_salt[16],
u8_t session_key[16])
{
- return bt_mesh_k1(dhkey, 32, prov_salt, "prsk", 4, session_key);
+ return bt_mesh_k1(dhkey, 32, prov_salt, "prsk", session_key);
}
static inline int bt_mesh_prov_nonce(const u8_t dhkey[32],
@@ -88,7 +88,7 @@
u8_t tmp[16];
int err;
- err = bt_mesh_k1(dhkey, 32, prov_salt, "prsn", 4, tmp);
+ err = bt_mesh_k1(dhkey, 32, prov_salt, "prsn", tmp);
if (!err) {
memcpy(nonce, tmp + 3, 13);
}
@@ -100,7 +100,7 @@
const u8_t prov_salt[16],
u8_t dev_key[16])
{
- return bt_mesh_k1(dhkey, 32, prov_salt, "prdk", 4, dev_key);
+ return bt_mesh_k1(dhkey, 32, prov_salt, "prdk", dev_key);
}
static inline int bt_mesh_prov_salt(const u8_t conf_salt[16],
