Mirrors/Awoo-Installer
2
0
Fork 0
mirror of https://github.com/Huntereb/Awoo-Installer synced 2024-11-26 13:40:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup NCA verification stuff a little, and misc

Browse source
This commit is contained in:
Huntereb 2019-11-16 12:38:46 -05:00
parent 9d02fbe3e8
commit 11491fb61e
6 changed files with 22 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -43,7 +43,7 @@ SOURCES := source source/ui source/data source/install source/nx source/nx/ipc
DATA := data
INCLUDES := include include/ui include/data include/install include/nx include/nx/ipc include/util include/Plutonium/Plutonium/Output-switch/include
APP_TITLE := Awoo Installer
APP_AUTHOR := Huntereb
APP_AUTHOR := Huntereb & Behemoth
APP_VERSION := 1.1.0
ROMFS := romfs

6
source/install/install_nsp.cpp
View file

@ -130,9 +130,9 @@ namespace tin::install::nsp
if (!Crypto::rsa2048PssVerify(&header.magic, 0x200, header.fixed_key_sig, Crypto::NCAHeaderSignature))
{
int rc = inst::ui::mainApp->CreateShowDialog("NCA validation failed", "The followings NCA's signature failed:\n" + tin::util::GetNcaIdString(ncaId) + "\n\nDo you really want to risk bricking your switch?", {"No", "Of cause not", "*sigh* Yes", "Cancel"}, true);
if (rc != 2)
THROW_FORMAT("Unsigned NCA");
int rc = inst::ui::mainApp->CreateShowDialog("Invalid NCA signature detected!", "The software you are trying to install may contain malicious contents!\nOnly install improperly signed software from trustworthy sources!\nThis warning can be disabled in Awoo Installer's settings.\n\nAre you sure you want to continue the installation?", {"Cancel", "Yes, I want a brick"}, false);
if (rc != 1)
THROW_FORMAT(("The requested NCA (" + tin::util::GetNcaIdString(ncaId) + ") is not properly signed").c_str());
declinedValidation = true;
}
}

6
source/install/install_nsp_remote.cpp
View file

@ -105,9 +105,9 @@ namespace tin::install::nsp
if (!Crypto::rsa2048PssVerify(&header.magic, 0x200, header.fixed_key_sig, Crypto::NCAHeaderSignature))
{
int rc = inst::ui::mainApp->CreateShowDialog("NCA validation failed", "The followings NCA's signature failed:\n" + tin::util::GetNcaIdString(ncaId) + "\n\nDo you really want to risk bricking your switch?", {"No", "Of cause not", "*sigh* Yes", "Cancel"}, true);
if (rc != 2)
THROW_FORMAT("Unsigned NCA");
int rc = inst::ui::mainApp->CreateShowDialog("Invalid NCA signature detected!", "The software you are trying to install may contain malicious contents!\nOnly install improperly signed software from trustworthy sources!\nThis warning can be disabled in Awoo Installer's settings.\n\nAre you sure you want to continue the installation?", {"Cancel", "Yes, I want a brick"}, false);
if (rc != 1)
THROW_FORMAT(("The requested NCA (" + tin::util::GetNcaIdString(ncaId) + ") is not properly signed").c_str());
declinedValidation = true;
}
}

1
source/netInstall.cpp
View file

@ -145,6 +145,7 @@ namespace netInstStuff{
printf("%s\n", "Preparing installation");
inst::ui::setInstInfoText("Preparing installation...");
inst::ui::setInstBarPerc(0);
install.Prepare();
install.Begin();

1
source/nspInstall.cpp
View file

@ -114,6 +114,7 @@ namespace nspInstStuff {
printf("Preparing installation\n");
inst::ui::setInstInfoText("Preparing installation...");
inst::ui::setInstBarPerc(0);
task.Prepare();
task.Begin();

34
source/ui/optionsPage.cpp
View file

@ -12,7 +12,7 @@
namespace inst::ui {
extern MainApplication *mainApp;
std::vector<std::string> ourMenuEntries = {"Ignore minimum firmware version required by NSP files", "Validate NCA signature (brick protection)", "Ask to delete NSP files after installation", "Remove anime", "Signature patches source URL: "};
std::vector<std::string> ourMenuEntries = {"Ignore minimum firmware version required by NSP files", "Verify NCA signatures before installation", "Ask to delete NSP files after installation", "Remove anime", "Signature patches source URL: "};
optionsPage::optionsPage() : Layout::Layout() {
this->SetBackgroundColor(COLOR("#670000FF"));
@ -80,8 +80,7 @@ namespace inst::ui {
mainApp->LoadLayout(mainApp->mainPage);
}
if ((Down & KEY_A) || (Up & KEY_TOUCH)) {
Result rc=0;
char tmpoutstr[128] = {0};
std::string keyboardResult;
switch (this->menu->GetSelectedIndex()) {
case 0:
inst::config::ignoreReqVers = !inst::config::ignoreReqVers;
@ -89,13 +88,14 @@ namespace inst::ui {
optionsPage::setMenuText();
break;
case 1:
inst::config::validateNCAs = !inst::config::validateNCAs;
if (inst::config::validateNCAs) {
if (inst::ui::mainApp->CreateShowDialog("Warning!", "Some installable files my contain malicious contents! Only disable this\nfeature if you are absolutely certain the software you will be installing\nis trustworthy!\n\nDo you still want to disable NCA signature verification?", {"Cancel", "Yes, I want a brick"}, false) == 1) inst::config::validateNCAs = false;
} else inst::config::validateNCAs = true;
inst::config::setConfig();
optionsPage::setMenuText();
break;
case 2:
if (inst::config::deletePrompt) inst::config::deletePrompt = false;
else inst::config::deletePrompt = true;
inst::config::deletePrompt = !inst::config::deletePrompt;
inst::config::setConfig();
optionsPage::setMenuText();
break;
@ -114,26 +114,18 @@ namespace inst::ui {
optionsPage::setMenuText();
break;
case 4:
SwkbdConfig kbd;
rc = swkbdCreate(&kbd, 0);
if (R_SUCCEEDED(rc)) {
swkbdConfigMakePresetDefault(&kbd);
swkbdConfigSetGuideText(&kbd, "Enter the URL to obtain Signature Patches from");
swkbdConfigSetInitialText(&kbd, inst::config::sigPatchesUrl.c_str());
rc = swkbdShow(&kbd, tmpoutstr, sizeof(tmpoutstr));
swkbdClose(&kbd);
if (R_SUCCEEDED(rc) && tmpoutstr[0] != 0) {
inst::config::sigPatchesUrl = tmpoutstr;
inst::config::setConfig();
optionsPage::setMenuText();
}
keyboardResult = inst::util::softwareKeyboard("Enter the URL to obtain Signature Patches from", inst::config::sigPatchesUrl.c_str(), 500);
if (keyboardResult.size() > 0) {
inst::config::sigPatchesUrl = keyboardResult;
inst::config::setConfig();
optionsPage::setMenuText();
}
break;
case 5:
inst::ui::mainApp->CreateShowDialog("Thanks to the following people!", "- HookedBehemoth for screen-nx and his Plutonium fork\n- Adubbz and other contributors for Tinfoil\n- XorTroll for Plutonium and Goldleaf\n- blawar (wife beater) and nicoboss for NSZ support\n- The kind folks at the AtlasNX Discuck\n- The also kind folks at the RetroNX Discuck\n- namako8982 for the Momiji art\n- TheXzoron for being a baka", {"Close"}, true);
inst::ui::mainApp->CreateShowDialog("Thanks to the following people!", "- HookedBehemoth for A LOT of contributions\n- Adubbz and other contributors for Tinfoil\n- XorTroll for Plutonium and Goldleaf\n- blawar (wife beater) and nicoboss for NSZ support\n- The kind folks at the AtlasNX Discuck\n- The also kind folks at the RetroNX Discuck\n- namako8982 for the Momiji art\n- TheXzoron for being a baka", {"Close"}, true);
break;
case 6:
inst::ui::mainApp->CreateShowDialog("Third Party Licenses", "Licenses to the libraries and software used in Awoo Installer are packaged with each release\nwithin the source code, or are distributed upon compilation of the software.\nPlease see the releases page for a copy of the source code and license information.", {"Close"}, true);
inst::ui::mainApp->CreateShowDialog("Third Party Licenses", "Licenses to the libraries and software used in Awoo Installer are\npackaged with each release within the source code, or are distributed\nupon compilation of the software. Please see the releases page for a\ncopy of the source code and license information.", {"Close"}, true);
break;
default:
break;