Skip to content

Commit

Permalink
Restyle fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
anush-apple committed Aug 23, 2024
1 parent 35d220e commit 7ba72a6
Showing 1 changed file with 7 additions and 11 deletions.
18 changes: 7 additions & 11 deletions src/darwin/Framework/CHIP/MTRDeviceController.mm
Original file line number Diff line number Diff line change
Expand Up @@ -336,17 +336,13 @@ - (BOOL)matchesPendingShutdownWithParams:(MTRDeviceControllerParameters *)parame
if (!parameters.operationalCertificate || !parameters.rootCertificate) {
return FALSE;
}
NSNumber *nodeID = [MTRDeviceControllerParameters nodeIDFromNOC:parameters.operationalCertificate];
NSNumber *fabricID = [MTRDeviceControllerParameters fabricIDFromNOC:parameters.operationalCertificate];
NSData *publicKey = [MTRDeviceControllerParameters publicKeyFromCertificate:parameters.rootCertificate];
NSNumber * nodeID = [MTRDeviceControllerParameters nodeIDFromNOC:parameters.operationalCertificate];
NSNumber * fabricID = [MTRDeviceControllerParameters fabricIDFromNOC:parameters.operationalCertificate];
NSData * publicKey = [MTRDeviceControllerParameters publicKeyFromCertificate:parameters.rootCertificate];

std::lock_guard lock(_assertionLock);

return _keepRunningAssertionCounter > 0 &&
_shutdownPending &&
MTREqualObjects(nodeID, self.nodeID) &&
MTREqualObjects(fabricID, self.fabricID) &&
MTREqualObjects(publicKey, self.rootPublicKey);
return _keepRunningAssertionCounter > 0 && _shutdownPending && MTREqualObjects(nodeID, self.nodeID) && MTREqualObjects(fabricID, self.fabricID) && MTREqualObjects(publicKey, self.rootPublicKey);
}

- (void)addRunAssertion
Expand Down Expand Up @@ -701,9 +697,9 @@ - (BOOL)startup:(MTRDeviceControllerStartupParamsInternal *)startupParams

chip::Crypto::P256PublicKey rootPublicKey;
if (_cppCommissioner->GetRootPublicKey(rootPublicKey) == CHIP_NO_ERROR) {
self.rootPublicKey = [NSData dataWithBytes:rootPublicKey.Bytes() length:rootPublicKey.Length()];
self.nodeID = @(_cppCommissioner->GetNodeId());
self.fabricID = @(_cppCommissioner->GetFabricId());
self.rootPublicKey = [NSData dataWithBytes:rootPublicKey.Bytes() length:rootPublicKey.Length()];
self.nodeID = @(_cppCommissioner->GetNodeId());
self.fabricID = @(_cppCommissioner->GetFabricId());
}

commissionerInitialized = YES;
Expand Down

0 comments on commit 7ba72a6

Please sign in to comment.