Fix project-chip#12915 merge

msandstedt · Jan 25, 2022 · 0c51b64 · 0c51b64
1 parent dc9dbf7
commit 0c51b64
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/controller/AutoCommissioner.cpp b/src/controller/AutoCommissioner.cpp
@@ -211,7 +211,8 @@ Optional<System::Clock::Timeout> AutoCommissioner::GetCommandTimeout(Commissioni
     }
 }
 
-CHIP_ERROR AutoCommissioner::NOCChainGenerated(ByteSpan noc, ByteSpan icac, ByteSpan rcac)
+CHIP_ERROR AutoCommissioner::NOCChainGenerated(ByteSpan noc, ByteSpan icac, ByteSpan rcac, AesCcm128KeySpan ipk,
+                                               NodeId adminSubject)
 {
     // Reuse ICA Cert buffer for temporary store Root Cert.
     MutableByteSpan rootCert = MutableByteSpan(mICACertBuffer);
@@ -237,6 +238,9 @@ CHIP_ERROR AutoCommissioner::NOCChainGenerated(ByteSpan noc, ByteSpan icac, Byte
         mParams.SetIcac(ByteSpan());
     }
 
+    mParams.SetIpk(ipk);
+    mParams.SetAdminSubject(adminSubject);
+
     return CHIP_NO_ERROR;
 }
 
@@ -278,7 +282,8 @@ CHIP_ERROR AutoCommissioner::CommissioningStepFinished(CHIP_ERROR err, Commissio
     case CommissioningStage::kGenerateNOCChain:
         // For NOC chain generation, we re-use the buffers. NOCChainGenerated triggers the next stage before
         // storing the returned certs, so just return here without triggering the next stage.
-        return NOCChainGenerated(report.Get<NocChain>().noc, report.Get<NocChain>().icac, report.Get<NocChain>().rcac);
+        return NOCChainGenerated(report.Get<NocChain>().noc, report.Get<NocChain>().icac, report.Get<NocChain>().rcac,
+                                 report.Get<NocChain>().ipk, report.Get<NocChain>().adminSubject);
     case CommissioningStage::kFindOperational:
         mOperationalDeviceProxy = report.Get<OperationalNodeFoundData>().operationalProxy;
         break;

diff --git a/src/controller/AutoCommissioner.h b/src/controller/AutoCommissioner.h
@@ -49,7 +49,7 @@ class AutoCommissioner : public CommissioningDelegate
     ByteSpan GetDAC() const { return ByteSpan(mDAC, mDACLen); }
     ByteSpan GetPAI() const { return ByteSpan(mPAI, mPAILen); }
 
-    CHIP_ERROR NOCChainGenerated(ByteSpan noc, ByteSpan icac, ByteSpan rcac);
+    CHIP_ERROR NOCChainGenerated(ByteSpan noc, ByteSpan icac, ByteSpan rcac, AesCcm128KeySpan ipk, NodeId adminSubject);
     Optional<System::Clock::Timeout> GetCommandTimeout(CommissioningStage stage);
 
     DeviceCommissioner * mCommissioner;

diff --git a/src/controller/CommissioningDelegate.h b/src/controller/CommissioningDelegate.h
@@ -154,7 +154,7 @@ class CommissioningParameters
         mIpk.SetValue(AesCcm128Key(ipk));
         return *this;
     }
-    CommissioningParameters & SetIpk(const NodeId adminSubject)
+    CommissioningParameters & SetAdminSubject(const NodeId adminSubject)
     {
         mAdminSubject.SetValue(adminSubject);
         return *this;