removing

project-chip · Jan 9, 2025 · 00af395 · 00af395
1 parent a50db92
commit 00af395
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/src/protocols/secure_channel/CASESession.cpp b/src/protocols/secure_channel/CASESession.cpp
@@ -1097,13 +1097,10 @@ CASESession::NextStep CASESession::HandleSigma1(System::PacketBufferHandle && ms
     ChipLogDetail(SecureChannel, "Peer assigned session key ID %d", parsedSigma1.initiatorSessionId);
     SetPeerSessionId(parsedSigma1.initiatorSessionId);
 
-    // Set the Session parameters provided in the Sigma1 message
-    if (parsedSigma1.initiatorSessionParamStructPresent)
-    {
-        SetRemoteSessionParameters(parsedSigma1.initiatorSessionParams);
-        mExchangeCtxt.Value()->GetSessionHandle()->AsUnauthenticatedSession()->SetRemoteSessionParameters(
-            GetRemoteSessionParameters());
-    }
+    // Set the Session parameters provided in the Sigma1 message, if no Session parameters were provided, the previously provided
+    // ones will be used.
+    SetRemoteSessionParameters(parsedSigma1.initiatorSessionParams);
+    mExchangeCtxt.Value()->GetSessionHandle()->AsUnauthenticatedSession()->SetRemoteSessionParameters(GetRemoteSessionParameters());
 
     if (parsedSigma1.sessionResumptionRequested &&
         parsedSigma1.resumptionId.size() == SessionResumptionStorage::kResumptionIdSize &&
@@ -2328,7 +2325,6 @@ CHIP_ERROR CASESession::ParseSigma1(TLV::ContiguousBufferTLVReader & tlvReader,
     {
         ReturnErrorOnFailure(DecodeSessionParametersIfPresent(AsTlvContextTag(Sigma1Tags::kInitiatorSessionParams), tlvReader,
                                                               outParsedSigma1.initiatorSessionParams));
-        outParsedSigma1.initiatorSessionParamStructPresent = true;
 
         err = tlvReader.Next();
     }

diff --git a/src/protocols/secure_channel/CASESession.h b/src/protocols/secure_channel/CASESession.h
@@ -222,7 +222,6 @@ class DLL_EXPORT CASESession : public Messaging::UnsolicitedMessageHandler,
     struct ParsedSigma1 : Sigma1Param
     {
         ByteSpan initiatorEphPubKey;
-        bool initiatorSessionParamStructPresent = false;
         SessionParameters initiatorSessionParams;
     };