From 6d19a034d05d20572a87bc77ec990bc10ebb25eb Mon Sep 17 00:00:00 2001
From: Kedar Sovani <kedars@gmail.com>
Date: Sun, 1 Jan 2023 16:26:17 +0530
Subject: [PATCH] Fabric: Save vendor id when new Fabric is created

---
 matter/src/data_model/sdm/noc.rs |  3 ++-
 matter/src/fabric.rs             | 18 +++++++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/matter/src/data_model/sdm/noc.rs b/matter/src/data_model/sdm/noc.rs
index 5a8214e..63f3d0f 100644
--- a/matter/src/data_model/sdm/noc.rs
+++ b/matter/src/data_model/sdm/noc.rs
@@ -162,6 +162,7 @@ impl NocCluster {
             icac_value,
             noc_value,
             r.ipk_value.0,
+            r.vendor_id,
         )
         .map_err(|_| NocStatus::TableFull)?;
         let fab_idx = self
@@ -479,7 +480,7 @@ struct AddNocReq<'a> {
     icac_value: OctetStr<'a>,
     ipk_value: OctetStr<'a>,
     case_admin_subject: u64,
-    _vendor_id: u16,
+    vendor_id: u16,
 }
 
 #[derive(FromTLV)]
diff --git a/matter/src/fabric.rs b/matter/src/fabric.rs
index 8f85504..86919b3 100644
--- a/matter/src/fabric.rs
+++ b/matter/src/fabric.rs
@@ -39,6 +39,7 @@ macro_rules! fb_key {
     };
 }
 
+const ST_VID: &str = "vid";
 const ST_RCA: &str = "rca";
 const ST_ICA: &str = "ica";
 const ST_NOC: &str = "noc";
@@ -50,6 +51,7 @@ const ST_PRKEY: &str = "privkey";
 pub struct Fabric {
     node_id: u64,
     fabric_id: u64,
+    vendor_id: u16,
     key_pair: Box<dyn CryptoKeyPair>,
     pub root_ca: Cert,
     pub icac: Cert,
@@ -66,6 +68,7 @@ impl Fabric {
         icac: Cert,
         noc: Cert,
         ipk: &[u8],
+        vendor_id: u16,
     ) -> Result<Self, Error> {
         let node_id = noc.get_node_id()?;
         let fabric_id = noc.get_fabric_id()?;
@@ -73,6 +76,7 @@ impl Fabric {
         let mut f = Self {
             node_id,
             fabric_id,
+            vendor_id,
             key_pair: Box::new(key_pair),
             root_ca,
             icac,
@@ -105,6 +109,7 @@ impl Fabric {
         Ok(Self {
             node_id: 0,
             fabric_id: 0,
+            vendor_id: 0,
             key_pair: Box::new(KeyPairDummy::new()?),
             root_ca: Cert::default(),
             icac: Cert::default(),
@@ -181,6 +186,7 @@ impl Fabric {
         let key = &key[..len];
         psm.set_kv_slice(fb_key!(index, ST_PRKEY), key)?;
 
+        psm.set_kv_u64(ST_VID, self.vendor_id.into())?;
         Ok(())
     }
 
@@ -206,7 +212,17 @@ impl Fabric {
         psm.get_kv_slice(fb_key!(index, ST_PRKEY), &mut priv_key)?;
         let keypair = KeyPair::new_from_components(pub_key.as_slice(), priv_key.as_slice())?;
 
-        Fabric::new(keypair, root_ca, icac, noc, ipk.as_slice())
+        let mut vendor_id = 0;
+        psm.get_kv_u64(ST_VID, &mut vendor_id)?;
+
+        Fabric::new(
+            keypair,
+            root_ca,
+            icac,
+            noc,
+            ipk.as_slice(),
+            vendor_id as u16,
+        )
     }
 }