octo
/
Lockpick
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update for libnx v2.3.0 FsBisStorageId syntax

This commit is contained in:
shchmue 2019-08-04 09:47:46 -06:00
parent b65668144f
commit 0c6bb239f0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/KeyCollection.cpp
View File

@ -474,7 +474,7 @@ void KeyCollection::derive_keys() {
FRESULT fr; FRESULT fr;
FIL save_file; FIL save_file;
fsOpenBisStorage(&storage, 31); fsOpenBisStorage(&storage, FsBisStorageId_System);
if (f_mount(&fs, "", 1) || if (f_mount(&fs, "", 1) ||
f_chdir("/save") || f_chdir("/save") ||
f_open(&save_file, "8000000000000043", FA_READ | FA_OPEN_EXISTING)) f_open(&save_file, "8000000000000043", FA_READ | FA_OPEN_EXISTING))
@ -634,7 +634,7 @@ void KeyCollection::get_titlekeys() {
// map of all found rights ids and corresponding titlekeys // map of all found rights ids and corresponding titlekeys
std::unordered_map<std::string, std::string> titlekeys; std::unordered_map<std::string, std::string> titlekeys;
fsOpenBisStorage(&storage, 31); fsOpenBisStorage(&storage, FsBisStorageId_System);
if (f_mount(&fs, "", 1) || f_chdir("/save")) return; if (f_mount(&fs, "", 1) || f_chdir("/save")) return;
if (f_open(&save_file, "80000000000000e1", FA_READ | FA_OPEN_EXISTING)) return; if (f_open(&save_file, "80000000000000e1", FA_READ | FA_OPEN_EXISTING)) return;
while ((common_count != 0) && (titlekeys_dumped < common_count)) { while ((common_count != 0) && (titlekeys_dumped < common_count)) {

2
source/KeyLocation.cpp
View File

@ -101,7 +101,7 @@ void KeyLocation::get_from_memory(u64 tid, u8 seg_mask) {
void KeyLocation::get_keyblobs() { void KeyLocation::get_keyblobs() {
FsStorage boot0; FsStorage boot0;
fsOpenBisStorage(&boot0, 0); fsOpenBisStorage(&boot0, FsBisStorageId_Boot0);
data.resize(0x200 * KNOWN_KEYBLOBS); data.resize(0x200 * KNOWN_KEYBLOBS);
fsStorageRead(&boot0, KEYBLOB_OFFSET, data.data(), data.size()); fsStorageRead(&boot0, KEYBLOB_OFFSET, data.data(), data.size());
fsStorageClose(&boot0); fsStorageClose(&boot0);