[stage2] Refactor key_derivation type and function declarations

This commit is contained in:
TuxSH
2018-05-11 23:01:13 +02:00
parent eb8573093d
commit 3ac3183c85
5 changed files with 76 additions and 76 deletions

View File

@@ -3,13 +3,13 @@
#include "package1.h"
#include "bct.h"
int package1_parse_boot0(void **package1, size_t *package1_size, nx_keyblob_t *keyblobs, uint32_t *version, FILE *boot0) {
int package1_parse_boot0(void **package1, size_t *package1_size, nx_keyblob_t *keyblobs, uint32_t *revision, FILE *boot0) {
static nvboot_config_table bct = {0}; /* Normal firmware BCT, primary. TODO: check? */
nv_bootloader_info *pk1_info = &bct.bootloader[0]; /* TODO: check? */
size_t fpos, pk1_offset;
if (package1 == NULL || package1_size != NULL || keyblobs == NULL || version == NULL || boot0 == NULL) {
if (package1 == NULL || package1_size != NULL || keyblobs == NULL || revision == NULL || boot0 == NULL) {
errno = EINVAL;
return -1;
}
@@ -25,7 +25,7 @@ int package1_parse_boot0(void **package1, size_t *package1_size, nx_keyblob_t *k
return -1;
}
*version = pk1_info->attribute;
*revision = pk1_info->attribute;
*package1_size = pk1_info->length;
pk1_offset = 0x4000 * pk1_info->start_blk + 0x200 * pk1_info->start_page;