summaryrefslogtreecommitdiff
path: root/utils/imxtools/sbtools/misc.h
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2020-08-08 21:25:50 +0200
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2020-10-18 19:08:32 +0200
commit815b289cb3438ed566b3e9dc5074fe12e4b98f46 (patch)
treef4a92ac428098eda3a82da4549652b2ea079a599 /utils/imxtools/sbtools/misc.h
parent387a45923c2ea6b223584815c7cd796ae064e22e (diff)
downloadrockbox-815b289cb3438ed566b3e9dc5074fe12e4b98f46.tar.gz
rockbox-815b289cb3438ed566b3e9dc5074fe12e4b98f46.zip
imxtools: Replace use of "byte" with its underlying uint8_t.
libtomcrypt uses a macro "byte" which conflicts with this type. Since the underlying type is uint8_t and there's no real benefit from using a custom type use the actual underlying type. Change-Id: I982c9b8bdcb657b99fa645a5235303af7afda25b
Diffstat (limited to 'utils/imxtools/sbtools/misc.h')
-rw-r--r--utils/imxtools/sbtools/misc.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/utils/imxtools/sbtools/misc.h b/utils/imxtools/sbtools/misc.h
index 5c6b2fc007..65386a728f 100644
--- a/utils/imxtools/sbtools/misc.h
+++ b/utils/imxtools/sbtools/misc.h
@@ -22,6 +22,7 @@
22#define __MISC_H__ 22#define __MISC_H__
23 23
24#include <stdbool.h> 24#include <stdbool.h>
25#include <stdint.h>
25#include "crypto.h" 26#include "crypto.h"
26 27
27#define _STR(a) #a 28#define _STR(a) #a
@@ -53,8 +54,8 @@ void augment_array_ex(void **arr, size_t elem_sz, int *cnt, int *capacity,
53 void *aug, int aug_cnt); 54 void *aug, int aug_cnt);
54void generate_random_data(void *buf, size_t sz); 55void generate_random_data(void *buf, size_t sz);
55void *xmalloc(size_t s); 56void *xmalloc(size_t s);
56int convxdigit(char digit, byte *val); 57int convxdigit(char digit, uint8_t *val);
57void print_hex(void *user, misc_printf_t printf, byte *data, int len, bool newline); 58void print_hex(void *user, misc_printf_t printf, uint8_t *data, int len, bool newline);
58void add_keys(key_array_t ka, int kac); 59void add_keys(key_array_t ka, int kac);
59bool parse_key(char **str, struct crypto_key_t *key); 60bool parse_key(char **str, struct crypto_key_t *key);
60bool add_keys_from_file(const char *key_file); 61bool add_keys_from_file(const char *key_file);