Proxmox-Port/edk2
1
0
Fork 0
mirror of https://github.com/tianocore/edk2.git synced 2025-09-16 16:43:03 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

SPDM related fix based on real hardware testing - SecurityPkg

Browse Source 
Implemented SPDM functionality on real hardware, and here is the bug fix in SecurityPkg.

Signed-off-by: Liqi Qi <liqiqi@microsoft.com>
This commit is contained in:
Liqi Qi 2025-05-15 13:20:09 -07:00 committed by mergify[bot]
parent 3260988830
commit 0321f030ea
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SecurityPkg/DeviceSecurity/SpdmSecurityLib/SpdmAuthentication.c
View File

@ -565,7 +565,9 @@ DoDeviceCertificate (
ZeroMem (CertChain, sizeof (CertChain)); ZeroMem (CertChain, sizeof (CertChain));
SpdmReturn = SpdmGetCertificateEx (SpdmContext, NULL, SlotId, &CertChainSize, CertChain, (CONST VOID **)&TrustAnchor, &TrustAnchorSize); SpdmReturn = SpdmGetCertificateEx (SpdmContext, NULL, SlotId, &CertChainSize, CertChain, (CONST VOID **)&TrustAnchor, &TrustAnchorSize);
if (LIBSPDM_STATUS_IS_SUCCESS (SpdmReturn)) { if (LIBSPDM_STATUS_IS_SUCCESS (SpdmReturn)) {
*IsValidCertChain = TRUE; SecurityState->AuthenticationState = EDKII_DEVICE_SECURITY_STATE_SUCCESS;
*AuthState = TCG_DEVICE_SECURITY_EVENT_DATA_DEVICE_AUTH_STATE_SUCCESS;
*IsValidCertChain = TRUE;
break; break;
} else if (SpdmReturn == LIBSPDM_STATUS_VERIF_FAIL) { } else if (SpdmReturn == LIBSPDM_STATUS_VERIF_FAIL) {
*IsValidCertChain = FALSE; *IsValidCertChain = FALSE;

8
SecurityPkg/DeviceSecurity/SpdmSecurityLib/SpdmConnectionInit.c
View File

@ -418,6 +418,14 @@ CreateSpdmDeviceContext (
goto Error; goto Error;
} }
Data8 = SPDM_ALGORITHMS_OPAQUE_DATA_FORMAT_1;
SpdmSetData (SpdmContext, SpdmDataOtherParamsSupport, &Parameter, &Data8, sizeof (Data8));
if (LIBSPDM_STATUS_IS_ERROR (SpdmReturn)) {
DEBUG ((DEBUG_ERROR, "SpdmSetDataOtherParamsSupport - %p\n", SpdmReturn));
ASSERT (FALSE);
goto Error;
}
SpdmReturn = SpdmInitConnection (SpdmContext, FALSE); SpdmReturn = SpdmInitConnection (SpdmContext, FALSE);
if (LIBSPDM_STATUS_IS_ERROR (SpdmReturn)) { if (LIBSPDM_STATUS_IS_ERROR (SpdmReturn)) {
DEBUG ((DEBUG_ERROR, "SpdmInitConnection - %p\n", SpdmReturn)); DEBUG ((DEBUG_ERROR, "SpdmInitConnection - %p\n", SpdmReturn));

2
SecurityPkg/SecurityPkg.dec
View File

@ -22,8 +22,6 @@
[Includes] [Includes]
Include Include
Test/Mock/Include Test/Mock/Include
[Includes.Common.Private]
DeviceSecurity/SpdmLib/Include DeviceSecurity/SpdmLib/Include
DeviceSecurity/SpdmLib/libspdm/include DeviceSecurity/SpdmLib/libspdm/include