Skip to content

Fix FIT hash algos in SPL (Fixes v2021.10-rc3)

Alexandru Gagniuc u-boot 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest6 patches 7 repliesIn review
  2. v15 patches 4 repliesSuperseded

Changes in v2 from the cover letter

- Taken in all of Tom's fixes from WIP/30Aug2021 branch
- CMD_MVEBU_BUBT: select SHA256 if ARMADA_3700 (sha256_update() reference)
- fsl: FSL_CAAM: imply SPL_CRYPTO (Fixes undefined reference to hw_sha1)
- Add MD5 to hash_algos[] (Fixes "Can't add hashes to FIT: -93")

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/6common: Remove unused CONFIG_FIT_SHAxxx selectorscmd/mvebu/Kconfig common/Kconfig.boot common/spl/Kconfig +2 more+2 -741 reply
2/6lib: Drop SHA512_ALGO in lieu of SHA512arch/arm/mach-socfpga/Kconfig lib/Kconfig lib/Makefile +3 more+8 -142 replies
3/6common/spl: Drop [ST]PL_HASH_SUPPORT in favor of [ST]PL_HASHboard/freescale/common/Kconfig common/Kconfig.boot common/Makefile +8 more+6 -331 reply
4/6common: Move MD5 hash to hash_algo[] array.common/hash.c include/image.h include/u-boot/md5.h +1 more+20 -41 reply
5/6image: Drop if/elseif hash selection in calculate_hash()common/Kconfig.boot common/image-fit.c drivers/crypto/fsl/Kconfig+23 -261 reply
6/6image: Drop IMAGE_ENABLE_{MD5, CRC32} #definesinclude/image.h+0 -201 reply

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.

Read the v2 thread

Cover letter [PATCH v2 0/6] Fix FIT hash algos in SPL (Fixes v2021.10-rc3)

Simon and I recently worked on killing a bunch extra definitions. One of the side-effects is that certain hash algorithms won't work in SPL when used in the context of FIT verification.

For example, in FIT verification, CONFIG_IS_ENABLED(SHA256) is used (good), but there is no corresponding CONFIG_SPL_SHA256 (bad). This will always be false for SPL, hence certain "hash" algos are broken.

This series resolves the selection by replacing the broken selection with hash_lookup_algo(), which does not have the aforementioned problem. This at the very least allows 'algo = "sha256"' FIT nodes to work in SPL.

This series does not attempt to add individual SHA/CRC/MD5 configs for SPL. Hash algo selection for SPL has been problematic even before. This series is meant as an emergency fix, so it does not attempt to tackle general refactoring issues.

Changes since v1:
- Taken in all of Tom's fixes from WIP/30Aug2021 branch
- CMD_MVEBU_BUBT: select SHA256 if ARMADA_3700 (sha256_update() reference)
- fsl: FSL_CAAM: imply SPL_CRYPTO (Fixes undefined reference to hw_sha1)
- Add MD5 to hash_algos[] (Fixes "Can't add hashes to FIT: -93")

Alexandru Gagniuc (6):
common: Remove unused CONFIG_FIT_SHAxxx selectors
lib: Drop SHA512_ALGO in lieu of SHA512 common/spl: Drop [ST]PL_HASH_SUPPORT in favor of [ST]PL_HASH
common: Move MD5 hash to hash_algo[] array.
image: Drop if/elseif hash selection in calculate_hash()
image: Drop IMAGE_ENABLE_{MD5, CRC32} #defines

 arch/arm/mach-socfpga/Kconfig                 |  2 +-
 board/freescale/common/Kconfig                |  1 +
 cmd/mvebu/Kconfig                             |  1 +
 common/Kconfig.boot                           | 32 +--------
 common/Makefile                               |  4 +-
 common/hash.c                                 | 13 ++++
 common/image-fit.c                            | 45 ++++++-------
 common/spl/Kconfig                            | 65 +------------------
 ...s1021atwr_sdcard_ifc_SECURE_BOOT_defconfig |  1 -
 configs/ls1043ardb_nand_SECURE_BOOT_defconfig |  1 -
 .../ls1043ardb_sdcard_SECURE_BOOT_defconfig   |  1 -
 .../ls1046ardb_sdcard_SECURE_BOOT_defconfig   |  1 -
 ...1088ardb_sdcard_qspi_SECURE_BOOT_defconfig |  1 -
 configs/mt8516_pumpkin_defconfig              |  2 +-
 drivers/crypto/fsl/Kconfig                    |  2 +
 include/configs/xilinx_zynqmp.h               |  2 +-
 include/image.h                               | 24 +------
 include/u-boot/md5.h                          |  6 +-
 lib/Kconfig                                   | 12 ++--
 lib/Makefile                                  |  4 +-
 lib/crypt/Kconfig                             |  2 +-
 lib/efi_loader/Kconfig                        |  2 +-
 lib/md5.c                                     |  4 +-
 lib/sha512.c                                  |  2 -
 24 files changed, 59 insertions(+), 171 deletions(-)
Signature · 1 line
2.31.1