Fix Darwin CI

project-chip · Jun 13, 2022 · 4a69a1d · 4a69a1d
1 parent d956b35
commit 4a69a1d
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/src/controller/CHIPDeviceController.h b/src/controller/CHIPDeviceController.h
@@ -240,6 +240,15 @@ class DLL_EXPORT DeviceController : public AbstractDnssdDiscoveryController
 
     FabricInfo * GetFabricInfo() { return mFabricInfo; }
 
+    const FabricTable * GetFabricTable() const
+    {
+        if (mSystemState == nullptr)
+        {
+            return nullptr;
+        }
+        return mSystemState->Fabrics();
+    }
+
     void ReleaseOperationalDevice(NodeId remoteDeviceId);
 
     OperationalCredentialsDelegate * GetOperationalCredentialsDelegate() { return mOperationalCredentialsDelegate; }

diff --git a/src/darwin/Framework/CHIP/CHIPDeviceController.mm b/src/darwin/Framework/CHIP/CHIPDeviceController.mm
@@ -748,9 +748,15 @@ - (CHIP_ERROR)isRunningOnFabric:(chip::FabricInfo *)fabric isRunning:(BOOL *)isR
         return CHIP_NO_ERROR;
     }
 
+    chip::Credentials::FabricTable * fabricTable = _cppCommissioner->GetFabricTable();
+    if (!fabricTable) {
+        // Surprising as well!
+        return CHIP_ERROR_INCORRECT_STATE;
+    }
+
     chip::Credentials::P256PublicKey ourRootPublicKey, otherRootPublicKey;
-    ReturnErrorOnFailure(ourFabric->FetchRootPubkey(ourRootPublicKey));
-    ReturnErrorOnFailure(fabric->FetchRootPubkey(otherRootPublicKey));
+    ReturnErrorOnFailure(fabricTable->FetchRootPubkey(ourFabric->GetFabricIndex(), ourRootPublicKey));
+    ReturnErrorOnFailure(fabricTable->FetchRootPubkey(fabric->GetFabricIndex(), otherRootPublicKey));
 
     *isRunning = (ourRootPublicKey.Matches(otherRootPublicKey));
     return CHIP_NO_ERROR;

diff --git a/src/darwin/Framework/CHIP/CHIPDeviceControllerStartupParams.mm b/src/darwin/Framework/CHIP/CHIPDeviceControllerStartupParams.mm
@@ -217,7 +217,7 @@ - (instancetype)initForExistingFabric:(FabricTable *)fabricTable
         if (self.operationalKeypair == nil) {
             uint8_t nocBuf[Credentials::kMaxCHIPCertLength];
             MutableByteSpan noc(nocBuf);
-            CHIP_ERROR err = fabric->FetchNOCCert(noc);
+            CHIP_ERROR err = fabricTable->FetchNOCCert(fabric->GetFabricIndex(), noc);
             if (err != CHIP_NO_ERROR) {
                 CHIP_LOG_ERROR("Failed to get existing NOC: %s", ErrorStr(err));
                 return nil;
@@ -240,7 +240,7 @@ - (instancetype)initForExistingFabric:(FabricTable *)fabricTable
     {
         uint8_t icaBuf[Credentials::kMaxCHIPCertLength];
         MutableByteSpan icaCert(icaBuf);
-        CHIP_ERROR err = fabric->FetchICACert(icaCert);
+        CHIP_ERROR err = fabricTable->FetchICACert(fabric->GetFabricIndex(), icaCert);
         if (err != CHIP_NO_ERROR) {
             CHIP_LOG_ERROR("Failed to get existing intermediate certificate: %s", ErrorStr(err));
             return nil;
@@ -282,7 +282,7 @@ - (instancetype)initForExistingFabric:(FabricTable *)fabricTable
     {
         uint8_t rootBuf[Credentials::kMaxCHIPCertLength];
         MutableByteSpan rootCert(rootBuf);
-        CHIP_ERROR err = fabric->FetchRootCert(rootCert);
+        CHIP_ERROR err = fabricTable->FetchRootCert(fabric->GetFabricIndex(), rootCert);
         if (err != CHIP_NO_ERROR) {
             CHIP_LOG_ERROR("Failed to get existing root certificate: %s", ErrorStr(err));
             return nil;