diff --git a/.github/workflows/build_main.yml b/.github/workflows/compile_main_branches.yml similarity index 94% rename from .github/workflows/build_main.yml rename to .github/workflows/compile_main_branches.yml index beb129f..a765808 100644 --- a/.github/workflows/build_main.yml +++ b/.github/workflows/compile_main_branches.yml @@ -1,10 +1,10 @@ -name: Compile Main Branch +name: Compile Main Branches on: push: - branches: [ main ] + branches: [ development-tip, stable ] pull_request: - branches: [ main ] + branches: [ development-tip, stable ] release: types: [ created ] diff --git a/deps/libpietendo b/deps/libpietendo index 49c73ab..86c2c39 160000 --- a/deps/libpietendo +++ b/deps/libpietendo @@ -1 +1 @@ -Subproject commit 49c73ab54c661c752fadcae0b34a4474e54e84d9 +Subproject commit 86c2c39730fab8bd9d9abe81b9a2113f5f012d97 diff --git a/src/NcaProcess.cpp b/src/NcaProcess.cpp index db0f87b..5a60744 100644 --- a/src/NcaProcess.cpp +++ b/src/NcaProcess.cpp @@ -488,22 +488,18 @@ void nstool::NcaProcess::displayHeader() if (mContentKey.kak_list.size() > 0 && mCliOutputMode.show_keydata) { fmt::print(" Key Area:\n"); - fmt::print(" <--------------------------------------------------------------------------------------------------------->\n"); - fmt::print(" | IDX | ENCRYPTED KEY | DECRYPTED KEY |\n"); - fmt::print(" |-----|-------------------------------------------------|-------------------------------------------------|\n"); + fmt::print(" <--------------------------------------------------------------------------->\n"); + fmt::print(" | IDX | ENCRYPTED KEY | DECRYPTED KEY |\n"); + fmt::print(" |-----|----------------------------------|----------------------------------|\n"); for (size_t i = 0; i < mContentKey.kak_list.size(); i++) { - fmt::print(" | {:3d} | {:s} | ", mContentKey.kak_list[i].index, tc::cli::FormatUtil::formatBytesAsString(mContentKey.kak_list[i].enc.data(), mContentKey.kak_list[i].enc.size(), true, "")); - + std::string enc_key = tc::cli::FormatUtil::formatBytesAsString(mContentKey.kak_list[i].enc.data(), mContentKey.kak_list[i].enc.size(), true, ""); + std::string dec_key = mContentKey.kak_list[i].decrypted ? tc::cli::FormatUtil::formatBytesAsString(mContentKey.kak_list[i].dec.data(), mContentKey.kak_list[i].dec.size(), true, "") : ""; - if (mContentKey.kak_list[i].decrypted) - fmt::print("{:s}", tc::cli::FormatUtil::formatBytesAsString(mContentKey.kak_list[i].dec.data(), mContentKey.kak_list[i].dec.size(), true, "")); - else - fmt::print(" "); - - fmt::print(" |\n"); + fmt::print(" | {:3d} | {:32s} | {:32s} |\n", mContentKey.kak_list[i].index, enc_key, dec_key); + } - fmt::print(" <--------------------------------------------------------------------------------------------------------->\n"); + fmt::print(" <--------------------------------------------------------------------------->\n"); } if (mCliOutputMode.show_layout) diff --git a/src/version.h b/src/version.h index 2cdcb83..1e71b75 100644 --- a/src/version.h +++ b/src/version.h @@ -2,6 +2,6 @@ #define APP_NAME "NSTool" #define BIN_NAME "nstool" #define VER_MAJOR 1 -#define VER_MINOR 7 +#define VER_MINOR 8 #define VER_PATCH 0 #define AUTHORS "jakcron" \ No newline at end of file