From cf7409f228f699cee24ddcf14e7e7e11c934ce3b Mon Sep 17 00:00:00 2001 From: sfu5 Date: Thu, 12 Jul 2012 01:09:00 +0000 Subject: Update the secure boot configuration UI to accept *.der certificate file as the Platform Key. Signed-off-by: Fu Siyuan Reviewed-by: Dong Guo Reviewed-by: Ye Ting git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13525 6f19259b-4bc3-4df7-8a09-765794883524 --- .../SecureBootConfigDxe/SecureBootConfigImpl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c index a680473a7d..ee78ff74b1 100644 --- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c +++ b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c @@ -347,11 +347,11 @@ EnrollPlatformKey ( 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; - if (CompareMem (FilePostFix, L".cer",4)) { - DEBUG ((EFI_D_ERROR, "Don't support the file, only *.cer is supported.")); + if ((CompareMem (FilePostFix, L".cer",4) != 0) && (CompareMem (FilePostFix, L".der",4) != 0)) { + DEBUG ((EFI_D_ERROR, "Unsupported file type, only DER encoded certificate file (*.cer or *.der) is supported.")); return EFI_INVALID_PARAMETER; } DEBUG ((EFI_D_INFO, "FileName= %s\n", Private->FileContext->FileName)); @@ -2513,7 +2513,7 @@ SecureBootCallback ( CreatePopUp ( EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &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 ); } else { -- cgit v1.2.3