Don't generate getters that copy P256Keypair

project-chip · Dec 20, 2023 · 611937f · 611937f
1 parent a55c241
commit 611937f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/examples/darwin-framework-tool/commands/common/CHIPToolKeypair.mm b/examples/darwin-framework-tool/commands/common/CHIPToolKeypair.mm
@@ -12,15 +12,14 @@
 static NSString * const kOperationalCredentialsIssuerKeypairStorage = @"ChipToolOpCredsCAKey";
 static NSString * const kOperationalCredentialsIPK = @"ChipToolOpCredsIPK";
 
-@interface CHIPToolKeypair ()
-@property (nonatomic) chip::Crypto::P256Keypair mKeyPair;
-@property (nonatomic) chip::Crypto::P256Keypair mIssuer;
-@property (nonatomic) NSData * ipk;
-@property (atomic) uint32_t mNow;
-@property (nonatomic, readonly) SecKeyRef mPublicKey;
-@end
+@implementation CHIPToolKeypair {
+    chip::Crypto::P256Keypair _mKeyPair;
+    chip::Crypto::P256Keypair _mIssuer;
+    NSData * _ipk;
+    uint32_t _mNow;
+    SecKeyRef _mPublicKey;
+}
 
-@implementation CHIPToolKeypair
 - (instancetype)init
 {
     if (self = [super init]) {

diff --git a/src/darwin/Framework/CHIP/MTRDeviceController.mm b/src/darwin/Framework/CHIP/MTRDeviceController.mm
@@ -114,8 +114,6 @@ @interface MTRDeviceController () {
 @property (readonly) chip::Credentials::DefaultDACVerifier * defaultDACVerifier;
 @property (readonly) MTRDeviceControllerDelegateBridge * deviceControllerDelegateBridge;
 @property (readonly) MTROperationalCredentialsDelegate * operationalCredentialsDelegate;
-@property (readonly) MTRP256KeypairBridge signingKeypairBridge;
-@property (readonly) MTRP256KeypairBridge operationalKeypairBridge;
 @property (readonly) MTRDeviceAttestationDelegateBridge * deviceAttestationDelegateBridge;
 @property (readonly) MTRDeviceControllerFactory * factory;
 @property (readonly) NSMutableDictionary * nodeIDToDeviceMap;
@@ -125,7 +123,10 @@ @interface MTRDeviceController () {
 
 @end
 
-@implementation MTRDeviceController
+@implementation MTRDeviceController {
+    MTRP256KeypairBridge _signingKeypairBridge;
+    MTRP256KeypairBridge _operationalKeypairBridge;
+}
 
 - (nullable instancetype)initWithParameters:(MTRDeviceControllerAbstractParameters *)parameters error:(NSError * __autoreleasing *)error
 {

diff --git a/src/darwin/Framework/CHIP/MTRP256KeypairBridge.h b/src/darwin/Framework/CHIP/MTRP256KeypairBridge.h
@@ -22,10 +22,10 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-class MTRP256KeypairBridge : public chip::Crypto::P256Keypair
+class MTRP256KeypairBridge final : public chip::Crypto::P256Keypair
 {
 public:
-    ~MTRP256KeypairBridge(){};
+    ~MTRP256KeypairBridge() = default;
 
     CHIP_ERROR Init(id<MTRKeypair> keypair);