2 Commits
v1.1 ... v1.1.1

Author SHA1 Message Date
49c6fd8dc7 Bump version to v1.1.1 2018-12-31 19:54:59 -05:00
4d460e9509 No longer try dumping SD seed or ES keys on 1.0.0 2018-12-31 19:52:54 -05:00
2 changed files with 16 additions and 7 deletions

View File

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

View File

@ -366,13 +366,15 @@ void KeyCollection::get_memory_keys() {
header_key_source.find_key(FSData.data);
ESRodata.get_from_memory(ES_TID, SEG_RODATA);
for (auto k : es_keys)
k->find_key(ESRodata.data);
SSLRodata.get_from_memory(SSL_TID, SEG_RODATA);
for (auto k : ssl_keys)
k->find_key(SSLRodata.data);
if (!kernelAbove200())
return;
ESRodata.get_from_memory(ES_TID, SEG_RODATA);
for (auto k : es_keys)
k->find_key(ESRodata.data);
}
void KeyCollection::derive_keys() {
@ -435,6 +437,8 @@ void KeyCollection::derive_keys() {
u32 bytes_read, file_pos = 0;
// dump sd seed
if (!kernelAbove200())
return;
FILE *sd_private = fopen("/Nintendo/Contents/private", "rb");
if (!sd_private) return;
fread(seed_vector, 0x10, 1, sd_private);
@ -445,8 +449,13 @@ void KeyCollection::derive_keys() {
FIL save_file;
fsOpenBisStorage(&storage, 31);
if (f_mount(&fs, "", 1) || f_chdir("/save")) return;
if (f_open(&save_file, "8000000000000043", FA_READ | FA_OPEN_EXISTING)) return;
if (f_mount(&fs, "", 1) ||
f_chdir("/save") ||
f_open(&save_file, "8000000000000043", FA_READ | FA_OPEN_EXISTING))
{
fsStorageClose(&storage);
return;
}
for (;;) {
fr = f_read(&save_file, buffer, 0x10, &bytes_read);