From fb260f1d4b6be52f00ac1c2e7b2e54e74d8c5bea Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Tue, 8 Nov 2011 09:29:59 +0000
Subject: [PATCH] =?UTF-8?q?=E3=83=93=E3=83=AB=E3=83=89=E3=82=A8=E3=83=A9?=
 =?UTF-8?q?=E3=83=BC=E4=BF=AE=E6=AD=A3?=
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@483 385bec56-5757-e545-9c3a-d8741f4650f1
---
 trunk/ConsoleDataMigration/sources/tools/CmacAdder/OMakefile    | 2 +-
 .../sources/tools/ExportedDataDecrypter/OMakefile               | 2 +-
 .../sources/tools/ExportedDataDecrypter/main.cpp                | 2 --
 .../sources/tools/ExportedDataVerifier/OMakefile                | 2 +-
 .../sources/tools/ExportedDataVerifier/main.cpp                 | 2 --
 .../sources/tools/FatDataEncrypter/OMakefile                    | 2 +-
 6 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/trunk/ConsoleDataMigration/sources/tools/CmacAdder/OMakefile b/trunk/ConsoleDataMigration/sources/tools/CmacAdder/OMakefile
index 4001800..a9d9428 100644
--- a/trunk/ConsoleDataMigration/sources/tools/CmacAdder/OMakefile
+++ b/trunk/ConsoleDataMigration/sources/tools/CmacAdder/OMakefile
@@ -57,7 +57,7 @@ LIBS               +=   libnn_cfg \
 INSTALL_SDK_TOOL = true
 
 ROM_SPEC_FILE       =   $(TARGET_PROGRAM).rsf
-DESCRIPTOR          =   $(HORIZON_ROOT)/resources/specfiles/RepairTool.desc
+DESCRIPTOR          =   $(HORIZON_ROOT)/resources/specfiles/private/RepairTool.desc
 
 include $(ROOT_OMAKE)/modulerules
 
diff --git a/trunk/ConsoleDataMigration/sources/tools/ExportedDataDecrypter/OMakefile b/trunk/ConsoleDataMigration/sources/tools/ExportedDataDecrypter/OMakefile
index f9b9027..e2d5536 100644
--- a/trunk/ConsoleDataMigration/sources/tools/ExportedDataDecrypter/OMakefile
+++ b/trunk/ConsoleDataMigration/sources/tools/ExportedDataDecrypter/OMakefile
@@ -57,7 +57,7 @@ LIBS               +=   libnn_cfg \
 INSTALL_SDK_TOOL = true
 
 ROM_SPEC_FILE       =   $(TARGET_PROGRAM).rsf
-DESCRIPTOR          =   $(HORIZON_ROOT)/resources/specfiles/RepairTool.desc
+DESCRIPTOR          =   $(HORIZON_ROOT)/resources/specfiles/private/RepairTool.desc
 
 include $(ROOT_OMAKE)/modulerules
 
diff --git a/trunk/ConsoleDataMigration/sources/tools/ExportedDataDecrypter/main.cpp b/trunk/ConsoleDataMigration/sources/tools/ExportedDataDecrypter/main.cpp
index d07c99f..ee0c789 100644
--- a/trunk/ConsoleDataMigration/sources/tools/ExportedDataDecrypter/main.cpp
+++ b/trunk/ConsoleDataMigration/sources/tools/ExportedDataDecrypter/main.cpp
@@ -285,7 +285,6 @@ bool DecryptDirectory(const wchar_t * from_path, const wchar_t* to_path, void* b
 
                 s32 readSize;
                 // ハッシュを取得する
-                nn::crypto::Initialize();
                 result = sdFile.TrySetPosition(sdFileSize - nn::crypto::AES_CMAC_MAC_SIZE);
                 if (result.IsSuccess())
                 {
@@ -441,7 +440,6 @@ bool DecryptDirectory(const wchar_t * from_path, const wchar_t* to_path, void* b
                         }
                     }
                 }
-                nn::crypto::Finalize();
                 sdFile.Finalize();
                 sdOutFile.Finalize();
             }
diff --git a/trunk/ConsoleDataMigration/sources/tools/ExportedDataVerifier/OMakefile b/trunk/ConsoleDataMigration/sources/tools/ExportedDataVerifier/OMakefile
index 3eec50d..bd3d669 100644
--- a/trunk/ConsoleDataMigration/sources/tools/ExportedDataVerifier/OMakefile
+++ b/trunk/ConsoleDataMigration/sources/tools/ExportedDataVerifier/OMakefile
@@ -57,7 +57,7 @@ LIBS               +=   libnn_cfg \
 INSTALL_SDK_TOOL = true
 
 ROM_SPEC_FILE       =   $(TARGET_PROGRAM).rsf
-DESCRIPTOR          =   $(HORIZON_ROOT)/resources/specfiles/RepairTool.desc
+DESCRIPTOR          =   $(HORIZON_ROOT)/resources/specfiles/private/RepairTool.desc
 
 include $(ROOT_OMAKE)/modulerules
 
diff --git a/trunk/ConsoleDataMigration/sources/tools/ExportedDataVerifier/main.cpp b/trunk/ConsoleDataMigration/sources/tools/ExportedDataVerifier/main.cpp
index f2748da..0394d1b 100644
--- a/trunk/ConsoleDataMigration/sources/tools/ExportedDataVerifier/main.cpp
+++ b/trunk/ConsoleDataMigration/sources/tools/ExportedDataVerifier/main.cpp
@@ -256,7 +256,6 @@ bool VerifyDirectory(const wchar_t * from_path, void* buf,
 
                 s32 readSize;
                 // ハッシュを取得する
-                nn::crypto::Initialize();
                 result = sdFile.TrySetPosition(sdFileSize - nn::crypto::AES_CMAC_MAC_SIZE);
                 if (result.IsSuccess())
                 {
@@ -364,7 +363,6 @@ bool VerifyDirectory(const wchar_t * from_path, void* buf,
                         }
                     }
                 }
-                nn::crypto::Finalize();
                 sdFile.Finalize();
             }
         }
diff --git a/trunk/ConsoleDataMigration/sources/tools/FatDataEncrypter/OMakefile b/trunk/ConsoleDataMigration/sources/tools/FatDataEncrypter/OMakefile
index ada531f..569542e 100644
--- a/trunk/ConsoleDataMigration/sources/tools/FatDataEncrypter/OMakefile
+++ b/trunk/ConsoleDataMigration/sources/tools/FatDataEncrypter/OMakefile
@@ -57,7 +57,7 @@ LIBS               +=   libnn_cfg \
 INSTALL_SDK_TOOL = true
 
 ROM_SPEC_FILE       =   $(TARGET_PROGRAM).rsf
-DESCRIPTOR          =   $(HORIZON_ROOT)/resources/specfiles/RepairTool.desc
+DESCRIPTOR          =   $(HORIZON_ROOT)/resources/specfiles/private/RepairTool.desc
 
 include $(ROOT_OMAKE)/modulerules