Fix merge of upstream

src/app/CASEClient.cpp

@@ -30,6 +30,7 @@ CHIP_ERROR CASEClient::EstablishSession(PeerId peer, const Transport::PeerAddres
                                         const ReliableMessageProtocolConfig & remoteMRPConfig,
                                         SessionEstablishmentDelegate * delegate)
 {
+    VerifyOrDie(mInitParams.fabricTable != nullptr);
     // Create a UnauthenticatedSession for CASE pairing.
     Optional<SessionHandle> session = mInitParams.sessionManager->CreateUnauthenticatedSession(peerAddress, remoteMRPConfig);
     VerifyOrReturnError(session.HasValue(), CHIP_ERROR_NO_MEMORY);

src/app/OperationalDeviceProxy.h

@@ -115,7 +115,6 @@ class DLL_EXPORT OperationalDeviceProxy : public DeviceProxy,
                 mFabricIndex = fabricInfo->GetFabricIndex();
             }
         }
-        mFabricIndex  = fabricInfo->GetFabricIndex();
         mState = State::NeedsAddress;
         mAddressLookupHandle.SetListener(this);
     }

src/credentials/FabricTable.h

@@ -190,7 +190,7 @@ class DLL_EXPORT FabricInfo
     // Validate an NOC chain at time of adding/updating a fabric (uses VerifyCredentials with additional checks)
     static CHIP_ERROR ValidateIncomingNOCChain(const ByteSpan & noc, const ByteSpan & icac, const ByteSpan & rcac, FabricId existingFabricId,
                                                 Credentials::CertificateValidityPolicy * policy,
-                                                PeerId & outOperationalId, FabricId & outFabricId, Crypto::P256PublicKey & outNocPubkey)
+                                                PeerId & outOperationalId, FabricId & outFabricId, Crypto::P256PublicKey & outNocPubkey);
 
     /**
      *  Reset the state to a completely uninitialized status.

src/protocols/secure_channel/CASESession.cpp

@@ -180,8 +180,8 @@ CASESession::ListenForSessionEstablishment(SessionManager & sessionManager, Fabr
     VerifyOrReturnError(fabrics != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     ReturnErrorOnFailure(Init(sessionManager, policy, delegate));
 
-    mRole                     = CryptoContext::SessionRole::kResponder;
     mFabricsTable             = fabrics;
+    mRole                     = CryptoContext::SessionRole::kResponder;
     mSessionResumptionStorage = sessionResumptionStorage;
     mLocalMRPConfig           = mrpConfig;
 
@@ -197,17 +197,15 @@ CHIP_ERROR CASESession::EstablishSession(SessionManager & sessionManager, Fabric
 {
     MATTER_TRACE_EVENT_SCOPE("EstablishSession", "CASESession");
     CHIP_ERROR err          = CHIP_NO_ERROR;
-    FabricInfo * fabricInfo = nullptr;
 
     // Return early on error here, as we have not initialized any state yet
     ReturnErrorCodeIf(exchangeCtxt == nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     ReturnErrorCodeIf(fabricTable == nullptr, CHIP_ERROR_INVALID_ARGUMENT);
 
     // Use FabricTable directly to avoid situation of dangling index from stale FabricInfo
     // until we factor-out any FabricInfo direct usage.
-    mFabricsTable = fabricTable;
     ReturnErrorCodeIf(peerScopedNodeId.GetFabricIndex() == kUndefinedFabricIndex, CHIP_ERROR_INVALID_ARGUMENT);
-    auto * fabricInfo = mFabricsTable->FindFabricWithIndex(peerScopedNodeId.GetFabricIndex());
+    auto * fabricInfo = fabricTable->FindFabricWithIndex(peerScopedNodeId.GetFabricIndex());
     ReturnErrorCodeIf(fabricInfo == nullptr, CHIP_ERROR_INVALID_ARGUMENT);
 
     err = Init(sessionManager, policy, delegate);
@@ -222,6 +220,7 @@ CHIP_ERROR CASESession::EstablishSession(SessionManager & sessionManager, Fabric
     // been initialized
     SuccessOrExit(err);
 
+    mFabricsTable             = fabricTable;
     mFabricIndex              = fabricInfo->GetFabricIndex();
     mSessionResumptionStorage = sessionResumptionStorage;
     mLocalMRPConfig           = mrpConfig;

src/protocols/secure_channel/tests/TestCASESession.cpp

@@ -92,6 +92,8 @@ class TestOperationalKeystore : public chip::Crypto::OperationalKeystore
         mKeypair = std::move(keypair);
     }
 
+    bool HasPendingOpKeypair() const override {  return false; }
+
     CHIP_ERROR NewOpKeypairForFabric(FabricIndex fabricIndex, MutableByteSpan & outCertificateSigningRequest) override
     {
         return CHIP_ERROR_NOT_IMPLEMENTED;