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.

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

Update Test 2.4 #142

Merged
merged 2 commits into from
Jan 8, 2025
Merged

Update Test 2.4 #142

merged 2 commits into from
Jan 8, 2025

Conversation

jyao1
Copy link
Member

@jyao1 jyao1 commented Jan 7, 2025

Fix #140

Add comment to doc.
Align PSK_CAP from doc to code.

@jyao1 jyao1 requested a review from steven-bellock as a code owner January 7, 2025 07:06
@@ -136,7 +136,7 @@ TestSetup:
TestTeardown: None

Steps:
1. Requester -> GET_CAPABILITIES {SPDMVersion=NegotiatedVersion, Flags=CERT_CAP|CHAL_CAP|MUT_AUTH_CAP|KEY_EX_CAP|PSK_CAP=1|ENCAP_CAP|HBEAT_CAP|KEY_UPD_CAP} -- if NegotiatedVersion=1.1+
1. Requester -> GET_CAPABILITIES {SPDMVersion=NegotiatedVersion, Flags=CERT_CAP|CHAL_CAP|MUT_AUTH_CAP|KEY_EX_CAP|PSK_CAP=1|ENCAP_CAP|HBEAT_CAP|KEY_UPD_CAP} -- if NegotiatedVersion=1.1+ (It is invalid because ENCRYPT_CAP or MAC_CAP is clear, when KEY_EX_CAP or PSK_CAP is set.)
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
1. Requester -> GET_CAPABILITIES {SPDMVersion=NegotiatedVersion, Flags=CERT_CAP|CHAL_CAP|MUT_AUTH_CAP|KEY_EX_CAP|PSK_CAP=1|ENCAP_CAP|HBEAT_CAP|KEY_UPD_CAP} -- if NegotiatedVersion=1.1+ (It is invalid because ENCRYPT_CAP or MAC_CAP is clear, when KEY_EX_CAP or PSK_CAP is set.)
1. Requester -> GET_CAPABILITIES {SPDMVersion=NegotiatedVersion, Flags=CERT_CAP|CHAL_CAP|MUT_AUTH_CAP|KEY_EX_CAP|PSK_CAP=1|ENCAP_CAP|HBEAT_CAP|KEY_UPD_CAP} -- if NegotiatedVersion=1.1+ (It is invalid because ENCRYPT_CAP and MAC_CAP are clear, when KEY_EX_CAP or PSK_CAP is set.)

Copy link
Member Author

Choose a reason for hiding this comment

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

good catch. Fixed.

@@ -154,12 +154,12 @@ Assertion 2.4.4:
Assertion 2.4.5:
SpdmMessage.Param2 == 0.

3. Requester -> GET_CAPABILITIES {SPDMVersion=NegotiatedVersion, Flags=CERT_CAP|CHAL_CAP|ENCRYPT_CAP|MAC_CAP|MUT_AUTH_CAP|ENCAP_CAP|HBEAT_CAP|KEY_UPD_CAP} -- if NegotiatedVersion=1.1+
3. Requester -> GET_CAPABILITIES {SPDMVersion=NegotiatedVersion, Flags=CERT_CAP|CHAL_CAP|ENCRYPT_CAP|MAC_CAP|MUT_AUTH_CAP|ENCAP_CAP|HBEAT_CAP|KEY_UPD_CAP} -- if NegotiatedVersion=1.1+ (It is invalid because KEY_EX_CAP or PSK_CAP is clear, when ENCRYPT_CAP or MAC_CAP is set.)
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
3. Requester -> GET_CAPABILITIES {SPDMVersion=NegotiatedVersion, Flags=CERT_CAP|CHAL_CAP|ENCRYPT_CAP|MAC_CAP|MUT_AUTH_CAP|ENCAP_CAP|HBEAT_CAP|KEY_UPD_CAP} -- if NegotiatedVersion=1.1+ (It is invalid because KEY_EX_CAP or PSK_CAP is clear, when ENCRYPT_CAP or MAC_CAP is set.)
3. Requester -> GET_CAPABILITIES {SPDMVersion=NegotiatedVersion, Flags=CERT_CAP|CHAL_CAP|ENCRYPT_CAP|MAC_CAP|MUT_AUTH_CAP|ENCAP_CAP|HBEAT_CAP|KEY_UPD_CAP} -- if NegotiatedVersion=1.1+ (It is invalid because KEY_EX_CAP and PSK_CAP are clear, when ENCRYPT_CAP or MAC_CAP is set.)

Copy link
Member Author

Choose a reason for hiding this comment

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

good catch. Fixed.

@steven-bellock steven-bellock requested a review from mcsmonk January 7, 2025 15:29
@jyao1 jyao1 merged commit 850e775 into DMTF:main Jan 8, 2025
5 checks passed
@jyao1 jyao1 deleted the cap branch January 9, 2025 08:00
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.

Update Test 2.4
2 participants