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

imxtools: rework key/IV overriding logic

Browse source 
The overriding of the IV and real key should be the exception, there is no
need to manually set them to false.

Change-Id: Id66754f20a79aa5c1a991839345d1242e0aa587d
This commit is contained in:
Amaury Pouly 2014-08-31 14:30:56 +02:00
parent 2df6b1fc43
commit a5950c69af
3 changed files with 0 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rbutil/mkimxboot/mkimxboot.c
View file

@ -275,10 +275,6 @@ static enum imx_error_t patch_std_zero_host_play(int jump_before,
* call in the ____ section and get rid of everything else. In recovery mode,
* we give 0xfee1dead as argument */
/* Do not override real key and IV */
sb_file->override_crypto_iv = false;
sb_file->override_real_key = false;
/* used to manipulate entries */
int nr_boot_inst = rb_fw_get_sb_inst_count(&boot_fw);

2
utils/imxtools/sbtools/sb.c
View file

@ -935,9 +935,7 @@ struct sb_file_t *sb_read_memory(void *_buf, size_t filesize, unsigned flags, vo
printf(GREEN, " IV : ");
print_hex(YELLOW, buf, 16, true);
sb_file->override_real_key = true;
memcpy(sb_file->real_key, real_key, 16);
sb_file->override_crypto_iv = true;
memcpy(sb_file->crypto_iv, buf, 16);
}

7
utils/imxtools/sbtools/sbtoelf.c
View file

@ -413,14 +413,7 @@ int main(int argc, char **argv)
sb_dump(file, NULL, generic_std_printf);
}
if(loopback)
{
/* sb_read_file will fill real key and IV but we don't want to override
* them when looping back otherwise the output will be inconsistent and
* garbage */
file->override_real_key = false;
file->override_crypto_iv = false;
sb_write_file(file, loopback, 0, generic_std_printf);
}
sb_free(file);
}
else if(force_sb1 || ver == SB_VERSION_1)