[nrf fromtree] bluetooth: mesh: prevent getting wrong authentication size

alxelax · alxelax · commit a7aa672b7d60 · 2025-11-24T09:40:48.000+01:00
Commit moves SHA256 authentication size under SHA256 macro. Signed-off-by: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no> (cherry picked from commit 8b2e37f) Signed-off-by: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no>
diff --git a/subsys/bluetooth/mesh/prov.h b/subsys/bluetooth/mesh/prov.h
@@ -164,10 +164,14 @@ static inline void bt_mesh_prov_buf_init(struct net_buf_simple *buf, uint8_t typ
 	net_buf_simple_add_u8(buf, type);
 }
 
-
 static inline uint8_t bt_mesh_prov_auth_size_get(void)
 {
-	return bt_mesh_prov_link.algorithm == BT_MESH_PROV_AUTH_CMAC_AES128_AES_CCM ? 16 : 32;
+	if (IS_ENABLED(CONFIG_BT_MESH_ECDH_P256_HMAC_SHA256_AES_CCM)) {
+		return bt_mesh_prov_link.algorithm == BT_MESH_PROV_AUTH_CMAC_AES128_AES_CCM ? 16
+											    : 32;
+	} else {
+		return 16;
+	}
 }
 
 static inline k_timeout_t bt_mesh_prov_protocol_timeout_get(void)

Original file line number	Diff line number	Diff line change
`@@ -164,10 +164,14 @@ static inline void bt_mesh_prov_buf_init(struct net_buf_simple *buf, uint8_t typ`
`164`	`164`	`net_buf_simple_add_u8(buf, type);`
`165`	`165`	`}`
`166`	`166`
`167`		`-`
`168`	`167`	`static inline uint8_t bt_mesh_prov_auth_size_get(void)`
`169`	`168`	`{`
`170`		`- return bt_mesh_prov_link.algorithm == BT_MESH_PROV_AUTH_CMAC_AES128_AES_CCM ? 16 : 32;`
	`169`	`+ if (IS_ENABLED(CONFIG_BT_MESH_ECDH_P256_HMAC_SHA256_AES_CCM)) {`
	`170`	`+ return bt_mesh_prov_link.algorithm == BT_MESH_PROV_AUTH_CMAC_AES128_AES_CCM ? 16`
	`171`	`+ : 32;`
	`172`	`+ } else {`
	`173`	`+ return 16;`
	`174`	`+ }`
`171`	`175`	`}`
`172`	`176`
`173`	`177`	`static inline k_timeout_t bt_mesh_prov_protocol_timeout_get(void)`