Merge branch 'master' into feature/fix-tv-app-install-flow-and-supported-clusters

Author: lazarkov

src/controller/CHIPDeviceController.h

@@ -646,7 +646,7 @@ class DLL_EXPORT DeviceCommissioner : public DeviceController,
      * @brief
      *   This function validates the Attestation Information sent by the device.
      *
-     * @param[in] info Structure contatining all the required information for validating the device attestation.
+     * @param[in] info Structure containing all the required information for validating the device attestation.
      */
     CHIP_ERROR ValidateAttestationInfo(const Credentials::DeviceAttestationVerifier::AttestationInfo & info);
 
@@ -667,7 +667,7 @@ class DLL_EXPORT DeviceCommissioner : public DeviceController,
      * As a result, commissioning can advance to the next stage.
      *
      * The DevicePairingDelegate may call this method from the OnScanNetworksSuccess and OnScanNetworksFailure callbacks,
-     * or it may call this method after obtaining network credentials using asyncronous methods (prompting user, cloud API call,
+     * or it may call this method after obtaining network credentials using asynchronous methods (prompting user, cloud API call,
      * etc).
      *
      * If an error happens in the subsequent network commissioning step (either NetworkConfig or ConnectNetwork commands)
@@ -686,7 +686,7 @@ class DLL_EXPORT DeviceCommissioner : public DeviceController,
      * using CommissioningDelegate.SetCommissioningParameters(). As a result, commissioning can advance to the next stage.
      *
      * The DevicePairingDelegate may call this method from the OnICDRegistrationInfoRequired callback, or it may call this
-     * method after obtaining required parameters for ICD registration using asyncronous methods (like RPC call etc).
+     * method after obtaining required parameters for ICD registration using asynchronous methods (like RPC call etc).
      *
      * When the ICD Registration completes, OnICDRegistrationComplete will be called.
      *
@@ -846,8 +846,6 @@ class DLL_EXPORT DeviceCommissioner : public DeviceController,
     RendezvousParameters mRendezvousParametersForDeviceDiscoveredOverBle;
 #endif
 
-    CHIP_ERROR LoadKeyId(PersistentStorageDelegate * delegate, uint16_t & out);
-
     static void OnBasicFailure(void * context, CHIP_ERROR err);
     static void OnBasicSuccess(void * context, const chip::app::DataModel::NullObjectType &);
 
@@ -1004,22 +1002,14 @@ class DLL_EXPORT DeviceCommissioner : public DeviceController,
     CHIP_ERROR ValidateCSR(DeviceProxy * proxy, const ByteSpan & NOCSRElements, const ByteSpan & AttestationSignature,
                            const ByteSpan & dac, const ByteSpan & csrNonce);
 
-    /**
-     * @brief
-     *   This function processes the DAC or PAI certificate sent by the device.
-     */
-    CHIP_ERROR ProcessCertificateChain(const ByteSpan & certificate);
-
     /**
      * @brief
      *   This function validates the revocation status of the DAC Chain sent by the device.
      *
-     * @param[in] info Structure contatining all the required information for validating the device attestation.
+     * @param[in] info Structure containing all the required information for validating the device attestation.
      */
     CHIP_ERROR CheckForRevokedDACChain(const Credentials::DeviceAttestationVerifier::AttestationInfo & info);
 
-    void HandleAttestationResult(CHIP_ERROR err);
-
     CommissioneeDeviceProxy * FindCommissioneeDevice(NodeId id);
     CommissioneeDeviceProxy * FindCommissioneeDevice(const Transport::PeerAddress & peerAddress);
     void ReleaseCommissioneeDevice(CommissioneeDeviceProxy * device);