diff options
author | Tom Rini <trini@konsulko.com> | 2024-05-22 08:55:35 -0600 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2024-05-22 08:55:35 -0600 |
commit | 377e91c162ab09ec20f96f966f380cb55c590edd (patch) | |
tree | bbbda225be105805c857f65c9e57c67aa20dc669 | |
parent | 7d24c3e06fa9a3b53cea593d4579886ef0eb4fe8 (diff) | |
parent | cb73fe9eeae0d71a74eef811b0ba34aaf5513dbe (diff) | |
download | u-boot-WIP/22May2024-next.zip u-boot-WIP/22May2024-next.tar.gz u-boot-WIP/22May2024-next.tar.bz2 |
Merge patch series "Clean-up patch set for MbedTLS integration"WIP/22May2024-next
Raymond Mao <raymond.mao@linaro.org> says:
This patch set is picked from the previously posted serie:
"[RFC] Integrate MbedTLS v3.6 LTS with U-Boot"
They are not directly related to MbedTLS integration, but the
prerequisite for a few clean-up, refactoring and minor fixes.
For V2, the linker script patch is dropped and added one patch
to move the snprintf to stdio.h
-rw-r--r-- | arch/arc/lib/cpu.c | 2 | ||||
-rw-r--r-- | board/Synology/common/legacy.c | 1 | ||||
-rw-r--r-- | board/ti/common/fdt_ops.c | 2 | ||||
-rw-r--r-- | boot/image-fit.c | 4 | ||||
-rw-r--r-- | boot/image.c | 2 | ||||
-rw-r--r-- | cmd/part.c | 1 | ||||
-rw-r--r-- | common/button_cmd.c | 2 | ||||
-rw-r--r-- | drivers/cpu/mpc83xx_cpu.c | 2 | ||||
-rw-r--r-- | drivers/crypto/hash/hash_sw.c | 8 | ||||
-rw-r--r-- | include/stdio.h | 17 | ||||
-rw-r--r-- | include/u-boot/md5.h | 10 | ||||
-rw-r--r-- | include/vsprintf.h | 17 | ||||
-rw-r--r-- | lib/display_options.c | 1 | ||||
-rw-r--r-- | lib/efi_loader/efi_signature.c | 1 | ||||
-rw-r--r-- | lib/efi_loader/efi_tcg2.c | 3 | ||||
-rw-r--r-- | lib/fwu_updates/fwu_mtd.c | 2 | ||||
-rw-r--r-- | lib/hexdump.c | 2 | ||||
-rw-r--r-- | lib/md5.c | 10 | ||||
-rw-r--r-- | lib/vsprintf.c | 1 | ||||
-rw-r--r-- | test/dm/scmi.c | 2 | ||||
-rw-r--r-- | test/print_ut.c | 1 |
21 files changed, 43 insertions, 48 deletions
diff --git a/arch/arc/lib/cpu.c b/arch/arc/lib/cpu.c index 5939504..269b4db 100644 --- a/arch/arc/lib/cpu.c +++ b/arch/arc/lib/cpu.c @@ -7,7 +7,7 @@ #include <clock_legacy.h> #include <init.h> #include <malloc.h> -#include <vsprintf.h> +#include <stdio.h> #include <asm/arcregs.h> #include <asm/cache.h> #include <asm/global_data.h> diff --git a/board/Synology/common/legacy.c b/board/Synology/common/legacy.c index a0bace7..2e3aa66 100644 --- a/board/Synology/common/legacy.c +++ b/board/Synology/common/legacy.c @@ -6,6 +6,7 @@ */ #include <config.h> +#include <stdio.h> #include <vsprintf.h> #include <env.h> #include <net.h> diff --git a/board/ti/common/fdt_ops.c b/board/ti/common/fdt_ops.c index eb917be..8a33009 100644 --- a/board/ti/common/fdt_ops.c +++ b/board/ti/common/fdt_ops.c @@ -6,7 +6,7 @@ */ #include <env.h> -#include <vsprintf.h> +#include <stdio.h> #include "fdt_ops.h" void ti_set_fdt_env(const char *board_name, struct ti_fdt_map *fdt_map) diff --git a/boot/image-fit.c b/boot/image-fit.c index fb03cab..f6464bc 100644 --- a/boot/image-fit.c +++ b/boot/image-fit.c @@ -37,10 +37,6 @@ DECLARE_GLOBAL_DATA_PTR; #include <image.h> #include <bootstage.h> #include <u-boot/crc.h> -#include <u-boot/md5.h> -#include <u-boot/sha1.h> -#include <u-boot/sha256.h> -#include <u-boot/sha512.h> /*****************************************************************************/ /* New uImage format routines */ diff --git a/boot/image.c b/boot/image.c index eb12e4b..bacf514 100644 --- a/boot/image.c +++ b/boot/image.c @@ -25,8 +25,6 @@ #endif #include <asm/global_data.h> -#include <u-boot/md5.h> -#include <u-boot/sha1.h> #include <linux/errno.h> #include <asm/io.h> @@ -19,6 +19,7 @@ #include <command.h> #include <env.h> #include <part.h> +#include <stdio.h> #include <vsprintf.h> enum cmd_part_info { diff --git a/common/button_cmd.c b/common/button_cmd.c index 8642c26..72dac1f 100644 --- a/common/button_cmd.c +++ b/common/button_cmd.c @@ -8,7 +8,7 @@ #include <command.h> #include <env.h> #include <log.h> -#include <vsprintf.h> +#include <stdio.h> /* Some sane limit "just in case" */ #define MAX_BTN_CMDS 32 diff --git a/drivers/cpu/mpc83xx_cpu.c b/drivers/cpu/mpc83xx_cpu.c index 9a7b5fd..127d3c3 100644 --- a/drivers/cpu/mpc83xx_cpu.c +++ b/drivers/cpu/mpc83xx_cpu.c @@ -9,7 +9,7 @@ #include <cpu.h> #include <dm.h> #include <log.h> -#include <vsprintf.h> +#include <stdio.h> #include <linux/bitops.h> #include "mpc83xx_cpu.h" diff --git a/drivers/crypto/hash/hash_sw.c b/drivers/crypto/hash/hash_sw.c index ffd4ab1..4590e22 100644 --- a/drivers/crypto/hash/hash_sw.c +++ b/drivers/crypto/hash/hash_sw.c @@ -50,17 +50,17 @@ static void hash_finish_crc32(void *ctx, void *obuf) /* MD5 */ static void hash_init_md5(void *ctx) { - MD5Init((struct MD5Context *)ctx); + MD5Init((MD5Context *)ctx); } static void hash_update_md5(void *ctx, const void *ibuf, uint32_t ilen) { - MD5Update((struct MD5Context *)ctx, ibuf, ilen); + MD5Update((MD5Context *)ctx, ibuf, ilen); } static void hash_finish_md5(void *ctx, void *obuf) { - MD5Final(obuf, (struct MD5Context *)ctx); + MD5Final(obuf, (MD5Context *)ctx); } /* SHA1 */ @@ -158,7 +158,7 @@ static struct sw_hash_impl sw_hash_impl[HASH_ALGO_NUM] = { .init = hash_init_md5, .update = hash_update_md5, .finish = hash_finish_md5, - .ctx_alloc_sz = sizeof(struct MD5Context), + .ctx_alloc_sz = sizeof(MD5Context), }, [HASH_ALGO_SHA1] = { diff --git a/include/stdio.h b/include/stdio.h index 3241e2d..7b999a5 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -46,6 +46,23 @@ static inline int vprintf(const char *fmt, va_list args) } #endif +/** + * Format a string and place it in a buffer + * + * @buf: The buffer to place the result into + * @size: The size of the buffer, including the trailing null space + * @fmt: The format string to use + * @...: Arguments for the format string + * Return: the number of characters which would be + * generated for the given input, excluding the trailing null, + * as per ISO C99. If the return is greater than or equal to + * @size, the resulting string is truncated. + * + * See the vsprintf() documentation for format string extensions over C99. + */ +int snprintf(char *buf, size_t size, const char *fmt, ...) + __attribute__ ((format (__printf__, 3, 4))); + /* * FILE based functions (can only be used AFTER relocation!) */ diff --git a/include/u-boot/md5.h b/include/u-boot/md5.h index d61364c..c465925 100644 --- a/include/u-boot/md5.h +++ b/include/u-boot/md5.h @@ -10,18 +10,18 @@ #define MD5_SUM_LEN 16 -struct MD5Context { +typedef struct MD5Context { __u32 buf[4]; __u32 bits[2]; union { unsigned char in[64]; __u32 in32[16]; }; -}; +} MD5Context; -void MD5Init(struct MD5Context *ctx); -void MD5Update(struct MD5Context *ctx, unsigned char const *buf, unsigned len); -void MD5Final(unsigned char digest[16], struct MD5Context *ctx); +void MD5Init(MD5Context *ctx); +void MD5Update(MD5Context *ctx, unsigned char const *buf, unsigned int len); +void MD5Final(unsigned char digest[16], MD5Context *ctx); /* * Calculate and store in 'output' the MD5 digest of 'len' bytes at diff --git a/include/vsprintf.h b/include/vsprintf.h index ed8a060..fe95147 100644 --- a/include/vsprintf.h +++ b/include/vsprintf.h @@ -225,23 +225,6 @@ char *simple_xtoa(ulong num); * @size: The size of the buffer, including the trailing null space * @fmt: The format string to use * @...: Arguments for the format string - * Return: the number of characters which would be - * generated for the given input, excluding the trailing null, - * as per ISO C99. If the return is greater than or equal to - * @size, the resulting string is truncated. - * - * See the vsprintf() documentation for format string extensions over C99. - */ -int snprintf(char *buf, size_t size, const char *fmt, ...) - __attribute__ ((format (__printf__, 3, 4))); - -/** - * Format a string and place it in a buffer - * - * @buf: The buffer to place the result into - * @size: The size of the buffer, including the trailing null space - * @fmt: The format string to use - * @...: Arguments for the format string * * The return value is the number of characters written into @buf not including * the trailing '\0'. If @size is == 0 the function returns 0. diff --git a/lib/display_options.c b/lib/display_options.c index d6b9355..d5df53a 100644 --- a/lib/display_options.c +++ b/lib/display_options.c @@ -12,6 +12,7 @@ #include <linux/ctype.h> #include <linux/kernel.h> #include <asm/io.h> +#include <stdio.h> #include <vsprintf.h> char *display_options_get_banner_priv(bool newlines, const char *build_tag, diff --git a/lib/efi_loader/efi_signature.c b/lib/efi_loader/efi_signature.c index f338e73..184eac8 100644 --- a/lib/efi_loader/efi_signature.c +++ b/lib/efi_loader/efi_signature.c @@ -17,7 +17,6 @@ #include <linux/oid_registry.h> #include <u-boot/hash-checksum.h> #include <u-boot/rsa.h> -#include <u-boot/sha256.h> const efi_guid_t efi_guid_sha256 = EFI_CERT_SHA256_GUID; const efi_guid_t efi_guid_cert_rsa2048 = EFI_CERT_RSA2048_GUID; diff --git a/lib/efi_loader/efi_tcg2.c b/lib/efi_loader/efi_tcg2.c index b07e009..ac056dc 100644 --- a/lib/efi_loader/efi_tcg2.c +++ b/lib/efi_loader/efi_tcg2.c @@ -19,9 +19,6 @@ #include <tpm-v2.h> #include <tpm_api.h> #include <u-boot/hash-checksum.h> -#include <u-boot/sha1.h> -#include <u-boot/sha256.h> -#include <u-boot/sha512.h> #include <linux/unaligned/be_byteshift.h> #include <linux/unaligned/le_byteshift.h> #include <linux/unaligned/generic.h> diff --git a/lib/fwu_updates/fwu_mtd.c b/lib/fwu_updates/fwu_mtd.c index 69cd3d7..4a52834 100644 --- a/lib/fwu_updates/fwu_mtd.c +++ b/lib/fwu_updates/fwu_mtd.c @@ -11,7 +11,7 @@ #include <malloc.h> #include <mtd.h> #include <uuid.h> -#include <vsprintf.h> +#include <stdio.h> #include <dm/ofnode.h> diff --git a/lib/hexdump.c b/lib/hexdump.c index 33e3e6e..2bc508f 100644 --- a/lib/hexdump.c +++ b/lib/hexdump.c @@ -10,7 +10,7 @@ #include <hexdump.h> #include <mapmem.h> -#include <vsprintf.h> +#include <stdio.h> #include <linux/ctype.h> #include <linux/compat.h> #include <linux/log2.h> @@ -55,7 +55,7 @@ byteReverse(unsigned char *buf, unsigned longs) * initialization constants. */ void -MD5Init(struct MD5Context *ctx) +MD5Init(MD5Context *ctx) { ctx->buf[0] = 0x67452301; ctx->buf[1] = 0xefcdab89; @@ -71,7 +71,7 @@ MD5Init(struct MD5Context *ctx) * of bytes. */ void -MD5Update(struct MD5Context *ctx, unsigned char const *buf, unsigned len) +MD5Update(MD5Context *ctx, unsigned char const *buf, unsigned int len) { register __u32 t; @@ -120,7 +120,7 @@ MD5Update(struct MD5Context *ctx, unsigned char const *buf, unsigned len) * 1 0* (64-bit count of bits processed, MSB-first) */ void -MD5Final(unsigned char digest[16], struct MD5Context *ctx) +MD5Final(unsigned char digest[16], MD5Context *ctx) { unsigned int count; unsigned char *p; @@ -269,7 +269,7 @@ MD5Transform(__u32 buf[4], __u32 const in[16]) void md5 (unsigned char *input, int len, unsigned char output[16]) { - struct MD5Context context; + MD5Context context; MD5Init(&context); MD5Update(&context, input, len); @@ -286,7 +286,7 @@ void md5_wd(const unsigned char *input, unsigned int len, unsigned char output[16], unsigned int chunk_sz) { - struct MD5Context context; + MD5Context context; #if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG) const unsigned char *end, *curr; int chunk; diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 27ea9c9..cfd1f19 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -19,6 +19,7 @@ #include <hexdump.h> #include <stdarg.h> #include <uuid.h> +#include <stdio.h> #include <vsprintf.h> #include <linux/ctype.h> #include <linux/err.h> diff --git a/test/dm/scmi.c b/test/dm/scmi.c index 69fc900..c9a0352 100644 --- a/test/dm/scmi.c +++ b/test/dm/scmi.c @@ -18,7 +18,7 @@ #include <scmi_agent.h> #include <scmi_agent-uclass.h> #include <scmi_protocols.h> -#include <vsprintf.h> +#include <stdio.h> #include <asm/scmi_test.h> #include <dm/device-internal.h> #include <dm/test.h> diff --git a/test/print_ut.c b/test/print_ut.c index bded2b6..53d3354 100644 --- a/test/print_ut.c +++ b/test/print_ut.c @@ -9,6 +9,7 @@ #include <log.h> #include <mapmem.h> #include <version_string.h> +#include <stdio.h> #include <vsprintf.h> #include <test/suites.h> #include <test/test.h> |