diff options
| author | Star Zeng <star.zeng@intel.com> | 2016-06-15 13:38:56 +0800 |
|---|---|---|
| committer | Star Zeng <star.zeng@intel.com> | 2016-06-21 12:46:25 +0800 |
| commit | b7c7179338ace62c76e39f1270cfce0fc57ae73f (patch) | |
| tree | af4f74245ff43590db9900ee10ac3cefc78cc833 /SecurityPkg | |
| parent | 23cfa2b9f0d08d744ec66b05140129464bf12ef9 (diff) | |
| download | edk2-b7c7179338ace62c76e39f1270cfce0fc57ae73f.tar.gz edk2-b7c7179338ace62c76e39f1270cfce0fc57ae73f.tar.bz2 edk2-b7c7179338ace62c76e39f1270cfce0fc57ae73f.zip | |
SecurityPkg: Replace UnicodeStrToAsciiStr/AsciiStrToUnicodeStr
It is the follow up of 3ab41b7a325ca11a12b42f5ad1661c4b6791cb49
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>
Diffstat (limited to 'SecurityPkg')
| -rw-r--r-- | SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalDriver.c | 4 | ||||
| -rw-r--r-- | SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHii.c | 6 | ||||
| -rw-r--r-- | SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHiiPrivate.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalDriver.c b/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalDriver.c index 3764b24344..9bf1ced3cc 100644 --- a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalDriver.c +++ b/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalDriver.c @@ -239,7 +239,7 @@ OpalDriverPopUpHddPassword ( return NULL;
}
- UnicodeStrToAsciiStr(Unicode, Ascii);
+ UnicodeStrToAsciiStrS (Unicode, Ascii, MAX_PASSWORD_SIZE + 1);
return Ascii;
}
@@ -616,7 +616,7 @@ OpalDriverGetDeviceNameByProtocol( ASSERT (Dev->Name16 != NULL);
StrCpyS (Dev->Name16, StrLength, DevName);
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
diff --git a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHii.c b/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHii.c index 7a4b872048..9a44c5697e 100644 --- a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHii.c +++ b/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHii.c @@ -600,7 +600,7 @@ HiiPsidRevert( OpalHiiGetBrowserData();
- UnicodeStrToAsciiStr(gHiiConfiguration.Psid, (CHAR8*)Psid.Psid);
+ UnicodeStrToAsciiStrS (gHiiConfiguration.Psid, (CHAR8*)Psid.Psid, PSID_CHARACTER_LENGTH);
OpalDisk = HiiGetOpalDiskCB (gHiiConfiguration.SelectedDiskIndex);
if (OpalDisk != NULL) {
@@ -1049,7 +1049,7 @@ HiiPasswordEntered( return EFI_BUFFER_TOO_SMALL;
}
- UnicodeStrToAsciiStr(UniStr, Password);
+ UnicodeStrToAsciiStrS (UniStr, Password, sizeof (Password));
gBS->FreePool(UniStr);
if (gHiiConfiguration.SelectedAction == HII_KEY_ID_GOTO_UNLOCK) {
@@ -1288,7 +1288,7 @@ HiiSetFormString( //
// Copy into unicode string, then copy into string id
//
- AsciiStrToUnicodeStr( SrcAsciiStr, UniStr );
+ AsciiStrToUnicodeStrS ( SrcAsciiStr, UniStr, Len + 1);
//
// Update the string in the form
diff --git a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHiiPrivate.h b/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHiiPrivate.h index 366cd3813e..bb086bd35f 100644 --- a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHiiPrivate.h +++ b/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHiiPrivate.h @@ -53,7 +53,7 @@ typedef struct { * The type indicates the structure of the PSID authority
*/
typedef struct {
- UINT8 Psid[32];
+ UINT8 Psid[PSID_CHARACTER_LENGTH];
} TCG_PSID;
/**
|