From 83c830b21f4812fe7d017b08cf6565d72af3631f Mon Sep 17 00:00:00 2001 From: N2614 Date: Fri, 25 Nov 2011 02:23:21 +0000 Subject: [PATCH] =?UTF-8?q?r519=E3=82=92=E5=B7=BB=E3=81=8D=E6=88=BB?= =?UTF-8?q?=E3=81=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@527 385bec56-5757-e545-9c3a-d8741f4650f1 --- .../sources/ConsoleBackup/OMakefile | 3 -- .../sources/common/FileTransfer.cpp | 46 ------------------- 2 files changed, 49 deletions(-) diff --git a/branches/work/VerificationFailed/sources/ConsoleBackup/OMakefile b/branches/work/VerificationFailed/sources/ConsoleBackup/OMakefile index a1c414d..efe9073 100644 --- a/branches/work/VerificationFailed/sources/ConsoleBackup/OMakefile +++ b/branches/work/VerificationFailed/sources/ConsoleBackup/OMakefile @@ -22,9 +22,6 @@ SAMPLED_DEMOS_COMMON_INCLUDE_DIR = $(dir $(HORIZON_ROOT)/../CTR/SampleDemos/co INCLUDES += $(SAMPLED_DEMOS_COMMON_INCLUDE_DIR) \ ../common -# ˆÃ†‰»‚ÆCMAC•t‰Á‚𖳌ø‚É‚·‚éꇗLŒø‚É‚·‚é -CCFLAGS += -DSKIP_VERIFY - SOURCES[] = ConsoleBackup.cpp Controller.cpp diff --git a/branches/work/VerificationFailed/sources/common/FileTransfer.cpp b/branches/work/VerificationFailed/sources/common/FileTransfer.cpp index d25a4a3..5474037 100644 --- a/branches/work/VerificationFailed/sources/common/FileTransfer.cpp +++ b/branches/work/VerificationFailed/sources/common/FileTransfer.cpp @@ -162,16 +162,12 @@ 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 // ファイルサイズをヘッダã«æ›¸ã„ã¦ãŠã // 書ãè¾¼ã¿å¯¾è±¡ãƒ•ã‚¡ã‚¤ãƒ«ä½œæˆ @@ -181,7 +177,6 @@ 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)); @@ -196,7 +191,6 @@ 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) { @@ -209,7 +203,6 @@ 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]; @@ -224,7 +217,6 @@ 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; } @@ -232,7 +224,6 @@ 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(buf), bufSize / 2, &readsize); @@ -246,13 +237,6 @@ bool ExportTwlSaveFile(const wchar_t* from_path, const wchar_t* to_path, void* b // 事å‰è¨ˆç®—ã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚µã‚¤ã‚ºã«ä¸€è‡´ã•ã›ã‚‹ãŸã‚パディング分減算 readsize -= paddingSize; -#else - // 後åŠåŠåˆ†ã«ã‚³ãƒ”ーã—ã¦ã‹ã‚‰æ›¸ã込む - std::memcpy(reinterpret_cast(buf) + bufSize / 2, buf, readsize); - - result = to_file.TryWrite(&writesize, reinterpret_cast(buf) + bufSize / 2, readsize, false); - COMMON_LOGGER_RETURN_FALSE_IF_FAILED(result); -#endif s_FinishedFileSize += readsize; s_Progress = s_FinishedFileSize * 100 / s_TotalFileSize; @@ -361,9 +345,7 @@ 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; @@ -385,16 +367,12 @@ 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) @@ -406,7 +384,6 @@ 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)); @@ -421,11 +398,9 @@ 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; @@ -443,7 +418,6 @@ 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); @@ -461,7 +435,6 @@ 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]; @@ -474,13 +447,11 @@ 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) { @@ -490,7 +461,6 @@ bool CopyDirectory(ImportDataList* fileList, const wchar_t * from_path, const wc return false; } } -#endif break; } @@ -498,7 +468,6 @@ 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; @@ -515,13 +484,7 @@ bool CopyDirectory(ImportDataList* fileList, const wchar_t * from_path, const wc // 事å‰è¨ˆç®—ã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚µã‚¤ã‚ºã«ä¸€è‡´ã•ã›ã‚‹ãŸã‚パディング分減算 readsize -= paddingSize; -#else - // 後åŠåŠåˆ†ã«ã‚³ãƒ”ーã—ã¦ã‹ã‚‰æ›¸ã込む - std::memcpy(reinterpret_cast(buf) + bufSize / 2, buf, readsize); - result = to_file.TryWrite(&writesize, reinterpret_cast(buf) + bufSize / 2, readsize, false); - COMMON_LOGGER_RETURN_FALSE_IF_FAILED(result); -#endif s_FinishedFileSize += readsize; s_Progress = s_FinishedFileSize * 100 / s_TotalFileSize; NN_LOG( @@ -529,7 +492,6 @@ bool CopyDirectory(ImportDataList* fileList, const wchar_t * from_path, const wc } else { -#ifndef SKIP_VERIFY // ãƒãƒƒã‚·ãƒ¥æ¤œè¨¼ã¯é€šã£ã¦ã„ã‚‹ã®ã§å¾©å·åŒ–ã—ã¤ã¤æ›¸ã込㿠// パディング以é™ã¯æ›¸ãè¾¼ã¾ãªã„よã†æ›¸ãè¾¼ã¿ã‚µã‚¤ã‚ºã‚’変更ã™ã‚‹ @@ -548,19 +510,12 @@ bool CopyDirectory(ImportDataList* fileList, const wchar_t * from_path, const wc result = to_file.TryWrite(&writesize, reinterpret_cast(buf) + bufSize / 2, readsize, false); -#else - // 後åŠåŠåˆ†ã«ã‚³ãƒ”ーã—ã¦ã‹ã‚‰æ›¸ã込む - std::memcpy(reinterpret_cast(buf) + bufSize / 2, buf, readsize); - - result = to_file.TryWrite(&writesize, reinterpret_cast(buf) + bufSize / 2, 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) { @@ -575,7 +530,6 @@ bool CopyDirectory(ImportDataList* fileList, const wchar_t * from_path, const wc } break; } -#endif } COMMON_LOGGER_RETURN_FALSE_IF_FAILED(result);