random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-17 14:18:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

image: Rename CONFIG_FIT_ENABLE_RSASSA_PSS_SUPPORT

Browse Source 
Drop the ENABLE and SUPPORT parts of this, which are redundant.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
This commit is contained in:
Simon Glass 2021-07-14 17:05:31 -05:00 committed by Tom Rini
parent f5bc9c25f3
commit ad74aed11e
8 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/Kconfig.boot
View File

@ -103,7 +103,7 @@ config FIT_SIGNATURE_MAX_SIZE
device memory. Assure this size does not extend past expected storage device memory. Assure this size does not extend past expected storage
space. space.
config FIT_ENABLE_RSASSA_PSS_SUPPORT config FIT_RSASSA_PSS
bool "Support rsassa-pss signature scheme of FIT image contents" bool "Support rsassa-pss signature scheme of FIT image contents"
depends on FIT_SIGNATURE depends on FIT_SIGNATURE
default n default n

4
common/image-sig.c
View File

@ -99,12 +99,12 @@ struct padding_algo padding_algos[] = {
.name = "pkcs-1.5", .name = "pkcs-1.5",
.verify = padding_pkcs_15_verify, .verify = padding_pkcs_15_verify,
}, },
#ifdef CONFIG_FIT_ENABLE_RSASSA_PSS_SUPPORT #ifdef CONFIG_FIT_RSASSA_PSS
{ {
.name = "pss", .name = "pss",
.verify = padding_pss_verify, .verify = padding_pss_verify,
} }
#endif /* CONFIG_FIT_ENABLE_RSASSA_PSS_SUPPORT */ #endif /* CONFIG_FIT_RSASSA_PSS */
}; };
struct checksum_algo *image_get_checksum_algo(const char *full_name) struct checksum_algo *image_get_checksum_algo(const char *full_name)

2
configs/bcm963158_ram_defconfig
View File

@ -11,7 +11,7 @@ CONFIG_TARGET_BCM963158=y
CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_ENV_VARS_UBOOT_CONFIG=y
CONFIG_FIT=y CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_ENABLE_RSASSA_PSS_SUPPORT=y CONFIG_FIT_RSASSA_PSS=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y
CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_LEGACY_IMAGE_FORMAT=y
CONFIG_SUPPORT_RAW_INITRD=y CONFIG_SUPPORT_RAW_INITRD=y

2
configs/sandbox_defconfig
View File

@ -10,7 +10,7 @@ CONFIG_DEBUG_UART=y
CONFIG_DISTRO_DEFAULTS=y CONFIG_DISTRO_DEFAULTS=y
CONFIG_FIT=y CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_ENABLE_RSASSA_PSS_SUPPORT=y CONFIG_FIT_RSASSA_PSS=y
CONFIG_FIT_CIPHER=y CONFIG_FIT_CIPHER=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y
CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE=y

2
include/image.h
View File

@ -30,7 +30,7 @@ struct fdt_region;
#define IMAGE_ENABLE_FIT 1 #define IMAGE_ENABLE_FIT 1
#define IMAGE_ENABLE_OF_LIBFDT 1 #define IMAGE_ENABLE_OF_LIBFDT 1
#define CONFIG_FIT_VERBOSE 1 /* enable fit_format_{error,warning}() */ #define CONFIG_FIT_VERBOSE 1 /* enable fit_format_{error,warning}() */
#define CONFIG_FIT_ENABLE_RSASSA_PSS_SUPPORT 1 #define CONFIG_FIT_RSASSA_PSS 1
#define CONFIG_FIT_SHA256 #define CONFIG_FIT_SHA256
#define CONFIG_FIT_SHA384 #define CONFIG_FIT_SHA384
#define CONFIG_FIT_SHA512 #define CONFIG_FIT_SHA512

8
include/u-boot/rsa.h
View File

@ -119,11 +119,11 @@ int padding_pkcs_15_verify(struct image_sign_info *info,
uint8_t *msg, int msg_len, uint8_t *msg, int msg_len,
const uint8_t *hash, int hash_len); const uint8_t *hash, int hash_len);
#ifdef CONFIG_FIT_ENABLE_RSASSA_PSS_SUPPORT #ifdef CONFIG_FIT_RSASSA_PSS
int padding_pss_verify(struct image_sign_info *info, int padding_pss_verify(struct image_sign_info *info,
uint8_t *msg, int msg_len, uint8_t *msg, int msg_len,
const uint8_t *hash, int hash_len); const uint8_t *hash, int hash_len);
#endif /* CONFIG_FIT_ENABLE_RSASSA_PSS_SUPPORT */ #endif /* CONFIG_FIT_RSASSA_PSS */
#else #else
static inline int rsa_verify_hash(struct image_sign_info *info, static inline int rsa_verify_hash(struct image_sign_info *info,
const uint8_t *hash, const uint8_t *hash,
@ -146,14 +146,14 @@ static inline int padding_pkcs_15_verify(struct image_sign_info *info,
return -ENXIO; return -ENXIO;
} }
#ifdef CONFIG_FIT_ENABLE_RSASSA_PSS_SUPPORT #ifdef CONFIG_FIT_RSASSA_PSS
static inline int padding_pss_verify(struct image_sign_info *info, static inline int padding_pss_verify(struct image_sign_info *info,
uint8_t *msg, int msg_len, uint8_t *msg, int msg_len,
const uint8_t *hash, int hash_len) const uint8_t *hash, int hash_len)
{ {
return -ENXIO; return -ENXIO;
} }
#endif /* CONFIG_FIT_ENABLE_RSASSA_PSS_SUPPORT */ #endif /* CONFIG_FIT_RSASSA_PSS */
#endif #endif
#define RSA_DEFAULT_PADDING_NAME "pkcs-1.5" #define RSA_DEFAULT_PADDING_NAME "pkcs-1.5"

4
lib/rsa/rsa-sign.c
View File

@ -442,7 +442,7 @@ static int rsa_sign_with_key(EVP_PKEY *pkey, struct padding_algo *padding_algo,
goto err_sign; goto err_sign;
} }
#ifdef CONFIG_FIT_ENABLE_RSASSA_PSS_SUPPORT #ifdef CONFIG_FIT_RSASSA_PSS
if (padding_algo && !strcmp(padding_algo->name, "pss")) { if (padding_algo && !strcmp(padding_algo->name, "pss")) {
if (EVP_PKEY_CTX_set_rsa_padding(ckey, if (EVP_PKEY_CTX_set_rsa_padding(ckey,
RSA_PKCS1_PSS_PADDING) <= 0) { RSA_PKCS1_PSS_PADDING) <= 0) {
@ -450,7 +450,7 @@ static int rsa_sign_with_key(EVP_PKEY *pkey, struct padding_algo *padding_algo,
goto err_sign; goto err_sign;
} }
} }
#endif /* CONFIG_FIT_ENABLE_RSASSA_PSS_SUPPORT */ #endif /* CONFIG_FIT_RSASSA_PSS */
for (i = 0; i < region_count; i++) { for (i = 0; i < region_count; i++) {
if (!EVP_DigestSignUpdate(context, region[i].data, if (!EVP_DigestSignUpdate(context, region[i].data,

2
lib/rsa/rsa-verify.c
View File

@ -95,7 +95,7 @@ int padding_pkcs_15_verify(struct image_sign_info *info,
return 0; return 0;
} }
#ifdef CONFIG_FIT_ENABLE_RSASSA_PSS_SUPPORT #ifdef CONFIG_FIT_RSASSA_PSS
static void u32_i2osp(uint32_t val, uint8_t *buf) static void u32_i2osp(uint32_t val, uint8_t *buf)
{ {
buf[0] = (uint8_t)((val >> 24) & 0xff); buf[0] = (uint8_t)((val >> 24) & 0xff);