NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commit16b835c

committed

Merged PR 566: Remove accessing system UUID as it is no longer in use

This change removes the call to DfciIdSupportGetUuid. This will be removed from the library header and library in a future PR.

1 parent2016aa8 commit16b835cCopy full SHA for 16b835c

File tree

2 files changed

-17

lines changed

DfciPkg
- Include/Library
  - DfciXmlDeviceIdSchemaSupportLib.h
- SettingsManager
  - SettingsManagerDxe.c

2 files changed

-17

lines changed

`‎DfciPkg/Include/Library/DfciXmlDeviceIdSchemaSupportLib.h‎`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,6 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.`
`43`	`43`	`#defineDEVICE_ID_MANUFACTURER "Manufacturer"`
`44`	`44`	`#defineDEVICE_ID_PRODUCT_NAME "Product Name"`
`45`	`45`	`#defineDEVICE_ID_SERIAL_NUMBER "Serial Number"`
`46`		`-#defineDEVICE_ID_UUID "UUID"`
`47`	`46`
`48`	`47`
`49`	`48`	`XmlNode*`

`‎DfciPkg/SettingsManager/SettingsManagerDxe.c‎`

Lines changed: 9 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF`
`28`	`28`	`ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.`
`29`	`29`
`30`	`30`	`**/`
`31`		`-`
	`31`	`+`
`32`	`32`	`#include"SettingsManager.h"`
`33`	`33`
`34`	`34`	`DFCI_SETTING_ACCESS_PROTOCOLmSystemSettingAccessProtocol= {SystemSettingAccessSet,SystemSettingAccessGet,SystemSettingsAccessReset };`
`@@ -44,8 +44,7 @@ typedef struct {`
`44`	`44`	`staticINIT_TABLE_ENTRYmInitTable[]= {`
`45`	`45`	`DEVICE_ID_MANUFACTURER,NULL,`
`46`	`46`	`DEVICE_ID_PRODUCT_NAME,NULL,`
`47`		`-DEVICE_ID_SERIAL_NUMBER,NULL,`
`48`		`-DEVICE_ID_UUID,NULL };`
	`47`	`+DEVICE_ID_SERIAL_NUMBER,NULL };`
`49`	`48`
`50`	`49`	`// Settings manager does not support "Atomic" operations at this time. That means`
`51`	`50`	`// the delayed response and LKG handler are ignored, and the settings cannot be`
`@@ -187,11 +186,6 @@ SettingsManagerOnReadyToBoot (`
`187`	`186`	`gotoNO_XML;`
`188`	`187`	`}`
`189`	`188`
`190`		`-Status=DfciIdSupportGetUuid (&mInitTable[3].Value,NULL);`
`191`		`-if (EFI_ERROR(Status)) {`
`192`		`- gotoNO_XML;`
`193`		`- }`
`194`		`-`
`195`	`189`	`Status=EFI_OUT_OF_RESOURCES;`
`196`	`190`	`List=New_DeviceIdPacketNodeList();`
`197`	`191`	`if (List==NULL) {`
`@@ -278,8 +272,8 @@ Pass thru function for using the Auth Protocol to get auth and token`
`278`	`272`
`279`	`273`	`@param[in] SignedData - Pointer to signed data`
`280`	`274`	`@param[in] SignedDataLen - Length of signed data`
`281`		`-@param[in] Signature - Pointer to WIN_CERT_UEFI_GUID that contains the signature`
`282`		`-@param[in,out] AuthToken - returned Auth Token. Caller must allocate. data only valid if success.`
	`275`	`+@param[in] Signature - Pointer to WIN_CERT_UEFI_GUID that contains the signature`
	`276`	`+@param[in,out] AuthToken - returned Auth Token. Caller must allocate. data only valid if success.`
`283`	`277`
`284`	`278`	`**/`
`285`	`279`	`EFI_STATUS`
`@@ -292,7 +286,7 @@ CheckAuthAndGetToken(`
`292`	`286`	`)`
`293`	`287`	`{`
`294`	`288`	`EFI_STATUSStatus;`
`295`		`-//get mAuthProtocol`
	`289`	`+//get mAuthProtocol`
`296`	`290`	`if (mAuthProtocol==NULL)`
`297`	`291`	`{`
`298`	`292`	`Status=gBS->LocateProtocol(`
`@@ -313,8 +307,8 @@ CheckAuthAndGetToken(`
`313`	`307`	`}`
`314`	`308`
`315`	`309`	`/**`
`316`		`-Pass thru function for using the Auth Protocol to dispose of an auth token`
`317`		`-so it can no longer be used in the system.`
	`310`	`+Pass thru function for using the Auth Protocol to dispose of an auth token`
	`311`	`+so it can no longer be used in the system.`
`318`	`312`
`319`	`313`	`@param[in] AuthToken - Pointer to auth token to dispose of`
`320`	`314`	`**/`
`@@ -330,7 +324,7 @@ AuthTokenDispose(`
`330`	`324`	`}`
`331`	`325`
`332`	`326`	`//Can't get here if mAuthProtocol is NULL`
`333`		`-if (mAuthProtocol!=NULL)`
	`327`	`+if (mAuthProtocol!=NULL)`
`334`	`328`	`{`
`335`	`329`	`returnmAuthProtocol->DisposeAuthToken(mAuthProtocol,AuthToken);`
`336`	`330`	`}`
`@@ -356,8 +350,7 @@ Init (`
`356`	`350`	`{`
`357`	`351`	`EFI_EVENTInitEvent;`
`358`	`352`	`EFI_STATUSStatus;`
`359`		`-`
`360`		`-`
	`353`	`+`
`361`	`354`	`//Install Setting Provider Support Protocol and Permission Protocol`
`362`	`355`	`Status=gBS->InstallMultipleProtocolInterfaces(`
`363`	`356`	`&ImageHandle,`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit16b835c

File tree

2 files changed

2 files changed

`‎DfciPkg/Include/Library/DfciXmlDeviceIdSchemaSupportLib.h‎`

`‎DfciPkg/SettingsManager/SettingsManagerDxe.c‎`

0 commit comments