summaryrefslogtreecommitdiff
path: root/include/u-boot
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2021-10-08 16:02:55 -0400
committerTom Rini <[email protected]>2021-10-08 16:02:55 -0400
commit94e922c76a0e1fcdead3359e340f53fd0709a963 (patch)
tree667372191c3a70cd9343180c8d7f6273afbb9ab9 /include/u-boot
parent0caf37e973015255a3c5b9439ddb8c6aef1b5001 (diff)
parent4cb35b7a1fdf060a0839b71f6dbf8d08b1ae62e0 (diff)
Merge branch '2021-10-08-image-cleanups'
- A large number of image file and tooling related cleanups
Diffstat (limited to 'include/u-boot')
-rw-r--r--include/u-boot/hash-checksum.h5
-rw-r--r--include/u-boot/rsa.h2
2 files changed, 3 insertions, 4 deletions
diff --git a/include/u-boot/hash-checksum.h b/include/u-boot/hash-checksum.h
index 54e6a73744e..7f16b37a9ab 100644
--- a/include/u-boot/hash-checksum.h
+++ b/include/u-boot/hash-checksum.h
@@ -7,11 +7,12 @@
#define _RSA_CHECKSUM_H
#include <errno.h>
-#include <image.h>
#include <u-boot/sha1.h>
#include <u-boot/sha256.h>
#include <u-boot/sha512.h>
+struct image_region;
+
/**
* hash_calculate() - Calculate hash over the data
*
@@ -23,7 +24,7 @@
* @return 0 if OK, < 0 if error
*/
int hash_calculate(const char *name,
- const struct image_region region[], int region_count,
+ const struct image_region *region, int region_count,
uint8_t *checksum);
#endif
diff --git a/include/u-boot/rsa.h b/include/u-boot/rsa.h
index 89a9c4caa0a..7556aa5b4b7 100644
--- a/include/u-boot/rsa.h
+++ b/include/u-boot/rsa.h
@@ -103,11 +103,9 @@ int padding_pkcs_15_verify(struct image_sign_info *info,
uint8_t *msg, int msg_len,
const uint8_t *hash, int hash_len);
-#ifdef CONFIG_FIT_RSASSA_PSS
int padding_pss_verify(struct image_sign_info *info,
uint8_t *msg, int msg_len,
const uint8_t *hash, int hash_len);
-#endif /* CONFIG_FIT_RSASSA_PSS */
#define RSA_DEFAULT_PADDING_NAME "pkcs-1.5"