projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: PSCI: save and restore clobbered registers in v7_flush_dcache_all
[oweals/u-boot.git]
/
common
/
image-sig.c
diff --git
a/common/image-sig.c
b/common/image-sig.c
index 72284eb1d1fd00947863c63b55b1a3f3ece6f8c0..eda5e1353ab0add00db84fd00a53590ac28238cc 100644
(file)
--- a/
common/image-sig.c
+++ b/
common/image-sig.c
@@
-13,8
+13,8
@@
DECLARE_GLOBAL_DATA_PTR;
#endif /* !USE_HOSTCC*/
#include <image.h>
DECLARE_GLOBAL_DATA_PTR;
#endif /* !USE_HOSTCC*/
#include <image.h>
-#include <rsa.h>
-#include <rsa-checksum.h>
+#include <
u-boot/
rsa.h>
+#include <
u-boot/
rsa-checksum.h>
#define IMAGE_MAX_HASHED_NODES 100
#define IMAGE_MAX_HASHED_NODES 100
@@
-38,7
+38,7
@@
struct checksum_algo checksum_algos[] = {
#if IMAGE_ENABLE_SIGN
EVP_sha1,
#endif
#if IMAGE_ENABLE_SIGN
EVP_sha1,
#endif
-
sha1
_calculate,
+
hash
_calculate,
padding_sha1_rsa2048,
},
{
padding_sha1_rsa2048,
},
{
@@
-48,7
+48,7
@@
struct checksum_algo checksum_algos[] = {
#if IMAGE_ENABLE_SIGN
EVP_sha256,
#endif
#if IMAGE_ENABLE_SIGN
EVP_sha256,
#endif
-
sha256
_calculate,
+
hash
_calculate,
padding_sha256_rsa2048,
},
{
padding_sha256_rsa2048,
},
{
@@
-58,7
+58,7
@@
struct checksum_algo checksum_algos[] = {
#if IMAGE_ENABLE_SIGN
EVP_sha256,
#endif
#if IMAGE_ENABLE_SIGN
EVP_sha256,
#endif
-
sha256
_calculate,
+
hash
_calculate,
padding_sha256_rsa4096,
}
padding_sha256_rsa4096,
}
@@
-212,9
+212,7
@@
static int fit_image_verify_sig(const void *fit, int image_noffset,
int ret;
/* Process all hash subnodes of the component image node */
int ret;
/* Process all hash subnodes of the component image node */
- for (noffset = fdt_first_subnode(fit, image_noffset);
- noffset >= 0;
- noffset = fdt_next_subnode(fit, noffset)) {
+ fdt_for_each_subnode(fit, noffset, image_noffset) {
const char *name = fit_get_name(fit, noffset, NULL);
if (!strncmp(name, FIT_SIG_NODENAME,
const char *name = fit_get_name(fit, noffset, NULL);
if (!strncmp(name, FIT_SIG_NODENAME,
@@
-262,9
+260,7
@@
int fit_image_verify_required_sigs(const void *fit, int image_noffset,
return 0;
}
return 0;
}
- for (noffset = fdt_first_subnode(sig_blob, sig_node);
- noffset >= 0;
- noffset = fdt_next_subnode(sig_blob, noffset)) {
+ fdt_for_each_subnode(sig_blob, noffset, sig_node) {
const char *required;
int ret;
const char *required;
int ret;
@@
-397,9
+393,7
@@
static int fit_config_verify_sig(const void *fit, int conf_noffset,
int ret;
/* Process all hash subnodes of the component conf node */
int ret;
/* Process all hash subnodes of the component conf node */
- for (noffset = fdt_first_subnode(fit, conf_noffset);
- noffset >= 0;
- noffset = fdt_next_subnode(fit, noffset)) {
+ fdt_for_each_subnode(fit, noffset, conf_noffset) {
const char *name = fit_get_name(fit, noffset, NULL);
if (!strncmp(name, FIT_SIG_NODENAME,
const char *name = fit_get_name(fit, noffset, NULL);
if (!strncmp(name, FIT_SIG_NODENAME,
@@
-444,9
+438,7
@@
int fit_config_verify_required_sigs(const void *fit, int conf_noffset,
return 0;
}
return 0;
}
- for (noffset = fdt_first_subnode(sig_blob, sig_node);
- noffset >= 0;
- noffset = fdt_next_subnode(sig_blob, noffset)) {
+ fdt_for_each_subnode(sig_blob, noffset, sig_node) {
const char *required;
int ret;
const char *required;
int ret;
@@
-467,6
+459,6
@@
int fit_config_verify_required_sigs(const void *fit, int conf_noffset,
int fit_config_verify(const void *fit, int conf_noffset)
{
int fit_config_verify(const void *fit, int conf_noffset)
{
- return
!
fit_config_verify_required_sigs(fit, conf_noffset,
-
gd_fdt_blob());
+ return fit_config_verify_required_sigs(fit, conf_noffset,
+ gd_fdt_blob());
}
}