Mirrors/hactool
2
0
Fork 0
mirror of https://github.com/SciresM/hactool synced 2024-11-22 12:03:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

pk11: add support for decrypted pk11

Browse source
This commit is contained in:
Michael Scire 2020-06-01 15:10:00 -07:00
parent c3415cf25e
commit ba4c4b6990
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
packages.c
View file

@ -51,18 +51,20 @@ void pk11_process(pk11_ctx_t *ctx) {
memcpy(&ctx->metadata, ctx->mariko_bl, sizeof(ctx->metadata)); memcpy(&ctx->metadata, ctx->mariko_bl, sizeof(ctx->metadata));
uint32_t enc_size = ctx->mariko_oem_header.bl_size - sizeof(ctx->metadata); if (memcmp(&ctx->metadata, ctx->mariko_bl + 0x20, sizeof(ctx->metadata)) != 0) {
if (enc_size > 0) { uint32_t enc_size = ctx->mariko_oem_header.bl_size - sizeof(ctx->metadata);
aes_ctx_t *crypt_ctx = new_aes_ctx(ctx->tool_ctx->settings.keyset.mariko_bek, 0x10, AES_MODE_CBC); if (enc_size > 0) {
aes_ctx_t *crypt_ctx = new_aes_ctx(ctx->tool_ctx->settings.keyset.mariko_bek, 0x10, AES_MODE_CBC);
aes_setiv(crypt_ctx, ctx->mariko_bl + 0x10, 0x10); aes_setiv(crypt_ctx, ctx->mariko_bl + 0x10, 0x10);
aes_decrypt(crypt_ctx, ctx->mariko_bl + 0x20, ctx->mariko_bl + 0x20, enc_size); aes_decrypt(crypt_ctx, ctx->mariko_bl + 0x20, ctx->mariko_bl + 0x20, enc_size);
free_aes_ctx(crypt_ctx); free_aes_ctx(crypt_ctx);
if (memcmp(&ctx->metadata, ctx->mariko_bl + 0x20, sizeof(ctx->metadata)) != 0) { if (memcmp(&ctx->metadata, ctx->mariko_bl + 0x20, sizeof(ctx->metadata)) != 0) {
fprintf(stderr, "Failed to decrypt Mariko PK11! Is correct key present?\n"); fprintf(stderr, "Failed to decrypt Mariko PK11! Is correct key present?\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
}
} }
} }
} else { } else {
@ -127,10 +129,8 @@ void pk11_process(pk11_ctx_t *ctx) {
} }
} }
int decrypted = 0; int decrypted = ctx->pk11->magic == MAGIC_PK11;
if (ctx->is_mariko) { if (!ctx->is_mariko && !decrypted) {
decrypted = ctx->pk11->magic == MAGIC_PK11;
} else {
pk11_t dec_header; pk11_t dec_header;
aes_ctx_t *crypt_ctx = NULL; aes_ctx_t *crypt_ctx = NULL;
if (ctx->is_modern) { if (ctx->is_modern) {
@ -227,7 +227,7 @@ void pk11_save(pk11_ctx_t *ctx) {
} }
memcpy(decrypted_bin, &ctx->mariko_oem_header, sizeof(ctx->mariko_oem_header)); memcpy(decrypted_bin, &ctx->mariko_oem_header, sizeof(ctx->mariko_oem_header));
memcpy(decrypted_bin + sizeof(ctx->mariko_oem_header), ctx->mariko_bl, ctx->mariko_oem_header.bl_size); memcpy(decrypted_bin + sizeof(ctx->mariko_oem_header), ctx->mariko_bl, ctx->mariko_oem_header.bl_size);
save_buffer_to_directory_file(decrypted_bin, sizeof(ctx->stage1) + ctx->pk11_size, dirpath, "Decrypted.bin"); save_buffer_to_directory_file(decrypted_bin, sizeof(ctx->mariko_oem_header) + ctx->mariko_oem_header.bl_size, dirpath, "Decrypted.bin");
free(decrypted_bin); free(decrypted_bin);
} else { } else {
char *decrypted_bin = malloc(sizeof(ctx->stage1) + ctx->pk11_size); char *decrypted_bin = malloc(sizeof(ctx->stage1) + ctx->pk11_size);