From 3a4da16b1eb21969e3e1a8128ae8b020d653a8b9 Mon Sep 17 00:00:00 2001
From: Steven Smith <Steveice10@gmail.com>
Date: Thu, 30 Jun 2016 09:57:37 -0700
Subject: [PATCH] Remove seed file support, report seed-retrieval HTTP error
 codes.

---
 source/core/util.c                    | 67 ++++++++++-----------------
 source/core/util.h                    |  1 +
 source/ui/section/action/importseed.c |  2 +
 3 files changed, 28 insertions(+), 42 deletions(-)

diff --git a/source/core/util.c b/source/core/util.c
index 48bb240..1c3fc40 100644
--- a/source/core/util.c
+++ b/source/core/util.c
@@ -241,7 +241,7 @@ void util_get_parent_path(char* out, const char* path, u32 size) {
 static Result FSUSER_AddSeed(u64 titleId, const void* seed) {
     u32 *cmdbuf = getThreadCommandBuffer();
 
-    cmdbuf[0] = 0x087a0180;
+    cmdbuf[0] = 0x087A0180;
     cmdbuf[1] = (u32) (titleId & 0xFFFFFFFF);
     cmdbuf[2] = (u32) (titleId >> 32);
     memcpy(&cmdbuf[3], seed, 16);
@@ -253,65 +253,48 @@ static Result FSUSER_AddSeed(u64 titleId, const void* seed) {
     return ret;
 }
 
-Result util_import_seed(u64 titleId) {
-    char pathBuf[64];
-    snprintf(pathBuf, 64, "/fbi/seed/%016llX.dat", titleId);
+static u32 import_response_code = 0;
 
+Result util_import_seed(u64 titleId) {
     Result res = 0;
 
-    FS_Path* fsPath = util_make_path_utf8(pathBuf);
-    if(fsPath != NULL) {
-        u8 seed[16];
+    u8 region = CFG_REGION_USA;
+    CFGU_SecureInfoGetRegion(&region);
 
-        Handle fileHandle = 0;
-        if(R_SUCCEEDED(res = FSUSER_OpenFileDirectly(&fileHandle, ARCHIVE_SDMC, fsMakePath(PATH_EMPTY, ""), *fsPath, FS_OPEN_READ, 0))) {
-            u32 bytesRead = 0;
-            res = FSFILE_Read(fileHandle, &bytesRead, 0, seed, sizeof(seed));
+    if(region <= CFG_REGION_TWN) {
+        static const char* regionStrings[] = {"JP", "US", "GB", "GB", "HK", "KR", "TW"};
 
-            FSFILE_Close(fileHandle);
-        }
+        char url[128];
+        snprintf(url, 128, "https://kagiya-ctr.cdn.nintendo.net/title/0x%016llX/ext_key?country=%s", titleId, regionStrings[region]);
 
-        util_free_path_utf8(fsPath);
+        httpcContext context;
+        if(R_SUCCEEDED(res = httpcOpenContext(&context, HTTPC_METHOD_GET, url, 1))) {
+            if(R_SUCCEEDED(res = httpcSetSSLOpt(&context, SSLCOPT_DisableVerify)) && R_SUCCEEDED(res = httpcBeginRequest(&context)) && R_SUCCEEDED(res = httpcGetResponseStatusCode(&context, &import_response_code, 0))) {
+                if(import_response_code == 200) {
+                    u8 seed[16];
 
-        if(R_FAILED(res)) {
-            static const char* regionStrings[] = {"JP", "US", "GB", "GB", "HK", "KR", "TW"};
-
-            u8 region = CFG_REGION_USA;
-            CFGU_SecureInfoGetRegion(&region);
-
-            if(region <= CFG_REGION_TWN) {
-                char url[128];
-                snprintf(url, 128, "https://kagiya-ctr.cdn.nintendo.net/title/0x%016llX/ext_key?country=%s", titleId, regionStrings[region]);
-
-                httpcContext context;
-                if(R_SUCCEEDED(res = httpcOpenContext(&context, HTTPC_METHOD_GET, url, 1))) {
-                    u32 responseCode = 0;
-                    if(R_SUCCEEDED(res = httpcSetSSLOpt(&context, SSLCOPT_DisableVerify)) && R_SUCCEEDED(res = httpcBeginRequest(&context)) && R_SUCCEEDED(res = httpcGetResponseStatusCode(&context, &responseCode, 0))) {
-                        if(responseCode == 200) {
-                            u32 bytesRead = 0;
-                            res = httpcDownloadData(&context, seed, sizeof(seed), &bytesRead);
-                        } else {
-                            res = R_FBI_HTTP_RESPONSE_CODE;
-                        }
+                    u32 bytesRead = 0;
+                    if(R_SUCCEEDED(res = httpcDownloadData(&context, seed, sizeof(seed), &bytesRead))) {
+                        res = FSUSER_AddSeed(titleId, seed);
                     }
-
-                    httpcCloseContext(&context);
+                } else {
+                    res = R_FBI_HTTP_RESPONSE_CODE;
                 }
-            } else {
-                res = R_FBI_OUT_OF_RANGE;
             }
-        }
 
-        if(R_SUCCEEDED(res)) {
-            res = FSUSER_AddSeed(titleId, seed);
+            httpcCloseContext(&context);
         }
     } else {
-        res = R_FBI_OUT_OF_MEMORY;
+        res = R_FBI_OUT_OF_RANGE;
     }
 
     return res;
 }
 
+u32 util_get_seed_response_code() {
+    return import_response_code;
+}
+
 static u32 sigSizes[6] = {0x240, 0x140, 0x80, 0x240, 0x140, 0x80};
 
 u64 util_get_cia_title_id(u8* cia) {
diff --git a/source/core/util.h b/source/core/util.h
index 7ecd59f..038085b 100644
--- a/source/core/util.h
+++ b/source/core/util.h
@@ -52,6 +52,7 @@ void util_get_path_file(char* out, const char* path, u32 size);
 void util_get_parent_path(char* out, const char* path, u32 size);
 
 Result util_import_seed(u64 titleId);
+u32 util_get_seed_response_code();
 
 u64 util_get_cia_title_id(u8* cia);
 u64 util_get_ticket_title_id(u8* ticket);
diff --git a/source/ui/section/action/importseed.c b/source/ui/section/action/importseed.c
index 253fb2d..5a2e697 100644
--- a/source/ui/section/action/importseed.c
+++ b/source/ui/section/action/importseed.c
@@ -23,6 +23,8 @@ static void action_import_seed_update(ui_view* view, void* data, float* progress
 
     if(R_SUCCEEDED(res)) {
         prompt_display("Success", "Seed imported.", COLOR_TEXT, false, info, ui_draw_title_info, NULL);
+    } else if(res == R_FBI_HTTP_RESPONSE_CODE) {
+        error_display(NULL, NULL, "Failed to import seed.\nHTTP server returned response code %d", util_get_seed_response_code());
     } else {
         error_display_res(info, ui_draw_title_info, res, "Failed to import seed.");
     }