Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Small doc editorial fixes after #19277 #19465

Merged
merged 4 commits into from
Jun 11, 2022
Merged

Small doc editorial fixes after #19277 #19465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b955f3a
Small doc editorial fixes after #19277
tcarmelveilleux Jun 10, 2022
1b03ac8
Merge remote-tracking branch 'upstream/master' into minor-editorial-f…
tcarmelveilleux Jun 10, 2022
9e2483b
Merge remote-tracking branch 'upstream/master' into minor-editorial-f…
tcarmelveilleux Jun 10, 2022
6ed3c41
Merge remote-tracking branch 'upstream/master' into minor-editorial-f…
tcarmelveilleux Jun 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/credentials/FabricTable.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ class DLL_EXPORT FabricInfo

// Validate an NOC chain at time of adding/updating a fabric (uses VerifyCredentials with additional checks).
// The `existingFabricId` is passed for UpdateNOC, and must match the Fabric, to make sure that we are
// not trying to change FabricID with UpdateNOC. If set to kUndefinedFabricIndex, we are doing an add and
// not trying to change FabricID with UpdateNOC. If set to kUndefinedFabricId, we are doing AddNOC and
// we don't need to check match to pre-existing fabric.
static CHIP_ERROR ValidateIncomingNOCChain(const ByteSpan & noc, const ByteSpan & icac, const ByteSpan & rcac,
FabricId existingFabricId, Credentials::CertificateValidityPolicy * policy,
Expand Down Expand Up @@ -514,7 +514,7 @@ class DLL_EXPORT FabricTable
* The keypair is temporary and becomes usable for `SignWithOpKeypair` only after either
* `ActivatePendingOperationalKey` is called. It is destroyed if
* `RevertPendingFabricData` is called before `CommitPendingFabricData`.
* If a pending keypair already existed, it is replaced by this call.
* If a pending keypair for the provided fabricIndex (if present) already existed, it is replaced by this call.
*
* Only one pending operational keypair is supported at a time.
*
Expand Down
2 changes: 1 addition & 1 deletion src/crypto/OperationalKeystore.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ class OperationalKeystore
*
* @retval CHIP_NO_ERROR on success
* @retval CHIP_ERROR_INCORRECT_STATE if the key store is not properly initialized.
* @retval CHIP_ERROR_INVALID_FABRIC_INDEX if there is no pending operational keypair for `fabricIndex`
* @retval CHIP_ERROR_INVALID_FABRIC_INDEX if there is no operational keypair for `fabricIndex`
* @retval CHIP_ERROR_NOT_IMPLEMENTED if only `SignWithOpKeypair` is supported
* @retval other CHIP_ERROR value on internal storage errors
*/
Expand Down