devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

imxtools: Replace use of "byte" with its underlying uint8_t.

Browse source 
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
This commit is contained in:
Dominik Riebeling 2020-08-08 21:25:50 +02:00
parent 387a45923c
commit 815b289cb3
8 changed files with 69 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

8
utils/imxtools/sbtools/misc.c
View file

@ -58,7 +58,7 @@ void *xmalloc(size_t s)
return r;
}
int convxdigit(char digit, byte *val)
int convxdigit(char digit, uint8_t *val)
{
if(digit >= '0' && digit <= '9')
{
@ -127,7 +127,7 @@ bool parse_key(char **pstr, struct crypto_key_t *key)
{
for(int j = 0; j < 128; j++)
{
byte a, b;
uint8_t a, b;
if(convxdigit(str[2 * j], &a) || convxdigit(str[2 * j + 1], &b))
return false;
key->u.xor_key[j / 64].key[j % 64] = (a << 4) | b;
@ -143,7 +143,7 @@ bool parse_key(char **pstr, struct crypto_key_t *key)
return false;
for(int j = 0; j < 16; j++)
{
byte a, b;
uint8_t a, b;
if(convxdigit(str[2 * j], &a) || convxdigit(str[2 * j + 1], &b))
return false;
key->u.key[j] = (a << 4) | b;
@ -243,7 +243,7 @@ bool add_keys_from_file(const char *key_file)
return true;
}
void print_hex(void *user, misc_printf_t printf, byte *data, int len, bool newline)
void print_hex(void *user, misc_printf_t printf, uint8_t *data, int len, bool newline)
{
for(int i = 0; i < len; i++)
printf(user, "%02X ", data[i]);