mirrors/Lockpick
1
0
Fork 0
mirror of https://github.com/shchmue/Lockpick.git synced 2024-12-22 13:55:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not overwrite newer keyfile from Lockpick_RCM

Browse source
This commit is contained in:
shchmue 2019-03-05 13:09:37 -05:00
parent 986468a32b
commit 867d2d6520
4 changed files with 36 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -32,7 +32,7 @@ include $(DEVKITPRO)/libnx/switch_rules
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
APP_TITLE := Lockpick APP_TITLE := Lockpick
APP_AUTHOR := shchmue APP_AUTHOR := shchmue
APP_VERSION := 1.2.1 APP_VERSION := 1.2.2
TARGET := $(subst $e ,_,$(notdir $(APP_TITLE))) TARGET := $(subst $e ,_,$(notdir $(APP_TITLE)))
BUILD := build BUILD := build

5
changelog.md
View file

@ -1,4 +1,9 @@
# Changelog # Changelog
## Version 1.2.2
* Do not overwrite existing keyfile that contains master_key_07
* Read eticket_rsa_kek from existing keyfile in case user is only running this for titlekeys
* Create /switch folder if needed
## Version 1.2.1 ## Version 1.2.1
* Generate bis keys without master keys * Generate bis keys without master keys
* Update file size check to support Hekate v4.8 TSEC dump * Update file size check to support Hekate v4.8 TSEC dump

4
source/Common.cpp
View file

@ -142,8 +142,8 @@ namespace Common {
memset(framebuf, 0, gfxGetFramebufferSize()); memset(framebuf, 0, gfxGetFramebufferSize());
#endif #endif
draw_text(0x010, 0x020, YELLOW, "Lockpick! by shchmue"); draw_text(0x010, 0x020, YELLOW, "Lockpick! by shchmue");
draw_text(0x190, 0x020, YELLOW, "Note: Only dumps keys 00-06 on 6.2.0"); draw_text(0x190, 0x020, YELLOW, "Note: This can only dump keys 00-05 (or 00-06 on 6.2.0)");
draw_text(0x190, 0x040, YELLOW, " and keys 00-05 on all other firmwares including 7.0.0+"); draw_text(0x190, 0x040, YELLOW, "Use Lockpick_RCM for newer keys on firmware 7.0.0+!");
draw_set_rect(814, 452 + 42 * 0, 450, 42, FLAG_RED); draw_set_rect(814, 452 + 42 * 0, 450, 42, FLAG_RED);
draw_set_rect(814, 452 + 42 * 1, 450, 42, FLAG_ORANGE); draw_set_rect(814, 452 + 42 * 1, 450, 42, FLAG_ORANGE);

32
source/KeyCollection.cpp
View file

@ -21,6 +21,7 @@
#include <algorithm> #include <algorithm>
#include <chrono> #include <chrono>
#include <filesystem>
#include <functional> #include <functional>
#include <string> #include <string>
#include <unordered_map> #include <unordered_map>
@ -228,8 +229,8 @@ void KeyCollection::get_keys() {
} else { } else {
Common::draw_text(0x010, 0x60, RED, "Get Tegra keys..."); Common::draw_text(0x010, 0x60, RED, "Get Tegra keys...");
Common::draw_text(0x190, 0x60, RED, "Failed"); Common::draw_text(0x190, 0x60, RED, "Failed");
Common::draw_text(0x190, 0x20, RED, "Warning: Saving limited keyset."); Common::draw_text(0x2a0, 0x60, RED, "Warning: Saving limited keyset.");
Common::draw_text(0x190, 0x40, RED, "Dump Tegra keys with payload and run again to get all keys."); Common::draw_text(0x2a0, 0x80, RED, "Dump TSEC and Fuses with Hekate.");
} }
profiler_time = profile(&KeyCollection::get_memory_keys, *this); profiler_time = profile(&KeyCollection::get_memory_keys, *this);
@ -241,8 +242,31 @@ void KeyCollection::get_keys() {
profiler_time = profile(&KeyCollection::derive_keys, *this); profiler_time = profile(&KeyCollection::derive_keys, *this);
Common::draw_text_with_time(0x10, 0x0c0, GREEN, "Derive remaining keys...", profiler_time); Common::draw_text_with_time(0x10, 0x0c0, GREEN, "Derive remaining keys...", profiler_time);
profiler_time = profile(&KeyCollection::save_keys, *this); // avoid crash on CFWs that don't use /switch folder
Common::draw_text_with_time(0x10, 0x0e0, GREEN, "Saving keys to keyfile...", profiler_time); if (!std::filesystem::exists("/switch"))
std::filesystem::create_directory("/switch");
// since Lockpick_RCM can dump newer keys, check for existing keyfile
bool Lockpick_RCM_file_found = false;
if (std::filesystem::exists("/switch/prod.keys")) {
FILE *key_file = fopen("/switch/prod.keys", "r");
char line[0x200];
while (fgets(line, sizeof(line), key_file)) {
if (strncmp("master_key_07", line, 13) == 0) {
Lockpick_RCM_file_found = true;
} else if (!eticket_rsa_kek.found() && (strncmp("eticket_rsa_kek", line, 15)) == 0) {
// grab eticket_rsa_kek from existing file to make sure we can dump titlekeys
eticket_rsa_kek = Key("eticket_rsa_kek", 0x10, Common::key_string_to_byte_vector(line));
}
}
fclose(key_file);
}
if (!Lockpick_RCM_file_found) {
profiler_time = profile(&KeyCollection::save_keys, *this);
Common::draw_text_with_time(0x10, 0x0e0, GREEN, "Saving keys to keyfile...", profiler_time);
} else {
Common::draw_text(0x10, 0x0e0, YELLOW, "Saving keys to keyfile...");
Common::draw_text(0x190, 0x0e0, YELLOW, "Newer keyfile found. Skipped overwriting keys");
}
total_time.stop(); total_time.stop();
Common::draw_line(0x8, 0xf0, 0x280, GREEN); Common::draw_line(0x8, 0xf0, 0x280, GREEN);