Addressing tcat_agent comments: enum TcatCertificateAttribute added, …

…unused variables, missing @param
arnulfrupp · Aug 21, 2023 · 9421a9d · 9421a9d
1 parent c9eae76
commit 9421a9d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/include/openthread/tcat.h b/include/openthread/tcat.h
@@ -138,6 +138,7 @@ typedef struct otTcatVendorInfo
  *
  * @param[in]  aInstance         A pointer to an OpenThread instance.
  * @param[in]  aMessage          A pointer to the message.
+ * @param[in]  aOffset           The offset where the application data begins.
  * @param[in]  aTcatMessageType  The message type received.
  * @param[in]  aServiceName      The name of the service the message is direced to.
  * @param[in]  aContext          A pointer to arbitrary context information.

diff --git a/src/core/meshcop/tcat_agent.cpp b/src/core/meshcop/tcat_agent.cpp
@@ -116,13 +116,13 @@ Error TcatAgent::Connected(MeshCoP::Dtls &aTlsContext)
     VerifyOrExit(IsEnabled(), error = kErrorInvalidState);
     len = sizeof(mCommissionerAuthorizationField);
     SuccessOrExit(error = aTlsContext.GetThreadAttributeFromPeerCertificate(
-                      3, reinterpret_cast<uint8_t *>(&mCommissionerAuthorizationField), &len));
+                  kCertificateAuthorizationField, reinterpret_cast<uint8_t *>(&mCommissionerAuthorizationField), &len));
     VerifyOrExit(len == sizeof(mCommissionerAuthorizationField), error = kErrorParse);
     VerifyOrExit((mCommissionerAuthorizationField.mHeader & kCommissionerFlag) == 1, error = kErrorParse);
 
     len = sizeof(mDeviceAuthorizationField);
     SuccessOrExit(error = aTlsContext.GetThreadAttributeFromOwnCertificate(
-                      3, reinterpret_cast<uint8_t *>(&mDeviceAuthorizationField), &len));
+                  kCertificateAuthorizationField, reinterpret_cast<uint8_t *>(&mDeviceAuthorizationField), &len));
     VerifyOrExit(len == sizeof(mDeviceAuthorizationField), error = kErrorParse);
     VerifyOrExit((mDeviceAuthorizationField.mHeader & kCommissionerFlag) == 0, error = kErrorParse);
 
@@ -131,23 +131,23 @@ Error TcatAgent::Connected(MeshCoP::Dtls &aTlsContext)
     mCommissionerHasExtendedPanId = false;
 
     len = sizeof(mCommissionerDomainName) - 1;
-    if (aTlsContext.GetThreadAttributeFromPeerCertificate(1, reinterpret_cast<uint8_t *>(&mCommissionerDomainName),
+    if (aTlsContext.GetThreadAttributeFromPeerCertificate(kCertificateDomainName, reinterpret_cast<uint8_t *>(&mCommissionerDomainName),
                                                           &len) == kErrorNone)
     {
         mCommissionerDomainName.m8[len] = '\0';
         mCommissionerHasDomainName      = true;
     }
 
     len = sizeof(mCommissionerNetworkName) - 1;
-    if (aTlsContext.GetThreadAttributeFromPeerCertificate(4, reinterpret_cast<uint8_t *>(&mCommissionerNetworkName),
+    if (aTlsContext.GetThreadAttributeFromPeerCertificate(kCertificateNetworkName, reinterpret_cast<uint8_t *>(&mCommissionerNetworkName),
                                                           &len) == kErrorNone)
     {
         mCommissionerNetworkName.m8[len] = '\0';
         mCommissionerHasNetworkName      = true;
     }
 
     len = sizeof(mCommissionerExtendedPanId);
-    if (aTlsContext.GetThreadAttributeFromPeerCertificate(5, reinterpret_cast<uint8_t *>(&mCommissionerExtendedPanId),
+    if (aTlsContext.GetThreadAttributeFromPeerCertificate(kCertificateExtendedPanId, reinterpret_cast<uint8_t *>(&mCommissionerExtendedPanId),
                                                           &len) == kErrorNone)
     {
         if (len == sizeof(mCommissionerExtendedPanId))
@@ -446,7 +446,6 @@ Error TcatAgent::HandleCommissioning(const Message &aIncommingMessage,
     Error error = kErrorNone;
 
     OT_UNUSED_VARIABLE(aOutgoingMessage);
-    OT_UNUSED_VARIABLE(aOffset);
     OT_UNUSED_VARIABLE(aLength);
     OT_UNUSED_VARIABLE(aHasResponse);
 

diff --git a/src/core/meshcop/tcat_agent.hpp b/src/core/meshcop/tcat_agent.hpp
@@ -236,6 +236,18 @@ class TcatAgent : public InstanceLocator, private NonCopyable
             OT_TCAT_MESSAGE_TYPE_CHANGED_TO_TCP_SERVICE, ///< Client has changed to a TCP service
     };
 
+    /**
+     * Represents a TCAT certificate V3 extension attribute (OID 1.3.6.1.4.1.44970.x).
+     *
+     */
+    enum TcatCertificateAttribute
+    {
+        kCertificateDomainName          = 1,
+        kCertificateAuthorizationField  = 3,
+        kCertificateNetworkName         = 4,
+        kCertificateExtendedPanId       = 5,
+    };
+
     /**
      * Represents TCAT status.
      *