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

OvmfPkg/EnrollDefaultKeys: clean up Base64Decode() retval handling 

Since commit 35e242b698 ("MdePkg/BaseLib: rewrite Base64Decode()",
2019-07-16), Base64Decode() guarantees that DestinationSize is larger on
output than it was on input if RETURN_BUFFER_TOO_SMALL is returned. Clean
up the retval handling for the first Base64Decode() call in
EnrollDefaultKeys, which used to work around the ambiguity in the previous
Base64Decode() interface contract.

Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1981
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
This commit is contained in:
Laszlo Ersek 2019-07-02 02:03:15 +02:00
parent ae9f12058d
commit 59b754c9f6
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c
View File

@ -154,14 +154,8 @@ GetPkKek1 (
Status = Base64Decode (Base64Cert, Base64CertLen, NULL, &DecodedCertSize); Status = Base64Decode (Base64Cert, Base64CertLen, NULL, &DecodedCertSize);
switch (Status) { switch (Status) {
case EFI_BUFFER_TOO_SMALL: case EFI_BUFFER_TOO_SMALL:
if (DecodedCertSize > 0) { ASSERT (DecodedCertSize > 0);
break; break;
}
//
// Fall through: the above Base64Decode() call is ill-specified in BaseLib
// if Source decodes to zero bytes (for example if it consists of ignored
// whitespace only).
//
case EFI_SUCCESS: case EFI_SUCCESS:
AsciiPrint ("error: empty certificate after app prefix %g\n", AsciiPrint ("error: empty certificate after app prefix %g\n",
&gOvmfPkKek1AppPrefixGuid); &gOvmfPkKek1AppPrefixGuid);