diff options
| author | Tom Rini <trini@konsulko.com> | 2020-05-05 12:32:44 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-05-05 12:32:44 -0400 |
| commit | 9a3cc7b6d416fddfa6058b731fe5c9055dba6918 (patch) | |
| tree | d08f6b1c5c9707d03b9343ad4896ea4df749b9c6 /lib/efi_loader/efi_signature.c | |
| parent | 191ee8aac60d6b828ee5f933ab2c6aceda167082 (diff) | |
| parent | 16ad946f41d3dc3e475d8313f4acbba0df527a2a (diff) | |
Merge tag 'efi-2020-07-rc2-2' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
Pull request for UEFI sub-system for efi-2020-07-rc2-2
This patch contains error corrections and code simplifications for the UEFI
sub-system.
Diffstat (limited to 'lib/efi_loader/efi_signature.c')
| -rw-r--r-- | lib/efi_loader/efi_signature.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/efi_loader/efi_signature.c b/lib/efi_loader/efi_signature.c index 658e3547da3..adcb8c9cca6 100644 --- a/lib/efi_loader/efi_signature.c +++ b/lib/efi_loader/efi_signature.c @@ -10,11 +10,11 @@ #include <image.h> #include <hexdump.h> #include <malloc.h> +#include <crypto/pkcs7_parser.h> #include <linux/compat.h> #include <linux/oid_registry.h> #include <u-boot/rsa.h> #include <u-boot/sha256.h> -#include "../lib/crypto/pkcs7_parser.h" const efi_guid_t efi_guid_image_security_database = EFI_IMAGE_SECURITY_DATABASE_GUID; @@ -528,7 +528,7 @@ out: * pointed to by @regs. If @nocheck is false, overlapping among entries * will be checked first. * - * Return: 0 on success, status code (negative) on error + * Return: status code */ efi_status_t efi_image_region_add(struct efi_image_regions *regs, const void *start, const void *end, @@ -667,7 +667,7 @@ efi_sigstore_parse_siglist(struct efi_signature_list *esl) esd = (struct efi_signature_data *) ((u8 *)esl + sizeof(*esl) + esl->signature_header_size); - while ((left > 0) && left >= esl->signature_size) { + while (left > 0) { /* Signature must exist if there is remaining data. */ if (left < esl->signature_size) { debug("Certificate is too small\n"); |