summaryrefslogtreecommitdiff
path: root/utils/imxtools/sbtools/sb1.c
diff options
context:
space:
mode:
Diffstat (limited to 'utils/imxtools/sbtools/sb1.c')
-rw-r--r--utils/imxtools/sbtools/sb1.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/utils/imxtools/sbtools/sb1.c b/utils/imxtools/sbtools/sb1.c
index ca7b7fdc8c..ed5893f454 100644
--- a/utils/imxtools/sbtools/sb1.c
+++ b/utils/imxtools/sbtools/sb1.c
@@ -189,13 +189,13 @@ enum sb1_error_t sb1_write_file(struct sb1_file_t *sb, const char *filename)
189} 189}
190 190
191struct sb1_file_t *sb1_read_file(const char *filename, void *u, 191struct sb1_file_t *sb1_read_file(const char *filename, void *u,
192 sb1_color_printf cprintf, enum sb1_error_t *err) 192 generic_printf_t cprintf, enum sb1_error_t *err)
193{ 193{
194 return sb1_read_file_ex(filename, 0, -1, u, cprintf, err); 194 return sb1_read_file_ex(filename, 0, -1, u, cprintf, err);
195} 195}
196 196
197struct sb1_file_t *sb1_read_file_ex(const char *filename, size_t offset, size_t size, void *u, 197struct sb1_file_t *sb1_read_file_ex(const char *filename, size_t offset, size_t size, void *u,
198 sb1_color_printf cprintf, enum sb1_error_t *err) 198 generic_printf_t cprintf, enum sb1_error_t *err)
199{ 199{
200 #define fatal(e, ...) \ 200 #define fatal(e, ...) \
201 do { if(err) *err = e; \ 201 do { if(err) *err = e; \
@@ -270,7 +270,7 @@ bool sb1_is_key_valid_fast(void *buffer, union xorcrypt_key_t _key[2])
270 return mark == *(uint32_t *)&sector[SECTOR_SIZE - 4 - header->header_size]; 270 return mark == *(uint32_t *)&sector[SECTOR_SIZE - 4 - header->header_size];
271} 271}
272 272
273bool sb1_brute_force(const char *filename, void *u, sb1_color_printf cprintf, 273bool sb1_brute_force(const char *filename, void *u, generic_printf_t cprintf,
274 enum sb1_error_t *err, struct crypto_key_t *key) 274 enum sb1_error_t *err, struct crypto_key_t *key)
275{ 275{
276 #define printf(c, ...) cprintf(u, false, c, __VA_ARGS__) 276 #define printf(c, ...) cprintf(u, false, c, __VA_ARGS__)
@@ -358,7 +358,7 @@ bool sb1_brute_force(const char *filename, void *u, sb1_color_printf cprintf,
358} 358}
359 359
360struct sb1_file_t *sb1_read_memory(void *_buf, size_t filesize, void *u, 360struct sb1_file_t *sb1_read_memory(void *_buf, size_t filesize, void *u,
361 sb1_color_printf cprintf, enum sb1_error_t *err) 361 generic_printf_t cprintf, enum sb1_error_t *err)
362{ 362{
363 struct sb1_file_t *file = NULL; 363 struct sb1_file_t *file = NULL;
364 uint8_t *buf = _buf; 364 uint8_t *buf = _buf;
@@ -606,7 +606,7 @@ void sb1_free(struct sb1_file_t *file)
606 free(file); 606 free(file);
607} 607}
608 608
609void sb1_dump(struct sb1_file_t *file, void *u, sb1_color_printf cprintf) 609void sb1_dump(struct sb1_file_t *file, void *u, generic_printf_t cprintf)
610{ 610{
611 #define printf(c, ...) cprintf(u, false, c, __VA_ARGS__) 611 #define printf(c, ...) cprintf(u, false, c, __VA_ARGS__)
612 #define print_hex(c, p, len, nl) \ 612 #define print_hex(c, p, len, nl) \