Remove CHIPP256KeypairNativeBridge. (#20243)

We don't need the complicated indirection here, as long as we compile
libCHIP with RTTI enabled on Mac, like the framework code that's
trying to use it.

build/config/compiler/BUILD.gn

@@ -453,7 +453,7 @@ config("coverage_default") {
 
 declare_args() {
   # Enable Runtime Type Information (RTTI)
-  enable_rtti = false
+  enable_rtti = current_os == "mac" || current_os == "ios"
 }
 
 config("no_rtti") {

src/darwin/Framework/CHIP/MTRCertificates.mm

@@ -179,11 +179,10 @@ + (nullable NSData *)generateCertificateSigningRequest:(id<MTRKeypair>)keypair
         if (err != CHIP_NO_ERROR) {
             break;
         }
-        CHIPP256KeypairNativeBridge nativeKeypair(keypairBridge);
 
         uint8_t buf[kMAX_CSR_Length];
         MutableByteSpan csr(buf);
-        err = GenerateCertificateSigningRequest(&nativeKeypair, csr);
+        err = GenerateCertificateSigningRequest(&keypairBridge, csr);
         if (err != CHIP_NO_ERROR) {
             break;
         }

src/darwin/Framework/CHIP/MTRDeviceController.mm

@@ -77,7 +77,6 @@ @interface MTRDeviceController ()
 @property (readonly) MTROperationalCredentialsDelegate * operationalCredentialsDelegate;
 @property (readonly) MTRP256KeypairBridge signingKeypairBridge;
 @property (readonly) MTRP256KeypairBridge operationalKeypairBridge;
-@property (readonly) chip::Optional<chip::CHIPP256KeypairNativeBridge> operationalKeypairNativeBridge;
 @property (readonly) MTRDeviceAttestationDelegateBridge * deviceAttestationDelegateBridge;
 @property (readonly) MTRControllerFactory * factory;
 @end
@@ -193,16 +192,16 @@ - (BOOL)startup:(MTRDeviceControllerStartupParamsInternal *)startupParams
         CHIP_ERROR errorCode = CHIP_ERROR_INCORRECT_STATE;
 
         // create a MTRP256KeypairBridge here and pass it to the operationalCredentialsDelegate
-        std::unique_ptr<chip::Crypto::CHIPP256KeypairNativeBridge> nativeBridge;
+        chip::Crypto::P256Keypair * signingKeypair = nullptr;
         if (startupParams.nocSigner) {
             errorCode = _signingKeypairBridge.Init(startupParams.nocSigner);
             if ([self checkForStartError:(CHIP_NO_ERROR == errorCode) logMsg:kErrorSigningKeypairInit]) {
                 return;
             }
-            nativeBridge = std::make_unique<chip::Crypto::CHIPP256KeypairNativeBridge>(_signingKeypairBridge);
+            signingKeypair = &_signingKeypairBridge;
         }
-        errorCode = _operationalCredentialsDelegate->Init(_factory.storageDelegateBridge, std::move(nativeBridge),
-            startupParams.ipk, startupParams.rootCertificate, startupParams.intermediateCertificate);
+        errorCode = _operationalCredentialsDelegate->Init(_factory.storageDelegateBridge, signingKeypair, startupParams.ipk,
+            startupParams.rootCertificate, startupParams.intermediateCertificate);
         if ([self checkForStartError:(CHIP_NO_ERROR == errorCode) logMsg:kErrorOperationalCredentialsInit]) {
             return;
         }
@@ -231,8 +230,7 @@ - (BOOL)startup:(MTRDeviceControllerStartupParamsInternal *)startupParams
             if ([self checkForStartError:(CHIP_NO_ERROR == errorCode) logMsg:kErrorOperationalKeypairInit]) {
                 return;
             }
-            _operationalKeypairNativeBridge.Emplace(_operationalKeypairBridge);
-            commissionerParams.operationalKeypair = &_operationalKeypairNativeBridge.Value();
+            commissionerParams.operationalKeypair = &_operationalKeypairBridge;
             commissionerParams.hasExternallyOwnedOperationalKeypair = true;
         }
 

src/darwin/Framework/CHIP/MTROperationalCredentialsDelegate.h

@@ -28,13 +28,12 @@
 #include <controller/OperationalCredentialsDelegate.h>
 #include <crypto/CHIPCryptoPAL.h>
 #include <lib/core/CASEAuthTag.h>
-#include <platform/Darwin/CHIPP256KeypairNativeBridge.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
 class MTROperationalCredentialsDelegate : public chip::Controller::OperationalCredentialsDelegate {
 public:
-    using ChipP256KeypairPtr = std::unique_ptr<chip::Crypto::P256Keypair>;
+    using ChipP256KeypairPtr = chip::Crypto::P256Keypair *;
 
     ~MTROperationalCredentialsDelegate() {}
 

src/darwin/Framework/CHIP/MTROperationalCredentialsDelegate.mm

@@ -49,7 +49,7 @@
 
     mStorage = storage;
 
-    mIssuerKey = std::move(nocSigner);
+    mIssuerKey = nocSigner;
 
     if ([ipk length] != mIPK.Length()) {
         MTR_LOG_ERROR("MTROperationalCredentialsDelegate::init provided IPK is wrong size");
@@ -203,7 +203,6 @@ uint64_t GetIssuerId(NSNumber * _Nullable providedIssuerId)
     *rootCert = nil;
     MTRP256KeypairBridge keypairBridge;
     ReturnErrorOnFailure(keypairBridge.Init(keypair));
-    CHIPP256KeypairNativeBridge nativeKeypair(keypairBridge);
 
     ChipDN rcac_dn;
     ReturnErrorOnFailure(rcac_dn.AddAttribute_MatterRCACId(GetIssuerId(issuerId)));
@@ -229,7 +228,7 @@ uint64_t GetIssuerId(NSNumber * _Nullable providedIssuerId)
     uint8_t rcacBuffer[Controller::kMaxCHIPDERCertLength];
     MutableByteSpan rcac(rcacBuffer);
     X509CertRequestParams rcac_request = { 0, validityStart, validityEnd, rcac_dn, rcac_dn };
-    ReturnErrorOnFailure(NewRootX509Cert(rcac_request, nativeKeypair, rcac));
+    ReturnErrorOnFailure(NewRootX509Cert(rcac_request, keypairBridge, rcac));
     *rootCert = AsData(rcac);
     return CHIP_NO_ERROR;
 }
@@ -247,7 +246,6 @@ uint64_t GetIssuerId(NSNumber * _Nullable providedIssuerId)
 
     MTRP256KeypairBridge keypairBridge;
     ReturnErrorOnFailure(keypairBridge.Init(rootKeypair));
-    CHIPP256KeypairNativeBridge nativeRootKeypair(keypairBridge);
 
     ByteSpan rcac = AsByteSpan(rootCertificate);
 
@@ -280,7 +278,7 @@ uint64_t GetIssuerId(NSNumber * _Nullable providedIssuerId)
     uint8_t icacBuffer[Controller::kMaxCHIPDERCertLength];
     MutableByteSpan icac(icacBuffer);
     X509CertRequestParams icac_request = { 0, validityStart, validityEnd, icac_dn, rcac_dn };
-    ReturnErrorOnFailure(NewICAX509Cert(icac_request, pubKey, nativeRootKeypair, icac));
+    ReturnErrorOnFailure(NewICAX509Cert(icac_request, pubKey, keypairBridge, icac));
     *intermediateCert = AsData(icac);
     return CHIP_NO_ERROR;
 }
@@ -308,7 +306,6 @@ uint64_t GetIssuerId(NSNumber * _Nullable providedIssuerId)
 
     MTRP256KeypairBridge keypairBridge;
     ReturnErrorOnFailure(keypairBridge.Init(signingKeypair));
-    CHIPP256KeypairNativeBridge nativeSigningKeypair(keypairBridge);
 
     P256PublicKey pubKey;
     ReturnErrorOnFailure(MTRP256KeypairBridge::MatterPubKeyFromSecKeyRef(operationalPublicKey, &pubKey));
@@ -323,7 +320,7 @@ uint64_t GetIssuerId(NSNumber * _Nullable providedIssuerId)
 
     uint8_t nocBuffer[Controller::kMaxCHIPDERCertLength];
     MutableByteSpan noc(nocBuffer);
-    ReturnErrorOnFailure(GenerateNOC(nativeSigningKeypair, signingCertificate, node, fabric, cats, pubKey, noc));
+    ReturnErrorOnFailure(GenerateNOC(keypairBridge, signingCertificate, node, fabric, cats, pubKey, noc));
 
     *operationalCert = AsData(noc);
     return CHIP_NO_ERROR;

src/darwin/Framework/CHIP/MTRP256KeypairBridge.h

@@ -22,7 +22,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-class MTRP256KeypairBridge : public chip::Crypto::P256KeypairBase
+class MTRP256KeypairBridge : public chip::Crypto::P256Keypair
 {
 public:
     ~MTRP256KeypairBridge(){};

src/platform/Darwin/BUILD.gn

@@ -40,8 +40,6 @@ static_library("Darwin") {
     "BlePlatformConfig.h",
     "CHIPDevicePlatformConfig.h",
     "CHIPDevicePlatformEvent.h",
-    "CHIPP256KeypairNativeBridge.cpp",
-    "CHIPP256KeypairNativeBridge.h",
     "CHIPPlatformConfig.h",
     "ConfigurationManagerImpl.cpp",
     "ConfigurationManagerImpl.h",