From a0c0b6532bbf2e48201ba92ecdd088e22c1d5887 Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Wed, 2 Nov 2011 09:08:25 +0000
Subject: [PATCH] =?UTF-8?q?=E5=BC=95=E8=B6=8A=E3=81=97=E7=94=A8=E3=82=B3?=
 =?UTF-8?q?=E3=83=B3=E3=83=86=E3=82=AD=E3=82=B9=E3=83=88=E3=82=92=E5=87=BA?=
 =?UTF-8?q?=E5=8A=9B=E3=81=99=E3=82=8B=E3=82=88=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@476 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../sources/ConsoleBackup/Exporter.cpp        | 18 ------------------
 .../sources/common/SaveDataMover.cpp          | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/trunk/ConsoleDataMigration/sources/ConsoleBackup/Exporter.cpp b/trunk/ConsoleDataMigration/sources/ConsoleBackup/Exporter.cpp
index 2d19499..50aee16 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleBackup/Exporter.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleBackup/Exporter.cpp
@@ -784,24 +784,6 @@ void ExportThreadFunc()
 
     NN_LOG("Export Thread Finalize\n");
 }
-
-nn::Result WriteExportContext()
-{
-    nn::Result result;
-    nn::fs::DeviceMoveContext context;
-
-    result = nn::fs::StartDeviceMoveAsSource(&context);
-    NN_UTIL_RETURN_IF_FAILED(result);
-
-    common::SdMountManager::Mount();
-    common::SdReaderWriter sdWriter;
-    result = sdWriter.WriteBufWithCmac(common::MOVE_CONTEXT_PATHNAME, &context, sizeof(context));
-    NN_UTIL_RETURN_IF_FAILED(result);
-
-    common::SdMountManager::Unmount();
-    return nn::ResultSuccess();
-}
-
 nn::Result WriteSaveData()
 {
     // 不要なデータを削除する
diff --git a/trunk/ConsoleDataMigration/sources/common/SaveDataMover.cpp b/trunk/ConsoleDataMigration/sources/common/SaveDataMover.cpp
index b163dc5..b62af03 100644
--- a/trunk/ConsoleDataMigration/sources/common/SaveDataMover.cpp
+++ b/trunk/ConsoleDataMigration/sources/common/SaveDataMover.cpp
@@ -19,14 +19,17 @@
 #include <nn/fs/fs_ApiSharedExtSaveData.h>
 #include <nn/fs/fs_ApiDeviceMove.h>
 #include <nn/fs/fs_ResultPrivate.h>
+#include <nn/crypto/crypto_SwAesCtrContext.h>
 
 #include <nn/ndm.h>
 
+#include "Aes_define.h"
 #include "SaveDataMover.h"
 #include "CommonLogger.h"
 #include "FileName.h"
 #include "SdReaderWriter.h"
 #include "FileTransfer.h"
+#include "HeapManager.h"
 
 
 namespace common
@@ -87,6 +90,22 @@ void SaveDataMover::SetupExport()
     m_Result = nn::fs::StartDeviceMoveAsSource(&moveContext);
     COMMON_LOGGER_RETURN_VOID_IF_FAILED(m_Result);
 
+    // コンテキストのSDへの出力
+    common::HeapManager contextHeap(sizeof(moveContext));
+    void* enc;
+    enc = contextHeap.GetAddr();
+    if(enc != NULL)
+    {
+        // AES暗号化する
+        nn::crypto::SwAesCtrContext swAesCtrContest;
+
+        swAesCtrContest.Initialize(common::iv, common::key, sizeof(common::key));
+        swAesCtrContest.Encrypt(enc, &moveContext, sizeof(moveContext));
+
+        common::SdReaderWriter sdWriter;
+        sdWriter.WriteBufWithCmac(common::MOVE_CONTEXT_PATHNAME, enc, sizeof(moveContext));
+    }
+
     // 3. 出力用ディレクトリの作成
     // 3.1 システムセーブデータ用ディレクトリ
     common::SdReaderWriter sdWriter;