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

Update Test 2.4 #142

Merged
merged 2 commits into from
Jan 8, 2025
Merged

Update Test 2.4 #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de4a8fb
Add comment for test 2.4 on why test cap is valid.
jyao1 Jan 7, 2025
65248a4
Align test 2.4 from doc to code.
jyao1 Jan 7, 2025
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
6 changes: 3 additions & 3 deletions doc/2.Capabilities.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 and MAC_CAP are clear, when KEY_EX_CAP or PSK_CAP is set.)
2. SpdmMessage <- Responder

Assertion 2.4.1:
Expand All @@ -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 and PSK_CAP are clear, when ENCRYPT_CAP or MAC_CAP is set.)
4. SpdmMessage <- Responder

Assertion 2.4.*.

5. Requester -> GET_CAPABILITIES {SPDMVersion=NegotiatedVersion, Flags=CERT_CAP|CHAL_CAP|ENCRYPT_CAP|MAC_CAP|MUT_AUTH_CAP|KEY_EX_CAP|PSK_CAP=1|HBEAT_CAP|KEY_UPD_CAP} -- if NegotiatedVersion=1.1 only
5. Requester -> GET_CAPABILITIES {SPDMVersion=NegotiatedVersion, Flags=CERT_CAP|CHAL_CAP|ENCRYPT_CAP|MAC_CAP|MUT_AUTH_CAP|KEY_EX_CAP|PSK_CAP=1|HBEAT_CAP|KEY_UPD_CAP} -- if NegotiatedVersion=1.1 only (It is invalid because ENCAP_CAP is clear, when MUT_AUTH_CAP is set.)
6. SpdmMessage <- Responder

Assertion 2.4.*.
Expand Down
7 changes: 5 additions & 2 deletions library/spdm_responder_conformance_test_lib/spdm_responder_test_2_capabilities.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* Copyright Notice:
* Copyright 2021 DMTF. All rights reserved.
* Copyright 2021-2025 DMTF. All rights reserved.
* License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/spdm-emu/blob/main/LICENSE.md
**/

Expand Down Expand Up @@ -576,6 +576,7 @@ void spdm_test_case_capabilities_invalid_request (void *test_context)
* SPDM_GET_CAPABILITIES_REQUEST_FLAGS_MAC_CAP |*/
SPDM_GET_CAPABILITIES_REQUEST_FLAGS_MUT_AUTH_CAP |
SPDM_GET_CAPABILITIES_REQUEST_FLAGS_KEY_EX_CAP |
SPDM_GET_CAPABILITIES_REQUEST_FLAGS_PSK_CAP_REQUESTER |
SPDM_GET_CAPABILITIES_REQUEST_FLAGS_ENCAP_CAP |
SPDM_GET_CAPABILITIES_REQUEST_FLAGS_HBEAT_CAP |
SPDM_GET_CAPABILITIES_REQUEST_FLAGS_KEY_UPD_CAP,
Expand All @@ -584,7 +585,8 @@ void spdm_test_case_capabilities_invalid_request (void *test_context)
SPDM_GET_CAPABILITIES_REQUEST_FLAGS_ENCRYPT_CAP |
SPDM_GET_CAPABILITIES_REQUEST_FLAGS_MAC_CAP |
SPDM_GET_CAPABILITIES_REQUEST_FLAGS_MUT_AUTH_CAP |
/* SPDM_GET_CAPABILITIES_REQUEST_FLAGS_KEY_EX_CAP | */
/* SPDM_GET_CAPABILITIES_REQUEST_FLAGS_KEY_EX_CAP |
* SPDM_GET_CAPABILITIES_REQUEST_FLAGS_PSK_CAP_REQUESTER | */
SPDM_GET_CAPABILITIES_REQUEST_FLAGS_ENCAP_CAP |
SPDM_GET_CAPABILITIES_REQUEST_FLAGS_HBEAT_CAP |
SPDM_GET_CAPABILITIES_REQUEST_FLAGS_KEY_UPD_CAP,
Expand All @@ -594,6 +596,7 @@ void spdm_test_case_capabilities_invalid_request (void *test_context)
SPDM_GET_CAPABILITIES_REQUEST_FLAGS_MAC_CAP |
SPDM_GET_CAPABILITIES_REQUEST_FLAGS_MUT_AUTH_CAP |
SPDM_GET_CAPABILITIES_REQUEST_FLAGS_KEY_EX_CAP |
SPDM_GET_CAPABILITIES_REQUEST_FLAGS_PSK_CAP_REQUESTER |
/* SPDM_GET_CAPABILITIES_REQUEST_FLAGS_ENCAP_CAP | */
SPDM_GET_CAPABILITIES_REQUEST_FLAGS_HBEAT_CAP |
SPDM_GET_CAPABILITIES_REQUEST_FLAGS_KEY_UPD_CAP,
Expand Down
Loading