Hi Philippe,

On Wed, 17 Nov 2021 at 10:52, Philippe Reynes philippe.reynes@softathome.com wrote:

This commit adds the options:

• SPL_ASN1_DECODER
• SPL_OID_REGISTRY

Signed-off-by: Philippe Reynes philippe.reynes@softathome.com

lib/Kconfig | 6 ++++++ lib/Makefile | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/lib/Kconfig b/lib/Kconfig index 70bf8e7a46..ebff84f113 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -758,11 +758,17 @@ config ASN1_DECODER help Enable asn1 decoder library.

+config SPL_ASN1_DECODER

•   bool
  

Please add help.

While you are here could you fix up the help above? It is pretty useless. It should mention what ASN stands for, what the library allows and a link to some information.

config OID_REGISTRY bool help Enable fast lookup object identifier registry.

+config SPL_OID_REGISTRY

•   bool
  

help

Again that help is not very useful, please expand.

[..]

Regards, SImon

On Wed, 17 Nov 2021 at 10:52, Philippe Reynes philippe.reynes@softathome.com wrote:

This commit adds the options:

• SPL_ASYMMETRIC_KEY_TYPE
• SPL_ASYMMETRIC_PUBLIC_KEY_SUBTYPE
• SPL_RSA_PUBLIC_KEY_PARSER

Signed-off-by: Philippe Reynes philippe.reynes@softathome.com

lib/Makefile | 2 +- lib/crypto/Kconfig | 15 +++++++++++++++ lib/crypto/Makefile | 19 +++++++++++++------ 3 files changed, 29 insertions(+), 7 deletions(-)

Please add in the help.

diff --git a/lib/Makefile b/lib/Makefile index 900e684d62..df70917b49 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -17,7 +17,6 @@ obj-$(CONFIG_OF_LIVE) += of_live.o obj-$(CONFIG_CMD_DHRYSTONE) += dhry/ obj-$(CONFIG_ARCH_AT91) += at91/ obj-$(CONFIG_OPTEE_LIB) += optee/ -obj-y += crypto/

obj-$(CONFIG_AES) += aes.o obj-$(CONFIG_AES) += aes/ @@ -57,6 +56,7 @@ obj-$(CONFIG_TPM_V1) += tpm-v1.o obj-$(CONFIG_TPM_V2) += tpm-v2.o endif

+obj-y += crypto/ obj-$(CONFIG_$(SPL_)ACPIGEN) += acpi/ obj-$(CONFIG_$(SPL_)MD5) += md5.o obj-$(CONFIG_ECDSA) += ecdsa/ diff --git a/lib/crypto/Kconfig b/lib/crypto/Kconfig index 6369bafac0..9351865f2c 100644 --- a/lib/crypto/Kconfig +++ b/lib/crypto/Kconfig @@ -8,6 +8,10 @@ menuconfig ASYMMETRIC_KEY_TYPE

if ASYMMETRIC_KEY_TYPE

+config SPL_ASYMMETRIC_KEY_TYPE

•   bool "Asymmetric (public-key cryptographic) key Support within SPL"
  

•   depends on SPL
  

config ASYMMETRIC_PUBLIC_KEY_SUBTYPE bool "Asymmetric public-key crypto algorithm subtype" help @@ -16,6 +20,10 @@ config ASYMMETRIC_PUBLIC_KEY_SUBTYPE appropriate hash algorithms (such as SHA-1) must be available. ENOPKG will be reported if the requisite algorithm is unavailable.

+config SPL_ASYMMETRIC_PUBLIC_KEY_SUBTYPE

•   bool "Asymmetric public-key crypto algorithm subtype within SPL"
  

•   depends on ASYMMETRIC_PUBLIC_KEY_SUBTYPE
  

config RSA_PUBLIC_KEY_PARSER bool "RSA public key parser" depends on ASYMMETRIC_PUBLIC_KEY_SUBTYPE @@ -27,6 +35,13 @@ config RSA_PUBLIC_KEY_PARSER public key data and provides the ability to instantiate a public key.

+config SPL_RSA_PUBLIC_KEY_PARSER

•   bool "RSA public key parser within SPL"
  

•   depends on ASYMMETRIC_PUBLIC_KEY_SUBTYPE
  

•   select SPL_ASN1_DECODER
  

•   select ASN1_COMPILER
  

•   select SPL_OID_REGISTRY
  

config X509_CERTIFICATE_PARSER bool "X.509 certificate parser" depends on ASYMMETRIC_PUBLIC_KEY_SUBTYPE diff --git a/lib/crypto/Makefile b/lib/crypto/Makefile index f3a414525d..6792b1d4f0 100644 --- a/lib/crypto/Makefile +++ b/lib/crypto/Makefile @@ -3,27 +3,34 @@ # Makefile for asymmetric cryptographic keys #

-obj-$(CONFIG_ASYMMETRIC_KEY_TYPE) += asymmetric_keys.o +obj-$(CONFIG_$(SPL_)ASYMMETRIC_KEY_TYPE) += asymmetric_keys.o

asymmetric_keys-y := asymmetric_type.o

-obj-$(CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE) += public_key.o +obj-$(CONFIG_$(SPL_)ASYMMETRIC_PUBLIC_KEY_SUBTYPE) += public_key.o

# # RSA public key parser # -obj-$(CONFIG_RSA_PUBLIC_KEY_PARSER) += rsa_public_key.o +obj-$(CONFIG_$(SPL_)RSA_PUBLIC_KEY_PARSER) += rsa_public_key.o rsa_public_key-y := \ rsapubkey.asn1.o \ rsa_helper.o

$(obj)/rsapubkey.asn1.o: $(obj)/rsapubkey.asn1.c $(obj)/rsapubkey.asn1.h +ifdef CONFIG_SPL_BUILD +CFLAGS_rsapubkey.asn1.o += -I$(obj) +endif

$(obj)/rsa_helper.o: $(obj)/rsapubkey.asn1.h +ifdef CONFIG_SPL_BUILD +CFLAGS_rsa_helper.o += -I$(obj) +endif

# # X.509 Certificate handling # -obj-$(CONFIG_X509_CERTIFICATE_PARSER) += x509_key_parser.o +obj-$(CONFIG_$(SPL_)X509_CERTIFICATE_PARSER) += x509_key_parser.o x509_key_parser-y := \ x509.asn1.o \ x509_akid.asn1.o \ @@ -40,11 +47,11 @@ $(obj)/x509_akid.asn1.o: $(obj)/x509_akid.asn1.c $(obj)/x509_akid.asn1.h # # PKCS#7 message handling # -obj-$(CONFIG_PKCS7_MESSAGE_PARSER) += pkcs7_message.o +obj-$(CONFIG_$(SPL_)PKCS7_MESSAGE_PARSER) += pkcs7_message.o pkcs7_message-y := \ pkcs7.asn1.o \ pkcs7_parser.o -obj-$(CONFIG_PKCS7_VERIFY) += pkcs7_verify.o +obj-$(CONFIG_$(SPL_)PKCS7_VERIFY) += pkcs7_verify.o

$(obj)/pkcs7_parser.o: $(obj)/pkcs7.asn1.h $(obj)/pkcs7.asn1.o: $(obj)/pkcs7.asn1.c $(obj)/pkcs7.asn1.h -- 2.17.1

On Wed, 17 Nov 2021 at 10:52, Philippe Reynes philippe.reynes@softathome.com wrote:

This commit adds the option SPL_RSA_VERIFY_WITH_PKEY.

Signed-off-by: Philippe Reynes philippe.reynes@softathome.com

lib/rsa/Kconfig | 8 ++++++++ 1 file changed, 8 insertions(+)

diff --git a/lib/rsa/Kconfig b/lib/rsa/Kconfig index 469596abe7..608d51c428 100644 --- a/lib/rsa/Kconfig +++ b/lib/rsa/Kconfig @@ -46,6 +46,14 @@ config RSA_VERIFY_WITH_PKEY directly specified in image_sign_info, where all the necessary key properties will be calculated on the fly in verification code.

+config SPL_RSA_VERIFY_WITH_PKEY

•   bool "Execute RSA verification without key parameters from FDT within SPL"
  

•   depends on SPL
  

•   select SPL_RSA_VERIFY
  

•   select SPL_ASYMMETRIC_KEY_TYPE
  

•   select SPL_ASYMMETRIC_PUBLIC_KEY_SUBTYPE
  

•   select SPL_RSA_PUBLIC_KEY_PARSER
  

missing help

config RSA_SOFTWARE_EXP bool "Enable driver for RSA Modular Exponentiation in software" depends on DM -- 2.17.1

Hi Philippe,

On Wed, 17 Nov 2021 at 10:52, Philippe Reynes philippe.reynes@softathome.com wrote:

This commit adds a stage pre-load that could check or modify an image.

For the moment, only a header with a signature is supported. This header has this format:

• magic : 4 bytes
• image size : 4 bytes
• signature : n bytes
• padding : up to header size

The stage use a node /image/pre-load/sig to get some information:

• header-size (mandatory) : size of the header
• algo-name (mandatory) : name of the algo used to sign
• padding-name : name of padding used to sign
• signature-size : size of the signature (in the header)
• mandatory : set to yes if this sig is mandatory
• public-key (madatory) : value of the public key

Before running the image, the stage pre-load check the signature provided in the header.

This is an initial support, later we could add the support of:

• ciphering
• uncompressing
• ...

Signed-off-by: Philippe Reynes philippe.reynes@softathome.com

boot/Kconfig | 33 +++++ boot/Makefile | 1 + boot/image-pre-load.c | 291 ++++++++++++++++++++++++++++++++++++++++++ include/image.h | 9 ++ 4 files changed, 334 insertions(+) create mode 100644 boot/image-pre-load.c

Reviewed-by: Simon Glass sjg@chromium.org

Please see below.

diff --git a/boot/Kconfig b/boot/Kconfig index d3a12be228..3856580af6 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -958,6 +958,39 @@ config AUTOBOOT_MENU_SHOW

endmenu

+menu "Image support"

+config IMAGE_PRE_LOAD

•   bool "Image pre-load support"
  

•   help
  

•     Enable image pre-load support
  

+config SPL_IMAGE_PRE_LOAD

•   bool "Image pre-load support within SPL"
  

•   depends on SPL && IMAGE_PRE_LOAD
  

•   help
  

•     Enable image pre-load support in SPL
  

Please expand all your help

+config IMAGE_PRE_LOAD_SIG

•   bool "Image pre-load signature support"
  

•   depends on IMAGE_PRE_LOAD
  

•   select FIT_SIGNATURE
  

•   select RSA
  

•   select RSA_VERIFY_WITH_PKEY
  

•   help
  

•     Enable image pre-load signature support
  

+config SPL_IMAGE_PRE_LOAD_SIG

•   bool "Image pre-load signature support witin SPL"
  

•   depends on SPL_IMAGE_PRE_LOAD && IMAGE_PRE_LOAD_SIG
  

•   select SPL_FIT_SIGNATURE
  

•   select SPL_RSA
  

•   select SPL_RSA_VERIFY_WITH_PKEY
  

•   help
  

•     Enable image pre-load signature support in SPL
  

+endmenu

config USE_BOOTARGS bool "Enable boot arguments" help diff --git a/boot/Makefile b/boot/Makefile index 2938c3f145..59752c65ca 100644 --- a/boot/Makefile +++ b/boot/Makefile @@ -26,6 +26,7 @@ obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += image-fdt.o obj-$(CONFIG_$(SPL_TPL_)FIT_SIGNATURE) += fdt_region.o obj-$(CONFIG_$(SPL_TPL_)FIT) += image-fit.o obj-$(CONFIG_$(SPL_)MULTI_DTB_FIT) += boot_fit.o common_fit.o +obj-$(CONFIG_$(SPL_TPL_)IMAGE_PRE_LOAD) += image-pre-load.o obj-$(CONFIG_$(SPL_TPL_)IMAGE_SIGN_INFO) += image-sig.o obj-$(CONFIG_$(SPL_TPL_)FIT_SIGNATURE) += image-fit-sig.o obj-$(CONFIG_$(SPL_TPL_)FIT_CIPHER) += image-cipher.o diff --git a/boot/image-pre-load.c b/boot/image-pre-load.c new file mode 100644 index 0000000000..6ed21c3f51 --- /dev/null +++ b/boot/image-pre-load.c @@ -0,0 +1,291 @@ +// SPDX-License-Identifier: GPL-2.0+ +/*

• • Copyright (C) 2021 Philippe Reynes philippe.reynes@softathome.com
• */

+#include <common.h> +#include <asm/global_data.h> +DECLARE_GLOBAL_DATA_PTR; +#include <image.h> +#include <mapmem.h>

+#define IMAGE_PRE_LOAD_SIG_MAGIC 0x55425348 +#define IMAGE_PRE_LOAD_SIG_OFFSET_MAGIC 0 +#define IMAGE_PRE_LOAD_SIG_OFFSET_IMG_LEN 4 +#define IMAGE_PRE_LOAD_SIG_OFFSET_SIG 8

+#define IMAGE_PRE_LOAD_PATH "/image/pre-load/sig" +#define IMAGE_PRE_LOAD_PROP_HEADER_SIZE "header-size" +#define IMAGE_PRE_LOAD_PROP_ALGO_NAME "algo-name" +#define IMAGE_PRE_LOAD_PROP_PADDING_NAME "padding-name" +#define IMAGE_PRE_LOAD_PROP_SIG_SIZE "signature-size" +#define IMAGE_PRE_LOAD_PROP_PUBLIC_KEY "public-key" +#define IMAGE_PRE_LOAD_PROP_MANDATORY "mandatory"

+#ifndef CONFIG_SYS_BOOTM_LEN +/* use 8MByte as default max gunzip size */ +#define CONFIG_SYS_BOOTM_LEN 0x800000 +#endif

+struct image_sig_header {

•   u32 magic;
  

•   u32 size;
  

•   u8 *sig;
  

+};

+struct image_sig_info {

•   ulong header_size;
  

•   char *algo_name;
  

•   char *padding_name;
  

•   u8 *key;
  

•   int key_len;
  

•   u32 sig_size;
  

•   int mandatory;
  

comments

+};

+ulong image_load_offset;

+/*

• • This function gathers information about the signature check
• • that could be done before launching the image.
• • return:
• • -1 => an error has occurred

Can you use -Exxx instead?

• • 0 => OK
• • 1 => no setup
• */

+static int image_pre_load_sig_setup(struct image_sig_info *info) +{

•   const void *algo_name, *padding_name, *key, *mandatory;
  

•   const u32 *header_size, *sig_size;
  

•   int key_len;
  

•   int node, ret = 0;
  

•   if (!info) {
  

•           printf("ERROR: info is NULL for image pre-load sig check\n");
  

log_err() ?

•           ret = -1;
  

•           goto out;
  

•   }
  

•   memset(info, 0, sizeof(*info));
  

•   node = fdt_path_offset(gd_fdt_blob(), IMAGE_PRE_LOAD_PATH);
  

•   if (node < 0) {
  

•           printf("INFO: no info for image pre-load sig check\n");
  

•           ret = 1;
  

•           goto out;
  

•   }
  

•   header_size = fdt_getprop(gd_fdt_blob(), node,
  

•                             IMAGE_PRE_LOAD_PROP_HEADER_SIZE, NULL);
  

•   if (!header_size) {
  

•           printf("ERROR: no header-size for image pre-load sig check\n");
  

•           ret = -1;
  

•           goto out;
  

•   }
  

•   algo_name = fdt_getprop(gd_fdt_blob(), node,
  

•                           IMAGE_PRE_LOAD_PROP_ALGO_NAME, NULL);
  

•   if (!algo_name) {
  

•           printf("ERROR: no algo_name for image pre-load sig check\n");
  

•           ret = -1;
  

•           goto out;
  

•   }
  

•   padding_name = fdt_getprop(gd_fdt_blob(), node,
  

•                              IMAGE_PRE_LOAD_PROP_PADDING_NAME, NULL);
  

•   if (!padding_name) {
  

•           printf("INFO: no padding_name provided, so using pkcs-1.5\n");
  

•           padding_name = "pkcs-1.5";
  

•   }
  

•   sig_size = fdt_getprop(gd_fdt_blob(), node,
  

•                          IMAGE_PRE_LOAD_PROP_SIG_SIZE, NULL);
  

•   if (!sig_size) {
  

•           printf("ERROR: no signature-size for image pre-load sig check\n");
  

•           ret = -1;
  

•           goto out;
  

•   }
  

•   key = fdt_getprop(gd_fdt_blob(), node,
  

•                     IMAGE_PRE_LOAD_PROP_PUBLIC_KEY, &key_len);
  

•   if (!key) {
  

•           printf("ERROR: no key for image pre-load sig check\n");
  

•           ret = -1;
  

•           goto out;
  

•   }
  

•   info->header_size       = fdt32_to_cpu(*header_size);
  

•   info->algo_name         = (char *)algo_name;
  

•   info->padding_name      = (char *)padding_name;
  

•   info->key               = (uint8_t *)key;
  

•   info->key_len           = key_len;
  

•   info->sig_size          = fdt32_to_cpu(*sig_size);
  

•   mandatory = fdt_getprop(gd_fdt_blob(), node,
  

•                           IMAGE_PRE_LOAD_PROP_MANDATORY, NULL);
  

•   if (mandatory && !strcmp((char *)mandatory, "yes"))
  

•           info->mandatory = 1;
  

• out:

•   return ret;
  

+}

+static int image_pre_load_sig_get_header_u32(struct image_sig_info *info,

•                                        ulong addr,  u32 offset,
  

•                                        u32 *value)
  

+{

•   void *header;
  

•   u32 *tmp;
  

•   int ret = 0;
  

•   header = map_sysmem(addr, info->header_size);
  

•   if (!header) {
  

•           printf("ERROR: can't map header image pre-load sig\n");
  

•           ret = -1;
  

•           goto out;
  

•   }
  

•   tmp = header + offset;
  

•   *value = be32_to_cpu(*tmp);
  

•   unmap_sysmem(header);
  

• out:

•   return ret;
  

+}

+static int image_pre_load_sig_get_magic(struct image_sig_info *info,

•                                   ulong addr, u32 *magic)
  

+{

•   int ret;
  

•   ret = image_pre_load_sig_get_header_u32(info, addr,
  

•                                           IMAGE_PRE_LOAD_SIG_OFFSET_MAGIC, magic);
  

•   return ret;
  

+}

+static int image_pre_load_sig_get_img_len(struct image_sig_info *info,

•                                     ulong addr, u32 *len)
  

+{

•   int ret;
  

•   ret = image_pre_load_sig_get_header_u32(info, addr,
  

•                                           IMAGE_PRE_LOAD_SIG_OFFSET_IMG_LEN, len);
  

•   if (ret < 0)
  

•           goto out;
  

•   if (*len > CONFIG_SYS_BOOTM_LEN) {
  

•           printf("ERROR: size of image (%u) bigger than CONFIG_SYS_BOOTM_LEN (%u)\n",
  

•                  *len, CONFIG_SYS_BOOTM_LEN);
  

•           ret = -1;
  

•           goto out;
  

•   }
  

•   if (*len == 0) {
  

•           printf("ERROR: size of image (%u) is zero\n", *len);
  

•           ret = -1;
  

•           goto out;
  

•   }
  

• out:

•   return ret;
  

+}

+static int image_pre_load_sig_check(struct image_sig_info *info, ulong addr, int img_len) +{

•   void *image;
  

•   struct image_sign_info sig_info;
  

•   struct image_region reg;
  

•   u32 sig_len;
  

•   u8 *sig;
  

•   int ret = 0;
  

•   image = (void *)map_sysmem(addr, info->header_size + img_len);
  

•   if (!image) {
  

•           printf("ERROR: can't map full image\n");
  

•           ret = -1;
  

Please use real error codes throughout.

•           goto out;
  

•   }
  

•   memset(&sig_info, 0, sizeof(sig_info));
  

'\0'

•   sig_info.name = info->algo_name;
  

•   sig_info.padding = image_get_padding_algo(info->padding_name);
  

•   sig_info.checksum = image_get_checksum_algo(sig_info.name);
  

•   sig_info.crypto = image_get_crypto_algo(sig_info.name);
  

•   sig_info.key = info->key;
  

•   sig_info.keylen = info->key_len;
  

•   reg.data = image + info->header_size;
  

•   reg.size = img_len;
  

•   sig = (uint8_t *)image + IMAGE_PRE_LOAD_SIG_OFFSET_SIG;
  

•   sig_len = info->sig_size;
  

•   ret = sig_info.crypto->verify(&sig_info, &reg, 1, sig, sig_len);
  

•   if (ret) {
  

•           printf("ERROR: signature check has failed (err=%d)\n", ret);
  

•           ret = -1;
  

•           goto out_unmap;
  

•   }
  

•   printf("INFO: signature check has succeed\n");
  

+out_unmap:

•   unmap_sysmem(image);
  

• out:

•   return ret;
  

+}

+int image_pre_load_sig(ulong addr) +{

•   struct image_sig_info info;
  

•   u32 magic, img_len;
  

•   int ret;
  

•   ret = image_pre_load_sig_setup(&info);
  

•   if (ret < 0)
  

•           goto out;
  

•   if (ret > 0) {
  

•           ret = 0;
  

•           goto out;
  

•   }
  

•   ret = image_pre_load_sig_get_magic(&info, addr, &magic);
  

•   if (ret < 0)
  

•           goto out;
  

•   if (magic != IMAGE_PRE_LOAD_SIG_MAGIC) {
  

•           if (info.mandatory) {
  

•                   printf("ERROR: signature is mandatory\n");
  

•                   ret = -1;
  

•           }
  

•           goto out;
  

•   }
  

•   ret = image_pre_load_sig_get_img_len(&info, addr, &img_len);
  

•   if (ret < 0)
  

•           goto out;
  

•   ret = image_pre_load_sig_check(&info, addr, img_len);
  

•   if (!ret)
  

•           image_load_offset += info.header_size;
  

• out:

•   return ret;
  

+}

+int image_pre_load(ulong addr) +{

•   int ret = 0;
  

•   image_load_offset = 0;
  

•   if (CONFIG_IS_ENABLED(IMAGE_PRE_LOAD_SIG))
  

•           ret = image_pre_load_sig(addr);
  

•   return ret;
  

+} diff --git a/include/image.h b/include/image.h index fd662e74b4..5f83e4c747 100644 --- a/include/image.h +++ b/include/image.h @@ -48,6 +48,7 @@ struct fdt_region; extern ulong image_load_addr; /* Default Load Address */ extern ulong image_save_addr; /* Default Save Address */ extern ulong image_save_size; /* Default Save Size */ +extern ulong image_load_offset; /* Default Load Address Offset */

/* An invalid size, meaning that the image size is not known */ #define IMAGE_SIZE_INVAL (-1UL) @@ -1289,6 +1290,14 @@ struct crypto_algo *image_get_crypto_algo(const char *full_name); */ struct padding_algo *image_get_padding_algo(const char *name);

+/**

• • image_pre_load() - Manage pre load header

??

Please add a description here.

• • @param addr Address of the image
• • @return: 0 on success, -ve on error
• */

+int image_pre_load(ulong addr);

/**

• fit_image_verify_required_sigs() - Verify signatures marked as 'required'

-- 2.17.1

Regards, Simon

Hi Philippe,

On Wed, 17 Nov 2021 at 10:52, Philippe Reynes philippe.reynes@softathome.com wrote:

This commit adds a stage pre-load to the command

Add a stage...

bootm. Right now, this stage may be used to read a header and check the signature of the full image.

Signed-off-by: Philippe Reynes philippe.reynes@softathome.com

boot/bootm.c | 33 +++++++++++++++++++++++++++++++++ cmd/Kconfig | 10 ++++++++++ cmd/bootm.c | 2 +- include/image.h | 1 + 4 files changed, 45 insertions(+), 1 deletion(-)

Reviewed-by: Simon Glass sjg@chromium.org

diff --git a/boot/bootm.c b/boot/bootm.c index 4482f84b40..4803c577cc 100644 --- a/boot/bootm.c +++ b/boot/bootm.c @@ -87,6 +87,33 @@ static int bootm_start(struct cmd_tbl *cmdtp, int flag, int argc, return 0; }

+static ulong bootm_data_addr(int argc, char *const argv[]) +{

•   ulong addr;
  

•   if (argc > 0)
  

•           addr = simple_strtoul(argv[0], NULL, 16);
  

•   else
  

•           addr = image_load_addr;
  

•   return addr;
  

+}

+static int bootm_pre_load(struct cmd_tbl *cmdtp, int flag, int argc,

•                     char *const argv[])
  

+{

•   ulong data_addr = bootm_data_addr(argc, argv);
  

•   int ret = 0;
  

•   if (CONFIG_IS_ENABLED(CMD_BOOTM_PRE_LOAD))
  

•           ret = image_pre_load(data_addr);
  

•   if (ret)
  

•           ret = CMD_RET_FAILURE;
  

•   return ret;
  

+}

static int bootm_find_os(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { @@ -677,6 +704,9 @@ int do_bootm_states(struct cmd_tbl *cmdtp, int flag, int argc, if (states & BOOTM_STATE_START) ret = bootm_start(cmdtp, flag, argc, argv);

•   if (!ret && (states & BOOTM_STATE_PRE_LOAD))
  

•           ret = bootm_pre_load(cmdtp, flag, argc, argv);
  

•   if (!ret && (states & BOOTM_STATE_FINDOS))
            ret = bootm_find_os(cmdtp, flag, argc, argv);
  
  

@@ -866,6 +896,9 @@ static const void *boot_get_kernel(struct cmd_tbl *cmdtp, int flag, int argc, &fit_uname_config, &fit_uname_kernel);

•   if (CONFIG_IS_ENABLED(CMD_BOOTM_PRE_LOAD))
  

•           img_addr += image_load_offset;
  

•   bootstage_mark(BOOTSTAGE_ID_CHECK_MAGIC);
  
    /* check image type, for FIT images get FIT kernel node */
  

diff --git a/cmd/Kconfig b/cmd/Kconfig index 5b30b13e43..cad2cda0bf 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -194,6 +194,16 @@ config CMD_BOOTM help Boot an application image from the memory.

+config CMD_BOOTM_PRE_LOAD

•   bool "enable pre-load on bootm"
  

•   depends on CMD_BOOTM
  

•   depends on IMAGE_PRE_LOAD
  

•   default n
  

•   help
  

•     Enable support of stage pre-load for the bootm command.
  

•    This stage allow to check of modifty the image provided
  

•    to the bootm command.
  

modify

config BOOTM_EFI bool "Support booting UEFI FIT images" depends on CMD_BOOTEFI && CMD_BOOTM && FIT diff --git a/cmd/bootm.c b/cmd/bootm.c index 92468d09a1..acfb8eedde 100644 --- a/cmd/bootm.c +++ b/cmd/bootm.c @@ -126,7 +126,7 @@ int do_bootm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) }

    return do_bootm_states(cmdtp, flag, argc, argv, BOOTM_STATE_START |

•           BOOTM_STATE_FINDOS | BOOTM_STATE_FINDOTHER |
  

•           BOOTM_STATE_FINDOS | BOOTM_STATE_PRE_LOAD | BOOTM_STATE_FINDOTHER |
            BOOTM_STATE_LOADOS |
  

#ifdef CONFIG_SYS_BOOT_RAMDISK_HIGH BOOTM_STATE_RAMDISK | diff --git a/include/image.h b/include/image.h index 5f83e4c747..42fb01ab07 100644 --- a/include/image.h +++ b/include/image.h @@ -351,6 +351,7 @@ typedef struct bootm_headers { #define BOOTM_STATE_OS_PREP (0x00000100) #define BOOTM_STATE_OS_FAKE_GO (0x00000200) /* 'Almost' run the OS */ #define BOOTM_STATE_OS_GO (0x00000400) +#define BOOTM_STATE_PRE_LOAD (0x00000800)

Drop ()

    int             state;

#if defined(CONFIG_LMB) && !defined(USE_HOSTCC)

2.17.1

Regards, Simon

On 17/11/2021 18.52, Philippe Reynes wrote:

This commit adds a script gen_pre_load_header.sh that generate the header used by the image pre-load stage.

Signed-off-by: Philippe Reynes philippe.reynes@softathome.com

tools/gen_pre_load_header.sh | 174 +++++++++++++++++++++++++++++++++++ 1 file changed, 174 insertions(+) create mode 100755 tools/gen_pre_load_header.sh

diff --git a/tools/gen_pre_load_header.sh b/tools/gen_pre_load_header.sh new file mode 100755 index 0000000000..8256fa80ee --- /dev/null +++ b/tools/gen_pre_load_header.sh @@ -0,0 +1,174 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0+

+# +# default value +# +size='4096' +algo='sha256,rsa2048' +padding='pkcs-1.5' +key='' +verbose='false' +input='' +output=''

+usage() {

• printf "Usage: $0 -a <algo> -k <key> [-p <padding>] [-s <size>] [-v] -i <input> -o <output>\n"

+}

+# +# parse arguments +# +while getopts 'a:hi:k:o:p:s:v' flag; do

• case "${flag}" in

• a) algo="${OPTARG}" ;;
  

• h) usage
  

•    exit 0 ;;
  

• i) input="${OPTARG}" ;;
  

• k) key="${OPTARG}" ;;
  

• o) output="${OPTARG}" ;;
  

• p) padding="${OPTARG}" ;;
  

• s) size="${OPTARG}" ;;
  

• v) verbose='true' ;;
  

• *) usage
  

•    exit 1 ;;
  

• esac

+done

+# +# check that mandatory arguments are provided +# +if [ -z "$key" -o -z "$input" -o -z "$output" ] +then

• usage
• exit 0

+fi

+hash=$(echo $algo | cut -d',' -f1) +sign=$(echo $algo | cut -d',' -f2)

+echo "status:" +echo "size = $size" +echo "algo = $algo" +echo "hash = $hash" +echo "sign = $sign" +echo "padding = $padding" +echo "key = $key" +echo "verbose = $verbose"

+# +# check if input file exist +# +if [ ! -f "$input" ] +then

• echo "Error: file '$input' doesn't exist"
• exit 1

+fi

+# +# check if output is not empty +# +if [ -z "$output" ] +then

• echo "Error: output is empty"
• exit 1

+fi

+# +# check that size is bigger than 0 +# +if [ $size -le 0 ] +then

• echo "Error: $size lower than 0"
• exit 1

+fi

+# +# check if the key file exist +# +if [ ! -f "$key" ] +then

• echo "Error: file $key doesn't exist\n"
• exit 1

+fi

+# +# check if the hash is valid and supported +# +print_supported_hash() {

• echo "Supported hash:"
• echo "- sha1"
• echo "- sha256"
• echo "- sha384"
• echo "- sha512"

+}

+case "$hash" in

• "sha1") hashOption="-sha1" ;;
• "sha256") hashOption="-sha256" ;;
• "sha384") hashOption="-sha384" ;;
• "sha512") hashOption="-sha512" ;;
• *) echo "Error: $hash is an invalid hash"

•   print_supported_hash
  

•   exit 1;;
  

+esac

+# +# check if the sign is valid and supported +# +print_supported_sign() {

• echo "Supported sign:"
• echo "- rsa1024"
• echo "- rsa2048"
• echo "- rsa4096"

+}

+case "$sign" in

• "rsa1024") ;;
• "rsa2048") ;;
• "rsa4096") ;;
• *) echo "Error: $sign is an invalid signature type"

•   print_supported_sign
  

•   exit 1;;
  

+esac

+# +# check if the padding is valid and supported +# +print_supported_padding() {

• echo "Supported padding:"
• echo "- pkcs-1.5"
• echo "- pss"

+}

+case "$padding" in

• "pkcs-1.5") optionPadding='' ;;
• "pss") optionPadding='-sigopt rsa_padding_mode:pss -sigopt rsa_pss_saltlen:-2' ;;
• *) echo "Error: $padding is an invalid padding"

•   print_supported_padding
  

•   exit 1;;
  

+esac

+# +# generate the sigature +# +sig=$(openssl dgst $optionHash -sign $key $optionPadding $input | xxd -p)

+# +# generate the header +# +# 0 = magic +# 4 = image size +# 8 = signature +# +h=$(printf "%08x" 0x55425348) +i=$(stat --printf="%s" $input) +i=$(printf "%08x" $i)

+echo "$h$i$sig" | xxd -r -p > $output

So this sounds like a completely generic way of prepending a signature to an arbitrary blob, whether that is a FIT image, a U-Boot script wrapped in a FIT, some firmware blob or whatnot. So it sounds like it could be generally useful, and a lot simpler than the complexity inherent when trying to add signature data within the signed data structure itself.

So, can we perhaps not tie it to bootm as such? It's not a problem if bootm learns to recognize 0x55425348 as another image format and then automatically knows how to locate the "real" image, and/or automatically verifies it. But I'd really like to be able to

fatload $loadaddr blabla && \ verify $loadaddr && \ source $loadaddr

where fatload can be any random command that gets a bunch of bytes into memory at a specific location (tftpboot, mmc read, ubi...). Currently, we simply don't have any sane way to verify a boot script, or random blobs, AFAICT.

To that end, it would be nice if the header was a little more self-describing. Something like

0 = magic 4 = header size (including padding) 8 = image size 12 = offset to image signature 16 = flags (currently enforced to 0) 20 = reserved (currently enforced to 0) 24 = signature of first 24 bytes

xx = signature of image

Why do I want the image size signed? Because I'd like to be able to store the whole thing in a raw partition (or ubi volume, or...), where there's no concept of "file size" available. So I'd like to be able to read in some fixed size chunk (24+whatever I expect the signature could be, so 4096 is certainly enough), and from that compute the whole size I need to read. But I don't want to blindly trust the "image size" field. So, for such a case, I'd also like a "verify header $loadaddr" subcommand (and "verify image $loadaddr", with "verify $loadaddr" being shorthand for doing both).

And continuing the wishlist, it could be even better if we had

verify load $loadaddr 'mmc read %l% 0 %s512%'

i.e. we could pass a "parametrized shell command" to verify for it to use to read in a bunch of bytes to a given address - with %l% being substituted by the address and %s<optional unit>% by the size to load, optionally specified in the given unit.

Rasmus