From 8c284ba98a6c31d5567d1be305939829ddb54659 Mon Sep 17 00:00:00 2001 From: Jack Date: Sat, 13 May 2023 16:35:39 +0800 Subject: [PATCH 1/6] Reset version to v0.0.0 for development-tip branch. --- src/version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/version.h b/src/version.h index 2cdcb83..1ff741e 100644 --- a/src/version.h +++ b/src/version.h @@ -1,7 +1,7 @@ #pragma once #define APP_NAME "NSTool" #define BIN_NAME "nstool" -#define VER_MAJOR 1 -#define VER_MINOR 7 +#define VER_MAJOR 0 +#define VER_MINOR 0 #define VER_PATCH 0 #define AUTHORS "jakcron" \ No newline at end of file From 49e3729d951b5d47e940a989d5e0d728ed04496f Mon Sep 17 00:00:00 2001 From: Jack Date: Sat, 13 May 2023 16:43:45 +0800 Subject: [PATCH 2/6] Update GitHub actions to reflect new branch names. --- .../workflows/{build_main.yml => compile_main_branches.yml} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename .github/workflows/{build_main.yml => compile_main_branches.yml} (94%) 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 ] From bcd4df2eb4bb51c0c30360af6d9cc819e13cce3f Mon Sep 17 00:00:00 2001 From: Jack Date: Sat, 13 May 2023 16:44:46 +0800 Subject: [PATCH 3/6] Update libpietendo to v0.7.0 --- deps/libpietendo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/libpietendo b/deps/libpietendo index 49c73ab..3e77beb 160000 --- a/deps/libpietendo +++ b/deps/libpietendo @@ -1 +1 @@ -Subproject commit 49c73ab54c661c752fadcae0b34a4474e54e84d9 +Subproject commit 3e77bebc5d5680479d3018de360d79642992e7d6 From 7abcedb7e5d1765616f8d27e8b9be3543c489997 Mon Sep 17 00:00:00 2001 From: Jack Date: Sat, 13 May 2023 16:45:01 +0800 Subject: [PATCH 4/6] Fix formatting of NCA Key Area. --- src/NcaProcess.cpp | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) 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) From b4a86fc826540dcd29c103fcd4d51fd78ec9c3aa Mon Sep 17 00:00:00 2001 From: Jack Date: Sun, 31 Dec 2023 13:58:42 +0800 Subject: [PATCH 5/6] Update libpietendo to v0.7.1 --- deps/libpietendo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/libpietendo b/deps/libpietendo index 3e77beb..86c2c39 160000 --- a/deps/libpietendo +++ b/deps/libpietendo @@ -1 +1 @@ -Subproject commit 3e77bebc5d5680479d3018de360d79642992e7d6 +Subproject commit 86c2c39730fab8bd9d9abe81b9a2113f5f012d97 From 7757a0fa3b07a74c82d24397fc70e8c1e9797f54 Mon Sep 17 00:00:00 2001 From: Jack Date: Sun, 31 Dec 2023 14:03:47 +0800 Subject: [PATCH 6/6] Set version string to 1.8.0 --- src/version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/version.h b/src/version.h index 1ff741e..1e71b75 100644 --- a/src/version.h +++ b/src/version.h @@ -1,7 +1,7 @@ #pragma once #define APP_NAME "NSTool" #define BIN_NAME "nstool" -#define VER_MAJOR 0 -#define VER_MINOR 0 +#define VER_MAJOR 1 +#define VER_MINOR 8 #define VER_PATCH 0 #define AUTHORS "jakcron" \ No newline at end of file