From 0c6bb239f094b2466d19175b6beac211608305af Mon Sep 17 00:00:00 2001
From: shchmue <shchmue@gmail.com>
Date: Sun, 4 Aug 2019 09:47:46 -0600
Subject: [PATCH] Update for libnx v2.3.0 FsBisStorageId syntax

---
 source/KeyCollection.cpp | 4 ++--
 source/KeyLocation.cpp   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/KeyCollection.cpp b/source/KeyCollection.cpp
index 7fb23db..c1829b8 100644
--- a/source/KeyCollection.cpp
+++ b/source/KeyCollection.cpp
@@ -474,7 +474,7 @@ void KeyCollection::derive_keys() {
     FRESULT fr;
     FIL save_file;
 
-    fsOpenBisStorage(&storage, 31);
+    fsOpenBisStorage(&storage, FsBisStorageId_System);
     if (f_mount(&fs, "", 1) ||
         f_chdir("/save") ||
         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
     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_open(&save_file, "80000000000000e1", FA_READ | FA_OPEN_EXISTING)) return;
     while ((common_count != 0) && (titlekeys_dumped < common_count)) {
diff --git a/source/KeyLocation.cpp b/source/KeyLocation.cpp
index d53c9dd..27526c9 100644
--- a/source/KeyLocation.cpp
+++ b/source/KeyLocation.cpp
@@ -101,7 +101,7 @@ void KeyLocation::get_from_memory(u64 tid, u8 seg_mask) {
 
 void KeyLocation::get_keyblobs() {
     FsStorage boot0;
-    fsOpenBisStorage(&boot0, 0);
+    fsOpenBisStorage(&boot0, FsBisStorageId_Boot0);
     data.resize(0x200 * KNOWN_KEYBLOBS);
     fsStorageRead(&boot0, KEYBLOB_OFFSET, data.data(), data.size());
     fsStorageClose(&boot0);