Address review comments.

project-chip · Jan 27, 2023 · a456c09 · a456c09
1 parent bc96e93
commit a456c09
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 28 deletions.
diff --git a/src/darwin/Framework/CHIP/MTRDeviceController.h b/src/darwin/Framework/CHIP/MTRDeviceController.h
@@ -93,11 +93,10 @@ typedef void (^MTRDeviceConnectionCallback)(MTRBaseDevice * _Nullable device, NS
                        error:(NSError * __autoreleasing *)error API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
 /**
- * After MTRDeviceAttestationDelegate's
+ * Call this method after MTRDeviceAttestationDelegate
  * deviceAttestationFailedForController:opaqueDeviceHandle:error: or
  * deviceAttestationCompletedForController:opaqueDeviceHandle:attestationDeviceInfo:error:
- * is called, continueCommissioningDevice:ignoreAttestationFailure:error: should
- * be called to continue commissioning the device.
+ * is called to continue commissioning the device.
  */
 - (BOOL)continueCommissioningDevice:(void *)opaqueDeviceHandle
            ignoreAttestationFailure:(BOOL)ignoreAttestationFailure

diff --git a/src/darwin/Framework/CHIP/MTRDeviceControllerStartupParams.h b/src/darwin/Framework/CHIP/MTRDeviceControllerStartupParams.h
@@ -32,9 +32,8 @@ NS_ASSUME_NONNULL_BEGIN
  * Prepare to initialize a controller given a keypair to use for signing
  * operational certificates.
  *
- * fabricID must be set to a valid (i.e. nonzero) value.
- *
- * ipk must be 16 bytes in length
+ * @param ipk The Identity Protection Key, must be 16 bytes in length
+ * @param fabricID The fabric identifier, must be non-zero.
  */
 - (instancetype)initWithIPK:(NSData *)ipk
                    fabricID:(NSNumber *)fabricID
@@ -48,8 +47,8 @@ NS_ASSUME_NONNULL_BEGIN
  * The fabric id and node id to use will be derived from the provided
  * operationalCertificate.
  *
- * intermediateCertificate may be nil if operationalCertificate is signed by
- * rootCertificate.
+ * @param ipk The Identity Protection Key, must be 16 bytes in length
+ * @param intermediateCertificate may be nil if operationalCertificate is directly signed by rootCertificate.
  *
  * ipk must be 16 bytes in length.
  */

diff --git a/src/darwin/Framework/CHIP/MTROperationalCredentialsDelegate.mm b/src/darwin/Framework/CHIP/MTROperationalCredentialsDelegate.mm
@@ -471,7 +471,7 @@ uint64_t GetIssuerId(NSNumber * _Nullable providedIssuerId)
     CATValues cats;
     if (caseAuthenticatedTags != nil) {
         size_t idx = 0;
-        for (NSNumber * cat in caseAuthenticatedTags) {
+        for (NSNumber * cat in [caseAuthenticatedTags.allObjects sortedArrayUsingSelector:@selector(compare:)]) {
             cats.values[idx++] = [cat unsignedIntValue];
         }
     }

diff --git a/src/darwin/Framework/CHIP/MTRSetupPayload.h b/src/darwin/Framework/CHIP/MTRSetupPayload.h
@@ -21,8 +21,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 typedef NS_OPTIONS(NSUInteger, MTRDiscoveryCapabilities) {
     MTRDiscoveryCapabilitiesUnknown = 0, // Device capabilities are not known (e.g. all we have is a numeric code).
-    MTRDiscoveryCapabilitiesNone API_DEPRECATED(
-        "Please use MTRDiscoveryCapabilitiesUnknown", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4))
+    MTRDiscoveryCapabilitiesNone API_DEPRECATED_WITH_REPLACEMENT(
+        "MTRDiscoveryCapabilitiesUnknown", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4))
     = 0,
     MTRDiscoveryCapabilitiesSoftAP = 1 << 0, // Device supports WiFi softAP
     MTRDiscoveryCapabilitiesBLE = 1 << 1, // Device supports BLE

diff --git a/src/darwin/Framework/CHIPTests/MTRCertificateTests.m b/src/darwin/Framework/CHIPTests/MTRCertificateTests.m
@@ -174,12 +174,6 @@ - (void)testGenerateOperationalCertErrorCases
     [catsWithSameIdentifier addObject:@0x00020001];
     [catsWithSameIdentifier addObject:@0x00010002];
 
-    __auto_type * catsWithDuplicatedCAT = [[NSMutableSet alloc] initWithCapacity:3];
-    // High bits are identifier, low bits are version.
-    [catsWithDuplicatedCAT addObject:@0x00010001];
-    [catsWithDuplicatedCAT addObject:@0x00020001];
-    [catsWithDuplicatedCAT addObject:@0x00010001];
-
     __auto_type * catsWithInvalidVersion = [[NSMutableSet alloc] initWithCapacity:2];
     // High bits are identifier, low bits are version.
     [catsWithInvalidVersion addObject:@0x00010001];
@@ -215,17 +209,6 @@ - (void)testGenerateOperationalCertErrorCases
                                                               error:nil];
     XCTAssertNil(operationalCert);
 
-    // Multiple CATs with the same identifier and same version
-    operationalCert = [MTRCertificates createOperationalCertificate:rootKeys
-                                                 signingCertificate:rootCert
-                                               operationalPublicKey:operationalKeys.publicKey
-                                                           fabricID:@1
-                                                             nodeID:@1
-                                              caseAuthenticatedTags:catsWithDuplicatedCAT
-                                                              error:nil];
-    // Our set made the CATs unique, so we are not putting in invalid input.
-    XCTAssertNotNil(operationalCert);
-
     // CAT with invalid version
     operationalCert = [MTRCertificates createOperationalCertificate:rootKeys
                                                  signingCertificate:rootCert