Update the secure boot configuration UI to accept *.der certificate file as the Platform Key.

Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
Reviewed-by: Dong Guo <guo.dong@intel.com>
Reviewed-by: Ye Ting <ting.ye@intel.com>


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13525 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
sfu5 2012-07-12 01:09:00 +00:00
parent 2c46dd239b
commit cf7409f228

View File

@ -347,11 +347,11 @@ EnrollPlatformKey (
PkCert = NULL; PkCert = NULL;
// //
// Parse the file's postfix. Only support *.cer(X509) files. // Parse the file's postfix. Only support DER encoded X.509 certificate files (*.cer or *.der).
// //
FilePostFix = Private->FileContext->FileName + StrLen (Private->FileContext->FileName) - 4; FilePostFix = Private->FileContext->FileName + StrLen (Private->FileContext->FileName) - 4;
if (CompareMem (FilePostFix, L".cer",4)) { if ((CompareMem (FilePostFix, L".cer",4) != 0) && (CompareMem (FilePostFix, L".der",4) != 0)) {
DEBUG ((EFI_D_ERROR, "Don't support the file, only *.cer is supported.")); DEBUG ((EFI_D_ERROR, "Unsupported file type, only DER encoded certificate file (*.cer or *.der) is supported."));
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
} }
DEBUG ((EFI_D_INFO, "FileName= %s\n", Private->FileContext->FileName)); DEBUG ((EFI_D_INFO, "FileName= %s\n", Private->FileContext->FileName));
@ -2513,7 +2513,7 @@ SecureBootCallback (
CreatePopUp ( CreatePopUp (
EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,
&Key, &Key,
L"ERROR: Unsupported file type, only *.cer is supported!", L"ERROR: Unsupported file type, only DER encoded certificate file (*.cer or *.der) is supported!",
NULL NULL
); );
} else { } else {