mirror of
https://github.com/rvtr/ctr_Repair.git
synced 2025-10-31 13:51:08 -04:00
吸出し時に暗号化・CMAC付加を無効化するように
git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@434 385bec56-5757-e545-9c3a-d8741f4650f1
This commit is contained in:
N2614
parent
5d259a506f
commit
a9ec3fb1de
@ -22,6 +22,9 @@ SAMPLED_DEMOS_COMMON_INCLUDE_DIR = $(dir $(HORIZON_ROOT)/../CTR/SampleDemos/co
|
||||
INCLUDES += $(SAMPLED_DEMOS_COMMON_INCLUDE_DIR) \
|
||||
../common
|
||||
|
||||
# 暗号化とCMAC付加を無効にする場合有効にする
|
||||
CCFLAGS += -DSKIP_VERIFY
|
||||
|
||||
SOURCES[] =
|
||||
ConsoleBackup.cpp
|
||||
Controller.cpp
|
||||
|
||||
@ -162,12 +162,16 @@ bool ExportTwlSaveFile(const wchar_t* from_path, const wchar_t* to_path, void* b
|
||||
return false;
|
||||
}
|
||||
|
||||
#ifndef SKIP_VERIFY
|
||||
nn::crypto::SwAesCtrContext swAesCtrContext;
|
||||
swAesCtrContext.Initialize(iv, common::key, sizeof(key));
|
||||
#endif
|
||||
|
||||
size_t totalReadSize = 0;
|
||||
#ifndef SKIP_VERIFY
|
||||
nn::crypto::Sha256Context context;
|
||||
context.Initialize();
|
||||
#endif
|
||||
|
||||
// ファイルサイズをヘッダに書いておく
|
||||
// 書き込み対象ファイル作成
|
||||
@ -177,6 +181,7 @@ bool ExportTwlSaveFile(const wchar_t* from_path, const wchar_t* to_path, void* b
|
||||
nn::fs::OPEN_MODE_READ | nn::fs::OPEN_MODE_WRITE | nn::fs::OPEN_MODE_CREATE);
|
||||
COMMON_LOGGER_RETURN_FALSE_IF_FAILED(result);
|
||||
|
||||
#ifndef SKIP_VERIFY
|
||||
// フルパスをハッシュに含める
|
||||
context.Update(from_path, std::wcslen(from_path) * sizeof(wchar_t));
|
||||
|
||||
@ -191,6 +196,7 @@ bool ExportTwlSaveFile(const wchar_t* from_path, const wchar_t* to_path, void* b
|
||||
s32 writeSize;
|
||||
result = to_file.TryWrite(&writeSize, &enc, sizeof(enc), false);
|
||||
COMMON_LOGGER_RETURN_FALSE_IF_FAILED(result);
|
||||
#endif
|
||||
|
||||
while (1)
|
||||
{
|
||||
@ -203,6 +209,7 @@ bool ExportTwlSaveFile(const wchar_t* from_path, const wchar_t* to_path, void* b
|
||||
|
||||
if (readsize == 0)
|
||||
{
|
||||
#ifndef SKIP_VERIFY
|
||||
NN_LOG("Add CMAC %ls\n", from_path);
|
||||
// SHA256を計算してCMACを付加する
|
||||
bit8 sha256Hash[nn::crypto::Sha256Context::HASH_SIZE];
|
||||
@ -217,6 +224,7 @@ bool ExportTwlSaveFile(const wchar_t* from_path, const wchar_t* to_path, void* b
|
||||
COMMON_LOGGER_RETURN_FALSE_IF_FAILED(result);
|
||||
result = to_file.TryFlush();
|
||||
COMMON_LOGGER_RETURN_FALSE_IF_FAILED(result);
|
||||
#endif
|
||||
|
||||
break;
|
||||
}
|
||||
@ -224,6 +232,7 @@ bool ExportTwlSaveFile(const wchar_t* from_path, const wchar_t* to_path, void* b
|
||||
{
|
||||
NN_LOG("EncryptSize = %d\n", readsize);
|
||||
|
||||
#ifndef SKIP_VERIFY
|
||||
u8 paddingSize = 0;
|
||||
AddPkcsPadding(&paddingSize, reinterpret_cast<bit8*>(buf), bufSize / 2, &readsize);
|
||||
|
||||
@ -237,6 +246,10 @@ bool ExportTwlSaveFile(const wchar_t* from_path, const wchar_t* to_path, void* b
|
||||
|
||||
// 事前計算したファイルサイズに一致させるためパディング分減算
|
||||
readsize -= paddingSize;
|
||||
#else
|
||||
result = to_file.TryWrite(&writesize, reinterpret_cast<bit8*>(buf), readsize, false);
|
||||
COMMON_LOGGER_RETURN_FALSE_IF_FAILED(result);
|
||||
#endif
|
||||
|
||||
s_FinishedFileSize += readsize;
|
||||
s_Progress = s_FinishedFileSize * 100 / s_TotalFileSize;
|
||||
@ -345,7 +358,9 @@ bool CopyDirectory(ImportDataList* fileList, const wchar_t * from_path, const wc
|
||||
nn::fs::FileInputStream from_file;
|
||||
nn::fs::FileStream to_file;
|
||||
s64 filesize;
|
||||
#ifndef SKIP_VERIFY
|
||||
s64 fileSizeWithoutHeaderAndFooter;
|
||||
#endif
|
||||
s32 readsize;
|
||||
s32 writesize;
|
||||
|
||||
@ -367,12 +382,16 @@ bool CopyDirectory(ImportDataList* fileList, const wchar_t * from_path, const wc
|
||||
}
|
||||
}
|
||||
|
||||
#ifndef SKIP_VERIFY
|
||||
nn::crypto::SwAesCtrContext swAesCtrContext;
|
||||
swAesCtrContext.Initialize(iv, common::key, sizeof(key));
|
||||
#endif
|
||||
|
||||
size_t totalReadSize = 0;
|
||||
#ifndef SKIP_VERIFY
|
||||
nn::crypto::Sha256Context context;
|
||||
context.Initialize();
|
||||
#endif
|
||||
|
||||
// ファイルサイズをヘッダに書いておく
|
||||
if (encode)
|
||||
@ -384,6 +403,7 @@ bool CopyDirectory(ImportDataList* fileList, const wchar_t * from_path, const wc
|
||||
nn::fs::OPEN_MODE_READ | nn::fs::OPEN_MODE_WRITE | nn::fs::OPEN_MODE_CREATE);
|
||||
COMMON_LOGGER_RETURN_FALSE_IF_FAILED(result);
|
||||
|
||||
#ifndef SKIP_VERIFY
|
||||
// フルパスをハッシュに含める
|
||||
context.Update(target_from.str().c_str(), target_from.str().size() * sizeof(wchar_t));
|
||||
|
||||
@ -398,9 +418,11 @@ bool CopyDirectory(ImportDataList* fileList, const wchar_t * from_path, const wc
|
||||
s32 writeSize;
|
||||
result = to_file.TryWrite(&writeSize, &enc, sizeof(enc), false);
|
||||
COMMON_LOGGER_RETURN_FALSE_IF_FAILED(result);
|
||||
#endif
|
||||
}
|
||||
else
|
||||
{
|
||||
#ifndef SKIP_VERIFY
|
||||
// ヘッダを読む
|
||||
// ハッシュの計算は終わっているので復号化のみ
|
||||
BackupDataHeader header;
|
||||
@ -418,6 +440,7 @@ bool CopyDirectory(ImportDataList* fileList, const wchar_t * from_path, const wc
|
||||
// 書き込み対象ファイル作成
|
||||
result = nn::fs::TryCreateFile(target_tmp.str().c_str(), fileSizeWithoutHeaderAndFooter);
|
||||
COMMON_LOGGER_RETURN_FALSE_IF_FAILED(result);
|
||||
#endif
|
||||
result = to_file.TryInitialize(target_tmp.str().c_str(),
|
||||
nn::fs::OPEN_MODE_READ | nn::fs::OPEN_MODE_WRITE | nn::fs::OPEN_MODE_CREATE);
|
||||
COMMON_LOGGER_RETURN_FALSE_IF_FAILED(result);
|
||||
@ -435,6 +458,7 @@ bool CopyDirectory(ImportDataList* fileList, const wchar_t * from_path, const wc
|
||||
{
|
||||
if (encode)
|
||||
{
|
||||
#ifndef SKIP_VERIFY
|
||||
NN_LOG("Add CMAC %ls\n", target_from.str().c_str());
|
||||
// SHA256を計算してCMACを付加する
|
||||
bit8 sha256Hash[nn::crypto::Sha256Context::HASH_SIZE];
|
||||
@ -447,11 +471,13 @@ bool CopyDirectory(ImportDataList* fileList, const wchar_t * from_path, const wc
|
||||
|
||||
result = to_file.TryWrite(&writesize, cmac, sizeof(cmac));
|
||||
COMMON_LOGGER_RETURN_FALSE_IF_FAILED(result);
|
||||
#endif
|
||||
}
|
||||
|
||||
result = to_file.TryFlush();
|
||||
COMMON_LOGGER_RETURN_FALSE_IF_FAILED(result);
|
||||
|
||||
#ifndef SKIP_VERIFY
|
||||
// 復号済みなら検証する
|
||||
if (!encode)
|
||||
{
|
||||
@ -461,6 +487,7 @@ bool CopyDirectory(ImportDataList* fileList, const wchar_t * from_path, const wc
|
||||
return false;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
break;
|
||||
}
|
||||
@ -468,6 +495,7 @@ bool CopyDirectory(ImportDataList* fileList, const wchar_t * from_path, const wc
|
||||
{
|
||||
if (encode)
|
||||
{
|
||||
#ifndef SKIP_VERIFY
|
||||
NN_LOG("EncryptSize = %d\n", readsize);
|
||||
|
||||
u8 paddingSize = 0;
|
||||
@ -484,7 +512,11 @@ bool CopyDirectory(ImportDataList* fileList, const wchar_t * from_path, const wc
|
||||
|
||||
// 事前計算したファイルサイズに一致させるためパディング分減算
|
||||
readsize -= paddingSize;
|
||||
|
||||
#else
|
||||
result = to_file.TryWrite(&writesize, reinterpret_cast<bit8*>(buf), readsize,
|
||||
false);
|
||||
COMMON_LOGGER_RETURN_FALSE_IF_FAILED(result);
|
||||
#endif
|
||||
s_FinishedFileSize += readsize;
|
||||
s_Progress = s_FinishedFileSize * 100 / s_TotalFileSize;
|
||||
NN_LOG(
|
||||
@ -492,6 +524,7 @@ bool CopyDirectory(ImportDataList* fileList, const wchar_t * from_path, const wc
|
||||
}
|
||||
else
|
||||
{
|
||||
#ifndef SKIP_VERIFY
|
||||
// ハッシュ検証は通っているので復号化しつつ書き込み
|
||||
// パディング以降は書き込まないよう書き込みサイズを変更する
|
||||
|
||||
@ -510,12 +543,17 @@ bool CopyDirectory(ImportDataList* fileList, const wchar_t * from_path, const wc
|
||||
|
||||
result = to_file.TryWrite(&writesize, reinterpret_cast<bit8*>(buf) + bufSize / 2, readsize,
|
||||
false);
|
||||
#else
|
||||
result = to_file.TryWrite(&writesize, reinterpret_cast<bit8*>(buf), readsize,
|
||||
false);
|
||||
#endif
|
||||
COMMON_LOGGER_RETURN_FALSE_IF_FAILED(result);
|
||||
s_FinishedFileSize += readsize;
|
||||
s_Progress = s_FinishedFileSize * 100 / s_TotalFileSize;
|
||||
NN_LOG(
|
||||
"finish = %lld, total = %lld, progress = %lld\n", s_FinishedFileSize, s_TotalFileSize, s_Progress);
|
||||
|
||||
#ifndef SKIP_VERIFY
|
||||
// 読みきったので次のファイルへ
|
||||
if (readDone)
|
||||
{
|
||||
@ -530,6 +568,7 @@ bool CopyDirectory(ImportDataList* fileList, const wchar_t * from_path, const wc
|
||||
}
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
COMMON_LOGGER_RETURN_FALSE_IF_FAILED(result);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user