diff options
| -rw-r--r-- | lib/Makefile | 2 | ||||
| -rw-r--r-- | lib/console.c | 27 | ||||
| -rw-r--r-- | lib/print_crypto.c | 37 |
3 files changed, 38 insertions, 28 deletions
diff --git a/lib/Makefile b/lib/Makefile index db5ff711..573c52bd 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -1,6 +1,6 @@ TARGET = lib.a -LIBFILES = simple_file.o guid.o console.o execute.o configtable.o shell.o variables.o security_policy.o +LIBFILES = $(foreach x,$(wildcard *.c),$(patsubst %.c,%.o,$(x))) EFI_INCLUDES = -I$(EFI_INCLUDE) -I$(EFI_INCLUDE)/$(ARCH) -I$(EFI_INCLUDE)/protocol -I$(TOPDIR)/../include \ -I$(TOPDIR)/CryptLib/Include/openssl/ diff --git a/lib/console.c b/lib/console.c index 00a7baad..a1d6a840 100644 --- a/lib/console.c +++ b/lib/console.c @@ -681,33 +681,6 @@ setup_verbosity(VOID) setup_console(-1); } -/* Included here because they mess up the definition of va_list and friends */ -#include <Library/BaseCryptLib.h> -#include <openssl/err.h> -#include <openssl/crypto.h> - -static int -print_errors_cb(const char *str, size_t len, void *u) -{ - console_print(L"%a", str); - - return len; -} - -EFI_STATUS -print_crypto_errors(EFI_STATUS efi_status, - char *file, const char *func, int line) -{ - if (!(verbose && EFI_ERROR(efi_status))) - return efi_status; - - console_print(L"SSL Error: %a:%d %a(): %r\n", file, line, func, - efi_status); - ERR_print_errors_cb(print_errors_cb, NULL); - - return efi_status; -} - VOID msleep(unsigned long msecs) { diff --git a/lib/print_crypto.c b/lib/print_crypto.c new file mode 100644 index 00000000..1bab0a6c --- /dev/null +++ b/lib/print_crypto.c @@ -0,0 +1,37 @@ +// SPDX-License-Identifier: BSD-2-Clause-Patent +/* + * Copyright 2019 SUSE LLC <glin@suse.com> + */ + +#include <efi.h> +#include <efilib.h> +#include <stdarg.h> + +#include "shim.h" + +#include <Library/BaseCryptLib.h> +#include <openssl/err.h> +#include <openssl/crypto.h> +#include <console.h> + +static int +print_errors_cb(const char *str, size_t len, void *u) +{ + console_print(L"%a", str); + + return len; +} + +EFI_STATUS +print_crypto_errors(EFI_STATUS efi_status, + char *file, const char *func, int line) +{ + if (!(verbose && EFI_ERROR(efi_status))) + return efi_status; + + console_print(L"SSL Error: %a:%d %a(): %r\n", file, line, func, + efi_status); + ERR_print_errors_cb(print_errors_cb, NULL); + + return efi_status; +} |