mirrors/nstool
1
0
Fork 0
mirror of https://github.com/jakcron/nstool.git synced 2024-12-22 10:45:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #110 from jakcron/v1.8.0-release

Browse source 
Update NSTool to v1.8.0
This commit is contained in:
Jack 2023-12-31 14:28:11 +08:00 committed by GitHub
parent d87c0fcf1c 7757a0fa3b
commit da13b0fdee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.github/workflows/build_main.yml → .github/workflows/compile_main_branches.yml vendored
View file

@ -1,10 +1,10 @@
name: Compile Main Branch name: Compile Main Branches
on: on:
push: push:
branches: [ main ] branches: [ development-tip, stable ]
pull_request: pull_request:
branches: [ main ] branches: [ development-tip, stable ]
release: release:
types: [ created ] types: [ created ]

2
deps/libpietendo vendored

@ -1 +1 @@
Subproject commit 49c73ab54c661c752fadcae0b34a4474e54e84d9 Subproject commit 86c2c39730fab8bd9d9abe81b9a2113f5f012d97

20
src/NcaProcess.cpp
View file

@ -488,22 +488,18 @@ void nstool::NcaProcess::displayHeader()
if (mContentKey.kak_list.size() > 0 && mCliOutputMode.show_keydata) if (mContentKey.kak_list.size() > 0 && mCliOutputMode.show_keydata)
{ {
fmt::print(" Key Area:\n"); fmt::print(" Key Area:\n");
fmt::print(" <--------------------------------------------------------------------------------------------------------->\n"); fmt::print(" <--------------------------------------------------------------------------->\n");
fmt::print(" | IDX | ENCRYPTED KEY | DECRYPTED KEY |\n"); fmt::print(" | IDX | ENCRYPTED KEY | DECRYPTED KEY |\n");
fmt::print(" |-----|-------------------------------------------------|-------------------------------------------------|\n"); fmt::print(" |-----|----------------------------------|----------------------------------|\n");
for (size_t i = 0; i < mContentKey.kak_list.size(); i++) 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, "") : "<unable to decrypt>";
if (mContentKey.kak_list[i].decrypted) fmt::print(" | {:3d} | {:32s} | {:32s} |\n", mContentKey.kak_list[i].index, enc_key, dec_key);
fmt::print("{:s}", tc::cli::FormatUtil::formatBytesAsString(mContentKey.kak_list[i].dec.data(), mContentKey.kak_list[i].dec.size(), true, ""));
else
fmt::print("<unable to decrypt> ");
fmt::print(" |\n");
} }
fmt::print(" <--------------------------------------------------------------------------------------------------------->\n"); fmt::print(" <--------------------------------------------------------------------------->\n");
} }
if (mCliOutputMode.show_layout) if (mCliOutputMode.show_layout)

2
src/version.h
View file

@ -2,6 +2,6 @@
#define APP_NAME "NSTool" #define APP_NAME "NSTool"
#define BIN_NAME "nstool" #define BIN_NAME "nstool"
#define VER_MAJOR 1 #define VER_MAJOR 1
#define VER_MINOR 7 #define VER_MINOR 8
#define VER_PATCH 0 #define VER_PATCH 0
#define AUTHORS "jakcron" #define AUTHORS "jakcron"