Pull request project-chip#717: CPMS: TCP/IP connection support.

Merge in WMN_TOOLS/matter from feature/cpms-tcp_ip to silabs Squashed commit of the following: commit cfcb20341b3b5ceaacdf9ff3e56eff1f5691f1b7 Author: Ricardo Casallas <[email protected]> Date: Fri Apr 28 08:28:32 2023 -0400 CPMS: Code review. commit 734d888f66edfaa42c95caf0eacf44990e830675 Author: Ricardo Casallas <[email protected]> Date: Thu Apr 27 11:41:53 2023 -0400 CPMS: JSON configuration improved. commit 64884b9747e946709173cb71ef4b4bcff48b86bf Author: Ricardo Casallas <[email protected]> Date: Thu Apr 27 07:56:59 2023 -0400 CPMS: TCP/IP connection support.
mkardous-silabs · May 25, 2023 · 847117f · 847117f
1 parent 1149e8f
commit 847117f
Show file tree

Hide file tree

Showing 12 changed files with 734 additions and 721 deletions.
diff --git a/cpms/README.md b/cpms/README.md
diff --git a/cpms/config/certs.json b/cpms/config/certs.json
@@ -1,18 +1,14 @@
 {
-    "generate": false,
-    "cpms": false,
-    "csr": false,
-    "vendor_id": 4169,
-    "product_id": 32773,
-    "discriminator": 3841,
-    "attestation": {
-        "pkcs12": "/temp/kudelski/certs.p12",
-        "key_pass": "cBiqGji1ARHKQ8gv6kiVh1uJQDn/dMXlTXbNOXwjNDE=",
-        "certification": "./temp/cd.der"
-    },
-    "spake2p": {
-        "passcode": 62034001,
-        "salt": "U1BBS0UyUCBLZXkgU2FsdA==",
-        "iterations": 1500
+    "version": "1.0",
+    "matter": {
+        "vendor_id": 4169,
+        "product_id": 32773,
+        "discriminator": 3841,
+        "attestation": {
+            "key_id": 0,
+            "pkcs12": "temp/certs.p12",
+            "key_pass": "cBiqGji1ARHKQ8gv6kiVh1uJQDn/dMXlTXbNOXwjNDE=",
+            "certification": "temp/cd.der"
+        }
     }
 }
diff --git a/cpms/config/csr.json b/cpms/config/csr.json
@@ -1,16 +1,19 @@
 {
-    "csr": true,
-    "vendor_id": 65521,
-    "product_id": 32773,
-    "discriminator": 3840,
-    "attestation": {
-        "certification": "./temp/cd.der",
-        "common_name": "Matter Device"
-    },
-    "spake2p": {
-        "verifier": "uWFwqugDNGiEck/po7KHwwMwwqZgN10XuyBajPGuyzUEV/iree4lOrao5GuwnlQ65CJzbeUB49s31EH+NEkg0JVI5MGCQGMMT/SRPFNRODm3wH/MBiehuFc6FJ/NH6Rmzw==",
-        "passcode": 20202021,
-        "salt": "U1BBS0UyUCBLZXkgU2FsdA==",
-        "iterations": 1000
+    "version": "1.0",
+    "matter": {
+        "csr": true,
+        "vendor_id": 65521,
+        "product_id": 32773,
+        "discriminator": 3840,
+        "attestation": {
+            "certification": "./temp/cd.der",
+            "common_name": "Matter_Device"
+        },
+        "spake2p": {
+            "verifier": "uWFwqugDNGiEck/po7KHwwMwwqZgN10XuyBajPGuyzUEV/iree4lOrao5GuwnlQ65CJzbeUB49s31EH+NEkg0JVI5MGCQGMMT/SRPFNRODm3wH/MBiehuFc6FJ/NH6Rmzw==",
+            "passcode": 20202021,
+            "salt": "U1BBS0UyUCBLZXkgU2FsdA==",
+            "iterations": 1000
+        }
     }
 }
diff --git a/cpms/config/develop.json b/cpms/config/develop.json
@@ -1,17 +1,20 @@
 {
-    "generate": true,
-    "vendor_id": 65521,
-    "product_id": 32773,
-    "commissioning_flow": 0,
-    "rendezvous_flags": 2,
-    "discriminator": 3840,
-    "attestation": {
-        "key_id": 2
-    },
-    "spake2p": {
-        "verifier": "uWFwqugDNGiEck/po7KHwwMwwqZgN10XuyBajPGuyzUEV/iree4lOrao5GuwnlQ65CJzbeUB49s31EH+NEkg0JVI5MGCQGMMT/SRPFNRODm3wH/MBiehuFc6FJ/NH6Rmzw==",
-        "passcode": 20202021,
-        "salt": "U1BBS0UyUCBLZXkgU2FsdA==",
-        "iterations": 1000
+    "version": "1.0",
+    "matter": {
+        "generate": true,
+        "vendor_id": 65521,
+        "product_id": 32773,
+        "commissioning_flow": 0,
+        "rendezvous_flags": 2,
+        "discriminator": 3840,
+        "attestation": {
+            "key_id": 2
+        },
+        "spake2p": {
+            "verifier": "uWFwqugDNGiEck/po7KHwwMwwqZgN10XuyBajPGuyzUEV/iree4lOrao5GuwnlQ65CJzbeUB49s31EH+NEkg0JVI5MGCQGMMT/SRPFNRODm3wH/MBiehuFc6FJ/NH6Rmzw==",
+            "passcode": 20202021,
+            "salt": "U1BBS0UyUCBLZXkgU2FsdA==",
+            "iterations": 1000
+        }
     }
 }
diff --git a/cpms/config/silabs.json b/cpms/config/silabs.json
@@ -1,10 +1,13 @@
 {
-    "vendor_id": 4169,
-    "product_id": 32773,
-    "discriminator": 3841,
-    "spake2p": {
-        "passcode": 62034001,
-        "salt": "U1BBS0UyUCBLZXkgU2FsdA==",
-        "iterations": 1500
+    "version": "1.0",
+    "matter": {
+        "vendor_id": 4169,
+        "product_id": 32773,
+        "discriminator": 3841,
+        "spake2p": {
+            "passcode": 62034001,
+            "salt": "U1BBS0UyUCBLZXkgU2FsdA==",
+            "iterations": 1500
+        }
     }
 }
diff --git a/cpms/config/spake2p.json b/cpms/config/spake2p.json
@@ -0,0 +1,11 @@
+{
+    "version": "1.0",
+    "matter": {
+        "spake2p": {
+            "verifier": "uWFwqugDNGiEck/po7KHwwMwwqZgN10XuyBajPGuyzUEV/iree4lOrao5GuwnlQ65CJzbeUB49s31EH+NEkg0JVI5MGCQGMMT/SRPFNRODm3wH/MBiehuFc6FJ/NH6Rmzw==",
+            "passcode": 20202021,
+            "salt": "U1BBS0UyUCBLZXkgU2FsdA==",
+            "iterations": 1000
+        }
+    }
+}