diff options
| author | Tom Rini <[email protected]> | 2022-04-11 15:59:45 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-04-11 15:59:45 -0400 |
| commit | 7486c2ef9d296ad34be1567b8d26f978e683bece (patch) | |
| tree | ea1d936131f54e322db5e52f1299fc0e9db29852 /include | |
| parent | 1583c87b1b813a04c95732ae8075d79b14a26eea (diff) | |
| parent | c3322a53f34f986ad9818df72707ebb59c9c8725 (diff) | |
Merge branch '2022-04-11-assorted-updates'
- Assorted fixes/updates including K3-J721s2 timer dts fix, assorted
crypto improvements, led-pwm driver, improve handling of mtd
partitions, align mkimage hash output buffers and backport a UBIFS
bugfix from Linux.
Diffstat (limited to 'include')
| -rw-r--r-- | include/image.h | 2 | ||||
| -rw-r--r-- | include/linux/mtd/mtd.h | 1 | ||||
| -rw-r--r-- | include/u-boot/rsa.h | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/include/image.h b/include/image.h index 673b5f55eca..e4c6a50b885 100644 --- a/include/image.h +++ b/include/image.h @@ -1309,7 +1309,7 @@ ll_entry_declare(struct crypto_algo, __name, cryptos) struct padding_algo { const char *name; int (*verify)(struct image_sign_info *info, - uint8_t *pad, int pad_len, + const uint8_t *pad, int pad_len, const uint8_t *hash, int hash_len); }; diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index 74554009815..af45e63bf9c 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h @@ -305,6 +305,7 @@ struct mtd_info { struct device dev; #else struct udevice *dev; + ofnode flash_node; #endif int usecount; diff --git a/include/u-boot/rsa.h b/include/u-boot/rsa.h index b9634e38d9a..085363eb1e5 100644 --- a/include/u-boot/rsa.h +++ b/include/u-boot/rsa.h @@ -101,11 +101,11 @@ int rsa_verify_with_pkey(struct image_sign_info *info, const void *hash, uint8_t *sig, uint sig_len); int padding_pkcs_15_verify(struct image_sign_info *info, - uint8_t *msg, int msg_len, + const uint8_t *msg, int msg_len, const uint8_t *hash, int hash_len); int padding_pss_verify(struct image_sign_info *info, - uint8_t *msg, int msg_len, + const uint8_t *msg, int msg_len, const uint8_t *hash, int hash_len); #define RSA_DEFAULT_PADDING_NAME "pkcs-1.5" |