leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tools: kwbimage: Do not hide usage of secure header under CONFIG_ARMADA_38X

Browse Source 
The mkimage host tool can be used to generate kwbimage v1 image with
secure header on host system for A38x plaform also when U-Boot is being
compiled for different platform. So there is no reason to not allow
compiling of mkimage/kwbimage with secure header support for e.g. x86-64
host.

Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Chris Packham <judge.packham@gmail.com>
Reviewed-by: Stefan Roese <sr@denx.de>
Tested-by: Chris Packham <judge.packham@gmail.com>
This commit is contained in:
Pali Rohár
2021-07-23 11:14:13 +02:00
committed by Stefan Roese
parent f63c583f9d
commit b4f3cc2c42
2 changed files with 0 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/Makefile
View File

@@ -173,10 +173,6 @@ ifneq ($(CONFIG_SYS_U_BOOT_OFFS),)
HOSTCFLAGS_kwbimage.o += -DCONFIG_SYS_U_BOOT_OFFS=$(CONFIG_SYS_U_BOOT_OFFS) HOSTCFLAGS_kwbimage.o += -DCONFIG_SYS_U_BOOT_OFFS=$(CONFIG_SYS_U_BOOT_OFFS)
endif endif
ifneq ($(CONFIG_ARMADA_38X),)
HOSTCFLAGS_kwbimage.o += -DCONFIG_KWB_SECURE
endif
# MXSImage needs LibSSL # MXSImage needs LibSSL
ifneq ($(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_ARMADA_38X)$(CONFIG_TOOLS_LIBCRYPTO),) ifneq ($(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_ARMADA_38X)$(CONFIG_TOOLS_LIBCRYPTO),)
HOSTCFLAGS_kwbimage.o += \ HOSTCFLAGS_kwbimage.o += \

22
tools/kwbimage.c
View File

@@ -16,7 +16,6 @@
#include <stdint.h> #include <stdint.h>
#include "kwbimage.h" #include "kwbimage.h"
#ifdef CONFIG_KWB_SECURE
#include <openssl/bn.h> #include <openssl/bn.h>
#include <openssl/rsa.h> #include <openssl/rsa.h>
#include <openssl/pem.h> #include <openssl/pem.h>
@@ -42,13 +41,10 @@ void EVP_MD_CTX_cleanup(EVP_MD_CTX *ctx)
EVP_MD_CTX_reset(ctx); EVP_MD_CTX_reset(ctx);
} }
#endif #endif
#endif
static struct image_cfg_element *image_cfg; static struct image_cfg_element *image_cfg;
static int cfgn; static int cfgn;
#ifdef CONFIG_KWB_SECURE
static int verbose_mode; static int verbose_mode;
#endif
struct boot_mode { struct boot_mode {
unsigned int id; unsigned int id;
@@ -243,8 +239,6 @@ image_count_options(unsigned int optiontype)
return count; return count;
} }
#if defined(CONFIG_KWB_SECURE)
static int image_get_csk_index(void) static int image_get_csk_index(void)
{ {
struct image_cfg_element *e; struct image_cfg_element *e;
@@ -267,8 +261,6 @@ static bool image_get_spezialized_img(void)
return e->sec_specialized_img; return e->sec_specialized_img;
} }
#endif
/* /*
* Compute a 8-bit checksum of a memory area. This algorithm follows * Compute a 8-bit checksum of a memory area. This algorithm follows
* the requirements of the Marvell SoC BootROM specifications. * the requirements of the Marvell SoC BootROM specifications.
@@ -363,7 +355,6 @@ static uint8_t baudrate_to_option(unsigned int baudrate)
} }
} }
#if defined(CONFIG_KWB_SECURE)
static void kwb_msg(const char *fmt, ...) static void kwb_msg(const char *fmt, ...)
{ {
if (verbose_mode) { if (verbose_mode) {
@@ -852,8 +843,6 @@ done:
return ret; return ret;
} }
#endif
static void *image_create_v0(size_t *imagesz, struct image_tool_params *params, static void *image_create_v0(size_t *imagesz, struct image_tool_params *params,
int payloadsz) int payloadsz)
{ {
@@ -984,13 +973,11 @@ static size_t image_headersz_v1(int *hasext)
*hasext = 1; *hasext = 1;
} }
#if defined(CONFIG_KWB_SECURE)
if (image_get_csk_index() >= 0) { if (image_get_csk_index() >= 0) {
headersz += sizeof(struct secure_hdr_v1); headersz += sizeof(struct secure_hdr_v1);
if (hasext) if (hasext)
*hasext = 1; *hasext = 1;
} }
#endif
#if defined(CONFIG_SYS_U_BOOT_OFFS) #if defined(CONFIG_SYS_U_BOOT_OFFS)
if (headersz > CONFIG_SYS_U_BOOT_OFFS) { if (headersz > CONFIG_SYS_U_BOOT_OFFS) {
@@ -1080,8 +1067,6 @@ err_close:
return -1; return -1;
} }
#if defined(CONFIG_KWB_SECURE)
int export_pub_kak_hash(RSA *kak, struct secure_hdr_v1 *secure_hdr) int export_pub_kak_hash(RSA *kak, struct secure_hdr_v1 *secure_hdr)
{ {
FILE *hashf; FILE *hashf;
@@ -1189,7 +1174,6 @@ int add_secure_header_v1(struct image_tool_params *params, uint8_t *ptr,
return 0; return 0;
} }
#endif
static void *image_create_v1(size_t *imagesz, struct image_tool_params *params, static void *image_create_v1(size_t *imagesz, struct image_tool_params *params,
uint8_t *ptr, int payloadsz) uint8_t *ptr, int payloadsz)
@@ -1197,9 +1181,7 @@ static void *image_create_v1(size_t *imagesz, struct image_tool_params *params,
struct image_cfg_element *e; struct image_cfg_element *e;
struct main_hdr_v1 *main_hdr; struct main_hdr_v1 *main_hdr;
struct register_set_hdr_v1 *register_set_hdr; struct register_set_hdr_v1 *register_set_hdr;
#if defined(CONFIG_KWB_SECURE)
struct secure_hdr_v1 *secure_hdr = NULL; struct secure_hdr_v1 *secure_hdr = NULL;
#endif
size_t headersz; size_t headersz;
uint8_t *image, *cur; uint8_t *image, *cur;
int hasext = 0; int hasext = 0;
@@ -1275,7 +1257,6 @@ static void *image_create_v1(size_t *imagesz, struct image_tool_params *params,
if (main_hdr->blockid == IBR_HDR_PEX_ID) if (main_hdr->blockid == IBR_HDR_PEX_ID)
main_hdr->srcaddr = cpu_to_le32(0xFFFFFFFF); main_hdr->srcaddr = cpu_to_le32(0xFFFFFFFF);
#if defined(CONFIG_KWB_SECURE)
if (image_get_csk_index() >= 0) { if (image_get_csk_index() >= 0) {
/* /*
* only reserve the space here; we fill the header later since * only reserve the space here; we fill the header later since
@@ -1286,7 +1267,6 @@ static void *image_create_v1(size_t *imagesz, struct image_tool_params *params,
*next_ext = 1; *next_ext = 1;
next_ext = &secure_hdr->next; next_ext = &secure_hdr->next;
} }
#endif
datai = 0; datai = 0;
register_set_hdr = (struct register_set_hdr_v1 *)cur; register_set_hdr = (struct register_set_hdr_v1 *)cur;
@@ -1334,11 +1314,9 @@ static void *image_create_v1(size_t *imagesz, struct image_tool_params *params,
return NULL; return NULL;
} }
#if defined(CONFIG_KWB_SECURE)
if (secure_hdr && add_secure_header_v1(params, ptr, payloadsz, if (secure_hdr && add_secure_header_v1(params, ptr, payloadsz,
headersz, image, secure_hdr)) headersz, image, secure_hdr))
return NULL; return NULL;
#endif
/* Calculate and set the header checksum */ /* Calculate and set the header checksum */
main_hdr->checksum = image_checksum8(main_hdr, headersz); main_hdr->checksum = image_checksum8(main_hdr, headersz);