From 425cd46d91891f7b149dcc277a39b7557efd8b17 Mon Sep 17 00:00:00 2001 From: N2614 Date: Fri, 11 Mar 2011 08:31:52 +0000 Subject: [PATCH] =?UTF-8?q?memcmp=E3=82=92=E4=BD=BF=E3=81=86=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB?= 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@113 385bec56-5757-e545-9c3a-d8741f4650f1 --- .../common/SdReaderWriter.cpp | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/trunk/ConsoleDataMigration/common/SdReaderWriter.cpp b/trunk/ConsoleDataMigration/common/SdReaderWriter.cpp index 583a46f..d5870cc 100644 --- a/trunk/ConsoleDataMigration/common/SdReaderWriter.cpp +++ b/trunk/ConsoleDataMigration/common/SdReaderWriter.cpp @@ -26,21 +26,6 @@ namespace common { -bool Compare(const bit8* p0, const bit8* p1, size_t size) -{ - s32 i; - bool result = true; - for (i = 0; i < size; ++i) - { - if (*(p0 + i) != *(p1 + i)) - { - result = false; - } - } - return result; -} // Compare - - nn::Result SdReaderWriter::Initialize() { nn::Result result; @@ -228,7 +213,7 @@ nn::Result SdReaderWriter::ReadBufWithCmac(const wchar_t* path, void* buf, size_ result = nn::crypto::CalculateAesCmacSw(cmac, sha256Hash, nn::crypto::Sha256Context::HASH_SIZE, common::cmacKey); COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result); - if(!Compare(reinterpret_cast(buf) + *totalSize, cmac, sizeof(cmac))) + if(std::memcmp(reinterpret_cast(buf) + *totalSize, cmac, sizeof(cmac)) != 0) { // 無効なファイル COMMON_LOGGER("Verification Failed\n");