[PATCH BlueZ] mesh: Add config for provisioning algorithms

[PATCH BlueZ] mesh: Add config for provisioning algorithms

[Junho Lee]

This added the Algorithms config of provisioning capabilities to the
mesh conf file.
---
 mesh/mesh-main.conf | 7 +++++++
 mesh/mesh.c         | 5 ++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/mesh/mesh-main.conf b/mesh/mesh-main.conf
index aca9e6fa5..58fbb9840 100644
--- a/mesh/mesh-main.conf
+++ b/mesh/mesh-main.conf
@@ -41,3 +41,10 @@
 # Setting this value to zero means there's no timeout.
 # Defaults to 60.
 #ProvTimeout = 60
+
+# Bitmask of supported provisioning security algorithms.
+# Bit 0: BTM_ECDH_P256_CMAC_AES128_AES_CCM
+# Bit 1: BTM_ECDH_P256_HMAC_SHA256_AES_CCM
+# Valid range: 0-65535
+# Defaults to 1.
+#Algorithms = 1
diff --git a/mesh/mesh.c b/mesh/mesh.c
index 91cf25175..7b670e40a 100644
--- a/mesh/mesh.c
+++ b/mesh/mesh.c
@@ -245,6 +245,10 @@ static void parse_settings(const char *mesh_conf_fname)
 	if (l_settings_get_uint(settings, "General", "ProvTimeout", &value))
 		mesh.prov_timeout = value;
 
+	if (l_settings_get_uint(settings, "General", "Algorithms", &value) &&
+								value <= 65535)
+		mesh.algorithms = value;
+
 done:
 	l_settings_free(settings);
 }
@@ -262,7 +266,6 @@ bool mesh_init(const char *config_dir, const char *mesh_conf_fname,
 	mesh_model_init();
 	mesh_agent_init();
 
-	/* TODO: read mesh.conf */
 	mesh.prov_timeout = DEFAULT_PROV_TIMEOUT;
 	mesh.algorithms = DEFAULT_ALGORITHMS;
 
-- 
2.34.1

RE: [BlueZ] mesh: Add config for provisioning algorithms

[bluez.test.bot]

[-- Attachment #1: Type: text/plain, Size: 1617 bytes --]

This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=889107

---Test result---

Test Summary:
CheckPatch                    PASS      0.49 seconds
GitLint                       PASS      0.35 seconds
BuildEll                      PASS      26.18 seconds
BluezMake                     PASS      1880.05 seconds
MakeCheck                     PASS      13.93 seconds
MakeDistcheck                 FAIL      73.82 seconds
CheckValgrind                 PASS      269.96 seconds
CheckSmatch                   PASS      378.41 seconds
bluezmakeextell               PASS      128.60 seconds
IncrementalBuild              PASS      1651.58 seconds
ScanBuild                     PASS      1121.65 seconds

Details
##############################
Test: MakeDistcheck - FAIL
Desc: Run Bluez Make Distcheck
Output:

Package cups was not found in the pkg-config search path.
Perhaps you should add the directory containing `cups.pc'
to the PKG_CONFIG_PATH environment variable
No package 'cups' found
../../mesh/mesh-config-json.c:31:10: fatal error: mesh/missing.h: No such file or directory
   31 | #include "mesh/missing.h"
      |          ^~~~~~~~~~~~~~~~
compilation terminated.
make[2]: *** [Makefile:7857: mesh/mesh-config-json.o] Error 1
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [Makefile:4681: all] Error 2
make: *** [Makefile:12233: distcheck] Error 1


---
Regards,
Linux Bluetooth