diff --git a/doc/2.Capabilities.md b/doc/2.Capabilities.md index 3be2d70..2cbb770 100644 --- a/doc/2.Capabilities.md +++ b/doc/2.Capabilities.md @@ -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: @@ -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.*. diff --git a/library/spdm_responder_conformance_test_lib/spdm_responder_test_2_capabilities.c b/library/spdm_responder_conformance_test_lib/spdm_responder_test_2_capabilities.c index 86d991b..9d88bbc 100644 --- a/library/spdm_responder_conformance_test_lib/spdm_responder_test_2_capabilities.c +++ b/library/spdm_responder_conformance_test_lib/spdm_responder_test_2_capabilities.c @@ -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 **/ @@ -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, @@ -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, @@ -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,