diff --git a/DeviceSecurityTestPkg/DeviceSecurityTestPkg.dec b/DeviceSecurityTestPkg/DeviceSecurityTestPkg.dec index c15dd801cd5..9472a5b1c0f 100644 --- a/DeviceSecurityTestPkg/DeviceSecurityTestPkg.dec +++ b/DeviceSecurityTestPkg/DeviceSecurityTestPkg.dec @@ -30,9 +30,6 @@ [Guids] gEfiDeviceSecurityPkgTokenSpaceGuid = { 0x506945e8, 0x7603, 0x49ee, { 0xbf, 0x36, 0x6c, 0x28, 0x74, 0xca, 0x26, 0xdc }} - ## Include/Guid/DeviceSecurity.h - gEdkiiDeviceSignatureDatabaseGuid = {0xb9c2b4f4, 0xbf5f, 0x462d, {0x8a, 0xdf, 0xc5, 0xc7, 0xa, 0xc3, 0x5d, 0xad}} - gEfiDeviceSecurityPkgTestConfig = { 0x6761aa6c, 0x41bf, 0x4a38, { 0x84, 0x93, 0x26, 0x6b, 0x11, 0x98, 0x44, 0xfc }} gEfiDeviceSecuritySpdmUidGuid = {0xe37b5665, 0x5ef9, 0x4e7e, {0xb4, 0x91, 0xd6, 0x78, 0xab, 0xff, 0xfb, 0xcb }} diff --git a/DeviceSecurityTestPkg/SpdmDeviceSecurityDxe/SpdmDeviceSecurityDxe.inf b/DeviceSecurityTestPkg/SpdmDeviceSecurityDxe/SpdmDeviceSecurityDxe.inf index dcc685783ea..07a9abfd7b8 100644 --- a/DeviceSecurityTestPkg/SpdmDeviceSecurityDxe/SpdmDeviceSecurityDxe.inf +++ b/DeviceSecurityTestPkg/SpdmDeviceSecurityDxe/SpdmDeviceSecurityDxe.inf @@ -49,7 +49,7 @@ CryptlibWrapper [Guids] - gEdkiiDeviceSignatureDatabaseGuid ## CONSUMES + gEfiDeviceSignatureDatabaseGuid ## CONSUMES gEfiDeviceSecurityPkgTestConfig ## CONSUMES [Protocols] diff --git a/DeviceSecurityTestPkg/SpdmDeviceSecurityPei/SpdmDeviceSecurityPei.inf b/DeviceSecurityTestPkg/SpdmDeviceSecurityPei/SpdmDeviceSecurityPei.inf index 5dd8d1c2e32..bbe09b773e2 100644 --- a/DeviceSecurityTestPkg/SpdmDeviceSecurityPei/SpdmDeviceSecurityPei.inf +++ b/DeviceSecurityTestPkg/SpdmDeviceSecurityPei/SpdmDeviceSecurityPei.inf @@ -53,7 +53,7 @@ gEfiPeiReadOnlyVariable2PpiGuid ## CONSUMES [Guids] - gEdkiiDeviceSignatureDatabaseGuid ## CONSUMES + gEfiDeviceSignatureDatabaseGuid ## CONSUMES gEdkiiCertSpdmCertChainGuid ## CONSUMES [Protocols] diff --git a/DeviceSecurityTestPkg/Test/DeployCert/DeployCert.c b/DeviceSecurityTestPkg/Test/DeployCert/DeployCert.c index 59fbaa7732a..c2fd9c655e7 100644 --- a/DeviceSecurityTestPkg/Test/DeployCert/DeployCert.c +++ b/DeviceSecurityTestPkg/Test/DeployCert/DeployCert.c @@ -541,8 +541,8 @@ MainEntryPoint ( ); } Status = gRT->SetVariable ( - EDKII_DEVICE_SECURITY_DATABASE, - &gEdkiiDeviceSignatureDatabaseGuid, + EFI_DEVICE_SECURITY_DATABASE, + &gEfiDeviceSignatureDatabaseGuid, EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS, @@ -631,8 +631,8 @@ MainEntryPoint ( MeasureVariable ( PCR_INDEX_FOR_SIGNATURE_DB, EV_EFI_SPDM_DEVICE_POLICY, - EDKII_DEVICE_SECURITY_DATABASE, - &gEdkiiDeviceSignatureDatabaseGuid, + EFI_DEVICE_SECURITY_DATABASE, + &gEfiDeviceSignatureDatabaseGuid, SignatureList, SignatureListSize ); @@ -641,7 +641,7 @@ MainEntryPoint ( Status = gRT->SetVariable ( L"PrivDevKey", - &gEdkiiDeviceSignatureDatabaseGuid, + &gEfiDeviceSignatureDatabaseGuid, EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS, diff --git a/DeviceSecurityTestPkg/Test/DeployCert/DeployCert.inf b/DeviceSecurityTestPkg/Test/DeployCert/DeployCert.inf index 05891ea64ee..acc96b1fc25 100644 --- a/DeviceSecurityTestPkg/Test/DeployCert/DeployCert.inf +++ b/DeviceSecurityTestPkg/Test/DeployCert/DeployCert.inf @@ -44,7 +44,7 @@ ShellLib [Guids] - gEdkiiDeviceSignatureDatabaseGuid ## PRODUCE + gEfiDeviceSignatureDatabaseGuid ## PRODUCE gEfiCertX509Guid gEfiDeviceSecurityPkgTestConfig ## PRODUCE gEfiCertSha256Guid diff --git a/DeviceSecurityTestPkg/Test/PciIoPciDoeStub/PciIoPciDoeStub.inf b/DeviceSecurityTestPkg/Test/PciIoPciDoeStub/PciIoPciDoeStub.inf index 68e7638757d..273edc7f4bb 100644 --- a/DeviceSecurityTestPkg/Test/PciIoPciDoeStub/PciIoPciDoeStub.inf +++ b/DeviceSecurityTestPkg/Test/PciIoPciDoeStub/PciIoPciDoeStub.inf @@ -44,7 +44,7 @@ CryptlibWrapper [Guids] - gEdkiiDeviceSignatureDatabaseGuid ## CONSUMES + gEfiDeviceSignatureDatabaseGuid ## CONSUMES [Protocols] gEdkiiDeviceIdentifierTypePciGuid ## PRODUCES diff --git a/DeviceSecurityTestPkg/Test/SpdmDeviceSecretLibTestStub/SpdmDeviceSecretLibTestStub.c b/DeviceSecurityTestPkg/Test/SpdmDeviceSecretLibTestStub/SpdmDeviceSecretLibTestStub.c index 1b19573d8a0..e408372fc96 100644 --- a/DeviceSecurityTestPkg/Test/SpdmDeviceSecretLibTestStub/SpdmDeviceSecretLibTestStub.c +++ b/DeviceSecurityTestPkg/Test/SpdmDeviceSecretLibTestStub/SpdmDeviceSecretLibTestStub.c @@ -776,7 +776,7 @@ SpdmResponderDataSignFunc ( Status = GetVariable2 ( L"PrivDevKey", - &gEdkiiDeviceSignatureDatabaseGuid, + &gEfiDeviceSignatureDatabaseGuid, &PrivatePem, &PrivatePemSize ); diff --git a/DeviceSecurityTestPkg/Test/SpdmStub/SpdmStub.inf b/DeviceSecurityTestPkg/Test/SpdmStub/SpdmStub.inf index ead8aee40c7..3d1cb0b8824 100644 --- a/DeviceSecurityTestPkg/Test/SpdmStub/SpdmStub.inf +++ b/DeviceSecurityTestPkg/Test/SpdmStub/SpdmStub.inf @@ -45,7 +45,7 @@ CryptlibWrapper [Guids] - gEdkiiDeviceSignatureDatabaseGuid ## CONSUMES + gEfiDeviceSignatureDatabaseGuid ## CONSUMES gEfiDeviceSecurityPkgTestConfig ## CONSUMES [Protocols] diff --git a/DeviceSecurityTestPkg/Test/Tcg2DumpLog/Tcg2DumpLog.c b/DeviceSecurityTestPkg/Test/Tcg2DumpLog/Tcg2DumpLog.c index de40aaa6860..91aecdb5ba8 100644 --- a/DeviceSecurityTestPkg/Test/Tcg2DumpLog/Tcg2DumpLog.c +++ b/DeviceSecurityTestPkg/Test/Tcg2DumpLog/Tcg2DumpLog.c @@ -711,7 +711,7 @@ typedef struct { VARIABLE_TYPE mSecureBootDatabaseVariableType[] = { { EFI_IMAGE_SECURITY_DATABASE, &gEfiImageSecurityDatabaseGuid }, { EFI_IMAGE_SECURITY_DATABASE1, &gEfiImageSecurityDatabaseGuid }, - { EDKII_DEVICE_SECURITY_DATABASE, &gEdkiiDeviceSignatureDatabaseGuid }, + { EFI_DEVICE_SECURITY_DATABASE, &gEfiDeviceSignatureDatabaseGuid }, }; BOOLEAN diff --git a/DeviceSecurityTestPkg/Test/Tcg2DumpLog/Tcg2DumpLog.inf b/DeviceSecurityTestPkg/Test/Tcg2DumpLog/Tcg2DumpLog.inf index cebdf5d15a2..cafb0c03464 100644 --- a/DeviceSecurityTestPkg/Test/Tcg2DumpLog/Tcg2DumpLog.inf +++ b/DeviceSecurityTestPkg/Test/Tcg2DumpLog/Tcg2DumpLog.inf @@ -52,7 +52,7 @@ [Guids] gEfiAcpiTableGuid gEfiImageSecurityDatabaseGuid - gEdkiiDeviceSignatureDatabaseGuid + gEfiDeviceSignatureDatabaseGuid [Protocols] gEfiTcg2ProtocolGuid ## CONSUMES diff --git a/DeviceSecurityTestPkg/TestPei/SpdmDeviceSecretLibTestStubPei/SpdmDeviceSecretLibTestStubPei.c b/DeviceSecurityTestPkg/TestPei/SpdmDeviceSecretLibTestStubPei/SpdmDeviceSecretLibTestStubPei.c index b1948b662e1..2872c11fcd4 100644 --- a/DeviceSecurityTestPkg/TestPei/SpdmDeviceSecretLibTestStubPei/SpdmDeviceSecretLibTestStubPei.c +++ b/DeviceSecurityTestPkg/TestPei/SpdmDeviceSecretLibTestStubPei/SpdmDeviceSecretLibTestStubPei.c @@ -162,7 +162,7 @@ SpdmResponderDataSignFunc ( Status = VariablePpi->GetVariable ( VariablePpi, L"PrivDevKey", - &gEdkiiDeviceSignatureDatabaseGuid, + &gEfiDeviceSignatureDatabaseGuid, NULL, &PrivatePemSize, (VOID *)PrivatePem diff --git a/DeviceSecurityTestPkg/TestPei/SpdmStubPei/SpdmStubPei.c b/DeviceSecurityTestPkg/TestPei/SpdmStubPei/SpdmStubPei.c index 0326cd21d8b..7aefa184dc7 100644 --- a/DeviceSecurityTestPkg/TestPei/SpdmStubPei/SpdmStubPei.c +++ b/DeviceSecurityTestPkg/TestPei/SpdmStubPei/SpdmStubPei.c @@ -126,8 +126,8 @@ MainEntryPoint ( SignatureList = AllocateZeroPool (SignatureListSize); Status = VariablePpi->GetVariable ( VariablePpi, - EDKII_DEVICE_SECURITY_DATABASE, - &gEdkiiDeviceSignatureDatabaseGuid, + EFI_DEVICE_SECURITY_DATABASE, + &gEfiDeviceSignatureDatabaseGuid, NULL, &SignatureListSize, SignatureList diff --git a/DeviceSecurityTestPkg/TestPei/SpdmStubPei/SpdmStubPei.inf b/DeviceSecurityTestPkg/TestPei/SpdmStubPei/SpdmStubPei.inf index 0978e1634be..b9000af210f 100644 --- a/DeviceSecurityTestPkg/TestPei/SpdmStubPei/SpdmStubPei.inf +++ b/DeviceSecurityTestPkg/TestPei/SpdmStubPei/SpdmStubPei.inf @@ -40,7 +40,7 @@ SpdmTransportMctpLib [Guids] - gEdkiiDeviceSignatureDatabaseGuid ## CONSUMES + gEfiDeviceSignatureDatabaseGuid ## CONSUMES gEdkiiCertSpdmCertChainGuid ## CONSUMES [Ppis] diff --git a/DeviceSecurityTestPkg/TestPei/TestSpdmPei/TestSpdmPei.c b/DeviceSecurityTestPkg/TestPei/TestSpdmPei/TestSpdmPei.c index d00394f5047..35aeb541a65 100644 --- a/DeviceSecurityTestPkg/TestPei/TestSpdmPei/TestSpdmPei.c +++ b/DeviceSecurityTestPkg/TestPei/TestSpdmPei/TestSpdmPei.c @@ -283,8 +283,8 @@ TestSpdm ( SignatureList = AllocateZeroPool (SignatureListSize); Status = VariablePpi->GetVariable ( VariablePpi, - EDKII_DEVICE_SECURITY_DATABASE, - &gEdkiiDeviceSignatureDatabaseGuid, + EFI_DEVICE_SECURITY_DATABASE, + &gEfiDeviceSignatureDatabaseGuid, NULL, &SignatureListSize, SignatureList diff --git a/DeviceSecurityTestPkg/TestPei/TestSpdmPei/TestSpdmPei.inf b/DeviceSecurityTestPkg/TestPei/TestSpdmPei/TestSpdmPei.inf index d9d02aa210c..83536178ff6 100644 --- a/DeviceSecurityTestPkg/TestPei/TestSpdmPei/TestSpdmPei.inf +++ b/DeviceSecurityTestPkg/TestPei/TestSpdmPei/TestSpdmPei.inf @@ -33,7 +33,7 @@ DebugLib [Guids] - gEdkiiDeviceSignatureDatabaseGuid ## CONSUMES + gEfiDeviceSignatureDatabaseGuid ## CONSUMES [Ppis] gSpdmPpiGuid ## CONSUME diff --git a/SecurityPkg/DeviceSecurity/SpdmSecurityLib/SpdmAuthentication.c b/SecurityPkg/DeviceSecurity/SpdmSecurityLib/SpdmAuthentication.c index 6b3bf4bdfce..b921f9d9e2d 100644 --- a/SecurityPkg/DeviceSecurity/SpdmSecurityLib/SpdmAuthentication.c +++ b/SecurityPkg/DeviceSecurity/SpdmSecurityLib/SpdmAuthentication.c @@ -382,8 +382,8 @@ ExtendCertificate ( MeasureVariable ( PCR_INDEX_FOR_SIGNATURE_DB, EV_EFI_SPDM_DEVICE_AUTHORITY, - EDKII_DEVICE_SECURITY_DATABASE, - &gEdkiiDeviceSignatureDatabaseGuid, + EFI_DEVICE_SECURITY_DATABASE, + &gEfiDeviceSignatureDatabaseGuid, SignatureData, SignatureDataSize ); diff --git a/SecurityPkg/DeviceSecurity/SpdmSecurityLib/SpdmConnectionInit.c b/SecurityPkg/DeviceSecurity/SpdmSecurityLib/SpdmConnectionInit.c index d2f1dc84eb3..34eada8cc63 100644 --- a/SecurityPkg/DeviceSecurity/SpdmSecurityLib/SpdmConnectionInit.c +++ b/SecurityPkg/DeviceSecurity/SpdmSecurityLib/SpdmConnectionInit.c @@ -306,8 +306,8 @@ CreateSpdmDeviceContext ( RecordSpdmDeviceContextInList (SpdmDeviceContext); Status = GetVariable2 ( - EDKII_DEVICE_SECURITY_DATABASE, - &gEdkiiDeviceSignatureDatabaseGuid, + EFI_DEVICE_SECURITY_DATABASE, + &gEfiDeviceSignatureDatabaseGuid, (VOID **)&SpdmDeviceContext->SignatureList, &SpdmDeviceContext->SignatureListSize ); diff --git a/SecurityPkg/DeviceSecurity/SpdmSecurityLib/SpdmSecurityLib.inf b/SecurityPkg/DeviceSecurity/SpdmSecurityLib/SpdmSecurityLib.inf index 000f9382184..ade582fac0b 100644 --- a/SecurityPkg/DeviceSecurity/SpdmSecurityLib/SpdmSecurityLib.inf +++ b/SecurityPkg/DeviceSecurity/SpdmSecurityLib/SpdmSecurityLib.inf @@ -45,7 +45,7 @@ SpdmCommonLib [Guids] - gEdkiiDeviceSignatureDatabaseGuid ## CONSUMES + gEfiDeviceSignatureDatabaseGuid ## CONSUMES gEfiCertX509Guid ## CONSUMES gEfiDeviceSecuritySpdmUidGuid ## PRODUCES AND CONSUMES