Integrating Comments

project-chip · Jan 7, 2025 · a50db92 · a50db92
1 parent c6018c1
commit a50db92
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/src/protocols/secure_channel/CASESession.cpp b/src/protocols/secure_channel/CASESession.cpp
@@ -1098,7 +1098,7 @@ CASESession::NextStep CASESession::HandleSigma1(System::PacketBufferHandle && ms
     SetPeerSessionId(parsedSigma1.initiatorSessionId);
 
     // Set the Session parameters provided in the Sigma1 message
-    if (parsedSigma1.initiatorSessionParamsPresent)
+    if (parsedSigma1.initiatorSessionParamStructPresent)
     {
         SetRemoteSessionParameters(parsedSigma1.initiatorSessionParams);
         mExchangeCtxt.Value()->GetSessionHandle()->AsUnauthenticatedSession()->SetRemoteSessionParameters(
@@ -2328,7 +2328,7 @@ CHIP_ERROR CASESession::ParseSigma1(TLV::ContiguousBufferTLVReader & tlvReader,
     {
         ReturnErrorOnFailure(DecodeSessionParametersIfPresent(AsTlvContextTag(Sigma1Tags::kInitiatorSessionParams), tlvReader,
                                                               outParsedSigma1.initiatorSessionParams));
-        outParsedSigma1.initiatorSessionParamsPresent = true;
+        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,7 @@ class DLL_EXPORT CASESession : public Messaging::UnsolicitedMessageHandler,
     struct ParsedSigma1 : Sigma1Param
     {
         ByteSpan initiatorEphPubKey;
-        bool initiatorSessionParamsPresent = false;
+        bool initiatorSessionParamStructPresent = false;
         SessionParameters initiatorSessionParams;
     };
 
@@ -275,6 +275,8 @@ class DLL_EXPORT CASESession : public Messaging::UnsolicitedMessageHandler,
      * On success, either the sessionResumptionRequested field will be set to true
      * and the resumptionID and initiatorResumeMIC fields will be set to
      * valid values, or the sessionResumptionRequested field will be set to false.
+     *
+     *  @note Calls to this function must always be made with a newly created and fresh ParsedSigma1 parameter.
      */
     static CHIP_ERROR ParseSigma1(TLV::ContiguousBufferTLVReader & tlvReader, ParsedSigma1 & parsedMessage);
 

diff --git a/src/protocols/secure_channel/tests/TestPairingSession.cpp b/src/protocols/secure_channel/tests/TestPairingSession.cpp
@@ -130,11 +130,14 @@ struct DecodeSessionParamsTestCase
     bool includeEndContainer                   = true;
 };
 
+constexpr uint8_t kSessionParamsStructTag = 1;
+
 void EncodeSessionParamsHelper(const DecodeSessionParamsTestCase & testCase, TLV::TLVWriter & writer)
 {
 
     TLVType sessionParamsContainer = kTLVType_NotSpecified;
-    EXPECT_EQ(writer.StartContainer(ContextTag(1), kTLVType_Structure, sessionParamsContainer), CHIP_NO_ERROR);
+    EXPECT_EQ(writer.StartContainer(ContextTag(kSessionParamsStructTag), kTLVType_Structure, sessionParamsContainer),
+              CHIP_NO_ERROR);
 
     writer.Put(ContextTag(SessionParameters::Tag::kSessionIdleInterval), testCase.mrpConfig.mIdleRetransTimeout.count());
     writer.Put(ContextTag(SessionParameters::Tag::kSessionActiveInterval), testCase.mrpConfig.mActiveRetransTimeout.count());
@@ -150,8 +153,11 @@ void EncodeSessionParamsHelper(const DecodeSessionParamsTestCase & testCase, TLV
 
     if (testCase.testFutureProofing)
     {
+        // Choosing a tag that is much higher than the current highest tag value in the Specification
+        constexpr uint8_t kFutureProofTlvElementTag = 17;
+
         uint32_t futureProofTlvElement = 0x777666;
-        writer.Put(ContextTag(8), futureProofTlvElement);
+        writer.Put(ContextTag(kFutureProofTlvElementTag), futureProofTlvElement);
     }
 
     if (testCase.includeEndContainer)
@@ -336,7 +342,7 @@ TEST_F(TestPairingSession, TestDecodeSessionParameters)
         bool testCaseFailed = false;
         CHIP_ERROR err      = CHIP_NO_ERROR;
 
-        err = DecodeSessionParametersIfPresent(ContextTag(1), reader, decodedParams);
+        err = DecodeSessionParametersIfPresent(ContextTag(kSessionParamsStructTag), reader, decodedParams);
         if (err != testCase.expectedErrorDecodeParams)
         {
             printf("\nDecodeSessionParametersIfPresent returned Unexpected error code: %" CHIP_ERROR_FORMAT, err.Format());