dedupe public key cache population for CHIPToolKeypair

project-chip · Nov 4, 2024 · a76bdff · a76bdff
1 parent d328eaf
commit a76bdff
Showing 1 changed file with 6 additions and 12 deletions.
diff --git a/examples/darwin-framework-tool/commands/common/CHIPToolKeypair.mm b/examples/darwin-framework-tool/commands/common/CHIPToolKeypair.mm
@@ -80,24 +80,18 @@ - (SecKeyRef)publicKey
         };
         _mPublicKey = SecKeyCreateWithData((__bridge CFDataRef) publicKeyNSData, (__bridge CFDictionaryRef) attributes, nullptr);
     }
+}
+
+- (SecKeyRef)publicKey
+{
+    [self _populatePublicKeyIfNecessary];
 
     return _mPublicKey;
 }
 
 - (SecKeyRef)copyPublicKey
 {
-    if (_mPublicKey == nil) {
-        chip::Crypto::P256PublicKey publicKey = _mKeyPair.Pubkey();
-        NSData * publicKeyNSData = [NSData dataWithBytes:publicKey.Bytes() length:publicKey.Length()];
-        NSDictionary * attributes = @{
-            (__bridge NSString *) kSecAttrKeyClass : (__bridge NSString *) kSecAttrKeyClassPublic,
-            (NSString *) kSecAttrKeyType : (NSString *) kSecAttrKeyTypeECSECPrimeRandom,
-            (NSString *) kSecAttrKeySizeInBits : @Public_KeySize,
-            (NSString *) kSecAttrLabel : kCHIPToolKeychainLabel,
-            (NSString *) kSecAttrApplicationTag : @CHIPPlugin_CAKeyTag,
-        };
-        _mPublicKey = SecKeyCreateWithData((__bridge CFDataRef) publicKeyNSData, (__bridge CFDictionaryRef) attributes, nullptr);
-    }
+    [self _populatePublicKeyIfNecessary];
 
     if (_mPublicKey) {
         CFRetain(_mPublicKey);