Restyled by clang-format

project-chip · Aug 24, 2022 · a06578d · a06578d
1 parent 824564e
commit a06578d
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 30 deletions.
diff --git a/src/darwin/Framework/CHIP/MTRDeviceController.h b/src/darwin/Framework/CHIP/MTRDeviceController.h
@@ -137,9 +137,7 @@ typedef void (^MTRDeviceConnectionCallback)(MTRBaseDevice * _Nullable device, NS
  * @param[in] iterations      The number of iterations to use when generating the verifier
  * @param[in] salt            The 16-byte salt for verifier computation
  */
-- (nullable NSData *)computePaseVerifier:(uint32_t)setupPincode
-                              iterations:(uint32_t)iterations
-                                    salt:(NSData *)salt;
+- (nullable NSData *)computePaseVerifier:(uint32_t)setupPincode iterations:(uint32_t)iterations salt:(NSData *)salt;
 
 /**
  * Shutdown the controller. Calls to shutdown after the first one are NO-OPs.

diff --git a/src/darwin/Framework/CHIP/MTRDeviceController.mm b/src/darwin/Framework/CHIP/MTRDeviceController.mm
@@ -668,36 +668,32 @@ - (void)setNocChainIssuer:(id<MTRNOCChainIssuer>)nocChainIssuer queue:(dispatch_
     });
 }
 
-- (nullable NSData *)computePaseVerifier:(uint32_t)setupPincode
-                              iterations:(uint32_t)iterations
-                                    salt:(NSData *)salt {
-  __block CHIP_ERROR errorCode = CHIP_ERROR_INCORRECT_STATE;
-  if (![self isRunning]) {
-    [self checkForError:errorCode logMsg:kErrorNotRunning error:nil];
-    return nil;
-  }
-
-  __block NSData *result;
-  __block chip::Spake2pVerifier paseVerifier;
-  __block chip::ByteSpan saltByteSpan =
-      chip::ByteSpan(static_cast<const uint8_t *>(salt.bytes), salt.length);
-
-  dispatch_sync(_chipWorkQueue, ^{
-    if ([self isRunning]) {
-      errorCode = self.cppCommissioner->ComputePASEVerifier(iterations, setupPincode, saltByteSpan,
-                                                            paseVerifier);
-      MTR_LOG_ERROR("ComputePaseVerifier: %s", chip::ErrorStr(errorCode));
+- (nullable NSData *)computePaseVerifier:(uint32_t)setupPincode iterations:(uint32_t)iterations salt:(NSData *)salt
+{
+    __block CHIP_ERROR errorCode = CHIP_ERROR_INCORRECT_STATE;
+    if (![self isRunning]) {
+        [self checkForError:errorCode logMsg:kErrorNotRunning error:nil];
+        return nil;
+    }
 
-      uint8_t serializedVerifier[sizeof(paseVerifier.mW0) + sizeof(paseVerifier.mL)];
-      memcpy(serializedVerifier, paseVerifier.mW0, chip::kSpake2p_WS_Length);
-      memcpy(&serializedVerifier[sizeof(paseVerifier.mW0)], paseVerifier.mL,
-             sizeof(paseVerifier.mL));
+    __block NSData * result;
+    __block chip::Spake2pVerifier paseVerifier;
+    __block chip::ByteSpan saltByteSpan = chip::ByteSpan(static_cast<const uint8_t *>(salt.bytes), salt.length);
 
-      result = [NSData dataWithBytes:serializedVerifier length:sizeof(serializedVerifier)];
-    }
-  });
+    dispatch_sync(_chipWorkQueue, ^{
+        if ([self isRunning]) {
+            errorCode = self.cppCommissioner->ComputePASEVerifier(iterations, setupPincode, saltByteSpan, paseVerifier);
+            MTR_LOG_ERROR("ComputePaseVerifier: %s", chip::ErrorStr(errorCode));
+
+            uint8_t serializedVerifier[sizeof(paseVerifier.mW0) + sizeof(paseVerifier.mL)];
+            memcpy(serializedVerifier, paseVerifier.mW0, chip::kSpake2p_WS_Length);
+            memcpy(&serializedVerifier[sizeof(paseVerifier.mW0)], paseVerifier.mL, sizeof(paseVerifier.mL));
+
+            result = [NSData dataWithBytes:serializedVerifier length:sizeof(serializedVerifier)];
+        }
+    });
 
-  return result;
+    return result;
 }
 
 - (BOOL)checkForInitError:(BOOL)condition logMsg:(NSString *)logMsg