projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: ks8851: Checkpatch cleanup
[oweals/u-boot.git]
/
tools
/
kwbimage.c
diff --git
a/tools/kwbimage.c
b/tools/kwbimage.c
index dffaf9043a040815efedac502338308e3228eb9d..02fd0c949fff6dbb94224bf783ef4d6f1e247d92 100644
(file)
--- a/
tools/kwbimage.c
+++ b/
tools/kwbimage.c
@@
-701,7
+701,7
@@
int kwb_verify(RSA *key, void *data, int datasz, struct sig_v1 *sig,
goto err_ctx;
}
goto err_ctx;
}
- if (
!EVP_VerifyFinal(ctx, sig->sig, sizeof(sig->sig), evp_key)
) {
+ if (
EVP_VerifyFinal(ctx, sig->sig, sizeof(sig->sig), evp_key) != 1
) {
ret = openssl_err("Could not verify signature");
goto err_ctx;
}
ret = openssl_err("Could not verify signature");
goto err_ctx;
}
@@
-1015,7
+1015,7
@@
static size_t image_headersz_v1(int *hasext)
* The payload should be aligned on some reasonable
* boundary
*/
* The payload should be aligned on some reasonable
* boundary
*/
- return ALIGN
_SUP
(headersz, 4096);
+ return ALIGN(headersz, 4096);
}
int add_binary_header_v1(uint8_t *cur)
}
int add_binary_header_v1(uint8_t *cur)
@@
-1058,7
+1058,7
@@
int add_binary_header_v1(uint8_t *cur)
* up to a 4-byte boundary. Plus 4 bytes for the
* next-header byte and 3-byte alignment at the end.
*/
* up to a 4-byte boundary. Plus 4 bytes for the
* next-header byte and 3-byte alignment at the end.
*/
- binhdrsz = ALIGN
_SUP
(binhdrsz, 4) + 4;
+ binhdrsz = ALIGN(binhdrsz, 4) + 4;
hdr->headersz_lsb = cpu_to_le16(binhdrsz & 0xFFFF);
hdr->headersz_msb = (binhdrsz & 0xFFFF0000) >> 16;
hdr->headersz_lsb = cpu_to_le16(binhdrsz & 0xFFFF);
hdr->headersz_msb = (binhdrsz & 0xFFFF0000) >> 16;
@@
-1082,7
+1082,7
@@
int add_binary_header_v1(uint8_t *cur)
fclose(bin);
fclose(bin);
- cur += ALIGN
_SUP
(s.st_size, 4);
+ cur += ALIGN(s.st_size, 4);
/*
* For now, we don't support more than one binary
/*
* For now, we don't support more than one binary
@@
-1548,7
+1548,7
@@
static void kwbimage_set_header(void *ptr, struct stat *sbuf, int ifd,
}
/* The MVEBU BootROM does not allow non word aligned payloads */
}
/* The MVEBU BootROM does not allow non word aligned payloads */
- sbuf->st_size = ALIGN
_SUP
(sbuf->st_size, 4);
+ sbuf->st_size = ALIGN(sbuf->st_size, 4);
version = image_get_version();
switch (version) {
version = image_get_version();
switch (version) {