Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sbtools: fix a few memcpy with overlapping src/dst, fix a parsing bug (would access one byte paste the end of the buffer)

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29868 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Amaury Pouly 2011-05-13 12:20:49 +00:00
parent a29ef617f3
commit bdb8f4c15c
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
utils/sbtools/aes128.c
View file

@ -155,7 +155,7 @@ void EncryptAES(byte *msg, byte *key, byte *c) {
expand_key(key,keys); expand_key(key,keys);
// First Round // First Round
memcpy(c, msg, 16); memmove(c, msg, 16);
xor_round_key(c,keys,0); xor_round_key(c,keys,0);
// Middle rounds // Middle rounds

2
utils/sbtools/elftosb.c
View file

@ -307,7 +307,7 @@ static void parse_identifier(char **ptr, char *end, struct lexem_t *lexem)
static void next_lexem(char **ptr, char *end, struct lexem_t *lexem) static void next_lexem(char **ptr, char *end, struct lexem_t *lexem)
{ {
#define ret_simple(t, advance) ({(*ptr) += advance; lexem->type = t; return;}) #define ret_simple(t, advance) ({(*ptr) += advance; lexem->type = t; return;})
while(true) while(*ptr != end)
{ {
/* skip whitespace */ /* skip whitespace */
if(**ptr == ' ' || **ptr == '\t' || **ptr == '\n' || **ptr == '\r') if(**ptr == ' ' || **ptr == '\t' || **ptr == '\n' || **ptr == '\r')

2
utils/sbtools/sha1.c
View file

@ -103,7 +103,7 @@ void sha_1_block(struct sha_1_params_t *params, uint32_t cur_hash[5], byte *data
#define w params->w #define w params->w
memcpy(w, data, 64); memmove(w, data, 64);
for(int i = 0; i < 16; i++) for(int i = 0; i < 16; i++)
byte_swap32(&w[i]); byte_swap32(&w[i]);