|
14 | 14 | * See the License for the specific language governing permissions and
|
15 | 15 | * limitations under the License.
|
16 | 16 | */
|
| 17 | +#import <Matter/MTRCommissionableBrowserResult.h> |
17 | 18 | #import <Matter/MTRDefines.h>
|
18 | 19 | #import <Matter/MTRDeviceControllerParameters.h>
|
19 | 20 |
|
20 | 21 | #import "MTRDeviceController_Internal.h"
|
21 | 22 |
|
22 | 23 | #import "MTRAsyncWorkQueue.h"
|
23 |
| -#import "MTRAttestationTrustStoreBridge.h" |
24 | 24 | #import "MTRBaseDevice_Internal.h"
|
25 |
| -#import "MTRCommissionableBrowser.h" |
26 |
| -#import "MTRCommissionableBrowserResult_Internal.h" |
27 | 25 | #import "MTRCommissioningParameters.h"
|
28 | 26 | #import "MTRConversion.h"
|
29 | 27 | #import "MTRDefines_Internal.h"
|
30 |
| -#import "MTRDeviceControllerDelegateBridge.h" |
31 | 28 | #import "MTRDeviceControllerFactory_Internal.h"
|
32 | 29 | #import "MTRDeviceControllerLocalTestStorage.h"
|
33 | 30 | #import "MTRDeviceControllerStartupParams.h"
|
|
43 | 40 | #import "MTRLogging_Internal.h"
|
44 | 41 | #import "MTRMetricKeys.h"
|
45 | 42 | #import "MTRMetricsCollector.h"
|
46 |
| -#import "MTRP256KeypairBridge.h" |
47 | 43 | #import "MTRPersistentStorageDelegateBridge.h"
|
48 |
| -#import "MTRServerEndpoint_Internal.h" |
49 | 44 | #import "MTRSetupPayload.h"
|
50 | 45 | #import "MTRTimeUtils.h"
|
51 | 46 | #import "MTRUnfairLock.h"
|
52 | 47 | #import "MTRUtilities.h"
|
53 | 48 | #import "NSDataSpanConversion.h"
|
54 | 49 | #import "NSStringSpanConversion.h"
|
55 |
| -#import <setup_payload/ManualSetupPayloadGenerator.h> |
56 |
| -#import <setup_payload/SetupPayload.h> |
57 |
| -#import <zap-generated/MTRBaseClusters.h> |
58 | 50 |
|
59 |
| -#import "MTRDeviceAttestationDelegateBridge.h" |
60 |
| -#import "MTRDeviceConnectionBridge.h" |
61 |
| - |
62 |
| -#include <platform/CHIPDeviceConfig.h> |
63 |
| - |
64 |
| -#include <app-common/zap-generated/cluster-objects.h> |
65 |
| -#include <app/data-model/List.h> |
66 | 51 | #include <app/server/Dnssd.h>
|
67 |
| -#include <controller/CHIPDeviceController.h> |
68 |
| -#include <controller/CHIPDeviceControllerFactory.h> |
69 |
| -#include <controller/CommissioningWindowOpener.h> |
70 |
| -#include <credentials/FabricTable.h> |
71 |
| -#include <credentials/GroupDataProvider.h> |
72 |
| -#include <credentials/attestation_verifier/DacOnlyPartialAttestationVerifier.h> |
73 |
| -#include <credentials/attestation_verifier/DefaultDeviceAttestationVerifier.h> |
74 |
| -#include <inet/InetInterface.h> |
75 |
| -#include <lib/core/CHIPVendorIdentifiers.hpp> |
76 |
| -#include <platform/LockTracker.h> |
77 |
| -#include <platform/PlatformManager.h> |
78 |
| -#include <setup_payload/ManualSetupPayloadGenerator.h> |
79 |
| -#include <system/SystemClock.h> |
| 52 | +#include <crypto/CHIPCryptoPAL.h> |
80 | 53 |
|
81 | 54 | #include <atomic>
|
82 | 55 | #include <dns_sd.h>
|
@@ -119,22 +92,10 @@ - (instancetype)initWithDelegate:(id<MTRDeviceControllerDelegate>)delegate queue
|
119 | 92 | @end
|
120 | 93 |
|
121 | 94 | @implementation MTRDeviceController {
|
122 |
| - chip::Credentials::PartialDACVerifier * _partialDACVerifier; |
123 |
| - chip::Credentials::DefaultDACVerifier * _defaultDACVerifier; |
124 |
| - MTRDeviceControllerDelegateBridge * _deviceControllerDelegateBridge; |
125 |
| - MTRDeviceAttestationDelegateBridge * _deviceAttestationDelegateBridge; |
126 | 95 | os_unfair_lock _underlyingDeviceMapLock;
|
127 |
| - MTRCommissionableBrowser * _commissionableBrowser; |
128 |
| - MTRAttestationTrustStoreBridge * _attestationTrustStoreBridge; |
129 |
| - |
130 |
| - // _serverEndpoints is only touched on the Matter queue. |
131 |
| - NSMutableArray<MTRServerEndpoint *> * _serverEndpoints; |
132 | 96 |
|
133 |
| - MTRDeviceStorageBehaviorConfiguration * _storageBehaviorConfiguration; |
134 | 97 | std::atomic<chip::FabricIndex> _storedFabricIndex;
|
135 | 98 | std::atomic<std::optional<uint64_t>> _storedCompressedFabricID;
|
136 |
| - MTRP256KeypairBridge _signingKeypairBridge; |
137 |
| - MTRP256KeypairBridge _operationalKeypairBridge; |
138 | 99 |
|
139 | 100 | // For now, we just ensure that access to _suspended is atomic, but don't
|
140 | 101 | // guarantee atomicity of the the entire suspend/resume operation. The
|
|
0 commit comments