tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SecurityPkg: Replace UnicodeStrToAsciiStr/AsciiStrToUnicodeStr 

It is the follow up of 3ab41b7a32
to replace UnicodeStrToAsciiStr/AsciiStrToUnicodeStr with
UnicodeStrToAsciiStrS/AsciiStrToUnicodeStrS.

Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Chao Zhang <chao.b.zhang@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Chao Zhang <chao.b.zhang@intel.com>
This commit is contained in:
Star Zeng 2016-06-15 13:38:56 +08:00
parent 23cfa2b9f0
commit b7c7179338
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalDriver.c
View File

@ -239,7 +239,7 @@ OpalDriverPopUpHddPassword (
return NULL; return NULL;
} }
UnicodeStrToAsciiStr(Unicode, Ascii); UnicodeStrToAsciiStrS (Unicode, Ascii, MAX_PASSWORD_SIZE + 1);
return Ascii; return Ascii;
} }
@ -616,7 +616,7 @@ OpalDriverGetDeviceNameByProtocol(
ASSERT (Dev->Name16 != NULL); ASSERT (Dev->Name16 != NULL);
StrCpyS (Dev->Name16, StrLength, DevName); StrCpyS (Dev->Name16, StrLength, DevName);
Dev->NameZ = (CHAR8*)AllocateZeroPool(StrLength); Dev->NameZ = (CHAR8*)AllocateZeroPool(StrLength);
UnicodeStrToAsciiStr(DevName, Dev->NameZ); UnicodeStrToAsciiStrS (DevName, Dev->NameZ, StrLength);
// //
// Retrieve bridge BDF info and port number or namespace depending on type // Retrieve bridge BDF info and port number or namespace depending on type

6
SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHii.c
View File

@ -600,7 +600,7 @@ HiiPsidRevert(
OpalHiiGetBrowserData(); OpalHiiGetBrowserData();
UnicodeStrToAsciiStr(gHiiConfiguration.Psid, (CHAR8*)Psid.Psid); UnicodeStrToAsciiStrS (gHiiConfiguration.Psid, (CHAR8*)Psid.Psid, PSID_CHARACTER_LENGTH);
OpalDisk = HiiGetOpalDiskCB (gHiiConfiguration.SelectedDiskIndex); OpalDisk = HiiGetOpalDiskCB (gHiiConfiguration.SelectedDiskIndex);
if (OpalDisk != NULL) { if (OpalDisk != NULL) {
@ -1049,7 +1049,7 @@ HiiPasswordEntered(
return EFI_BUFFER_TOO_SMALL; return EFI_BUFFER_TOO_SMALL;
} }
UnicodeStrToAsciiStr(UniStr, Password); UnicodeStrToAsciiStrS (UniStr, Password, sizeof (Password));
gBS->FreePool(UniStr); gBS->FreePool(UniStr);
if (gHiiConfiguration.SelectedAction == HII_KEY_ID_GOTO_UNLOCK) { if (gHiiConfiguration.SelectedAction == HII_KEY_ID_GOTO_UNLOCK) {
@ -1288,7 +1288,7 @@ HiiSetFormString(
// //
// Copy into unicode string, then copy into string id // Copy into unicode string, then copy into string id
// //
AsciiStrToUnicodeStr( SrcAsciiStr, UniStr ); AsciiStrToUnicodeStrS ( SrcAsciiStr, UniStr, Len + 1);
// //
// Update the string in the form // Update the string in the form

2
SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHiiPrivate.h
View File

@ -53,7 +53,7 @@ typedef struct {
* The type indicates the structure of the PSID authority * The type indicates the structure of the PSID authority
*/ */
typedef struct { typedef struct {
UINT8 Psid[32]; UINT8 Psid[PSID_CHARACTER_LENGTH];
} TCG_PSID; } TCG_PSID;
/** /**