Merge remote-tracking branch 'origin/fix-11247-deconstruct-attest-too…

…-strict' into fix-11247-deconstruct-attest-too-strict
project-chip · Nov 18, 2021 · 959d8ed · 959d8ed
2 parents 8f089a9 + 62bef80
commit 959d8ed
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/credentials/DeviceAttestationVendorReserved.h b/src/credentials/DeviceAttestationVendorReserved.h
@@ -60,7 +60,7 @@ class DeviceAttestationVendorReservedDeconstructor
             if (!TLV::IsContextTag(tag))
                 break;
         }
-        // positioned to first context tag (vendor reserved data)
+        // positioned to first non-context tag (vendor reserved data)
         mIsInitialized  = true;
         mIsAtFirstToken = true;
         return CHIP_NO_ERROR;

diff --git a/src/lib/core/CHIPTLVTags.h b/src/lib/core/CHIPTLVTags.h
@@ -167,7 +167,7 @@ inline uint32_t ProfileIdFromTag(Tag tag)
  */
 inline uint16_t ProfileNumFromTag(Tag tag)
 {
-    return static_cast<uint16_t>((tag & kProfileNumMask) >> kProfileIdShift);
+    return static_cast<uint16_t>((tag & kProfileNumMask) >> kProfileNumShift);
 }
 
 /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -167,7 +167,7 @@ inline uint32_t ProfileIdFromTag(Tag tag) @@
      */
     inline uint16_t ProfileNumFromTag(Tag tag)
     {
-        return static_cast<uint16_t>((tag & kProfileNumMask) >> kProfileIdShift);
+        return static_cast<uint16_t>((tag & kProfileNumMask) >> kProfileNumShift);
     }
     /**
@@ Expand Down @@