Skip to content

Conversation

@lundinc2
Copy link
Contributor

Update PKCS #11 in LTS development branch

Description

This PR syncs the LTS branch with release-candidate branch on AFR

Test Steps

Run PKCS #11 demo locally

Related Issue

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

@lundinc2 lundinc2 requested review from cobusve and yuhui-zheng June 17, 2020 23:43
Copy link
Contributor

@yuhui-zheng yuhui-zheng left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Glanced over, and approving with the understanding that this is to sync between copies.

} else {
xResult = CKR_OBJECT_HANDLE_INVALID;
}
case ( CKA_CLASS ):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor, and fyi... People typically add comments like "fall through intentionally" on empty cases.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I ended up removing this change, I think the release branch was cut before I reverted it. I was being clever to reduce the GNU Complexity, but MISRA did not agree with this change, even with the fall through comments. :(

xResult = CKR_ARGUMENTS_BAD;
}

if (xResult == CKR_OK) {
if (NULL == pxSlotList) {
if( xResult == CKR_OK )
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor and fyi... I would stick to one style, either var==condition or condition==var. Some prefer later, since that's safer even == is mistakenly changed to single =.

@lundinc2 lundinc2 merged commit fe3c62e into FreeRTOS:lts-development Jun 18, 2020
@lundinc2 lundinc2 deleted the pkcs11_sync branch September 28, 2020 19:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants