Remove PASE verifier computation overrides from MTRDeviceController_Concrete. (#35945)
The base class implements these selectors already, and its implementation is
perfectly fine.
diff --git a/src/darwin/Framework/CHIP/MTRDeviceController_Concrete.mm b/src/darwin/Framework/CHIP/MTRDeviceController_Concrete.mm
index cb86c5d..92d04cd 100644
--- a/src/darwin/Framework/CHIP/MTRDeviceController_Concrete.mm
+++ b/src/darwin/Framework/CHIP/MTRDeviceController_Concrete.mm
@@ -1231,30 +1231,6 @@
return [self syncRunOnWorkQueueWithBoolReturnValue:block error:nil];
}
-+ (nullable NSData *)computePASEVerifierForSetupPasscode:(NSNumber *)setupPasscode
- iterations:(NSNumber *)iterations
- salt:(NSData *)salt
- error:(NSError * __autoreleasing *)error
-{
- chip::Crypto::Spake2pVerifier verifier;
- CHIP_ERROR err = verifier.Generate(iterations.unsignedIntValue, AsByteSpan(salt), setupPasscode.unsignedIntValue);
-
- MATTER_LOG_METRIC_SCOPE(kMetricPASEVerifierForSetupCode, err);
-
- if ([MTRDeviceController_Concrete checkForError:err logMsg:kDeviceControllerErrorSpake2pVerifierGenerationFailed error:error]) {
- return nil;
- }
-
- uint8_t serializedBuffer[chip::Crypto::kSpake2p_VerifierSerialized_Length];
- chip::MutableByteSpan serializedBytes(serializedBuffer);
- err = verifier.Serialize(serializedBytes);
- if ([MTRDeviceController_Concrete checkForError:err logMsg:kDeviceControllerErrorSpake2pVerifierSerializationFailed error:error]) {
- return nil;
- }
-
- return AsData(serializedBytes);
-}
-
- (NSData * _Nullable)attestationChallengeForDeviceID:(NSNumber *)deviceID
{
auto block = ^NSData *
@@ -1986,11 +1962,6 @@
return [self syncRunOnWorkQueueWithReturnValue:block error:error];
}
-- (nullable NSData *)computePaseVerifier:(uint32_t)setupPincode iterations:(uint32_t)iterations salt:(NSData *)salt
-{
- return [MTRDeviceController computePASEVerifierForSetupPasscode:@(setupPincode) iterations:@(iterations) salt:salt error:nil];
-}
-
- (void)setPairingDelegate:(id<MTRDevicePairingDelegate>)delegate queue:(dispatch_queue_t)queue
{
auto * delegateShim = [[MTRDevicePairingDelegateShim alloc] initWithDelegate:delegate];
diff --git a/src/darwin/Framework/CHIP/MTRDeviceController_Internal.h b/src/darwin/Framework/CHIP/MTRDeviceController_Internal.h
index 00609d9..84a8b53 100644
--- a/src/darwin/Framework/CHIP/MTRDeviceController_Internal.h
+++ b/src/darwin/Framework/CHIP/MTRDeviceController_Internal.h
@@ -247,8 +247,6 @@
static NSString * const kDeviceControllerErrorCSRValidation = @"Extracting public key from CSR failed";
static NSString * const kDeviceControllerErrorGetCommissionee = @"Failure obtaining device being commissioned";
static NSString * const kDeviceControllerErrorGetAttestationChallenge = @"Failure getting attestation challenge";
-static NSString * const kDeviceControllerErrorSpake2pVerifierGenerationFailed = @"PASE verifier generation failed";
-static NSString * const kDeviceControllerErrorSpake2pVerifierSerializationFailed = @"PASE verifier serialization failed";
static NSString * const kDeviceControllerErrorCDCertStoreInit = @"Init failure while initializing Certificate Declaration Signing Keys store";
NS_ASSUME_NONNULL_END
