From ed78a25e9ea9c6dd1179d797ba9c32631184292c Mon Sep 17 00:00:00 2001
From: Jack <jakcron.dev@gmail.com>
Date: Wed, 26 Feb 2020 17:03:20 +0800
Subject: [PATCH] Update include

---
 src/KeyConfiguration.cpp | 1 -
 src/UserSettings.cpp     | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/KeyConfiguration.cpp b/src/KeyConfiguration.cpp
index d268096..5053fab 100644
--- a/src/KeyConfiguration.cpp
+++ b/src/KeyConfiguration.cpp
@@ -2,7 +2,6 @@
 #include <fnd/ResourceFileReader.h>
 #include <fnd/SimpleTextOutput.h>
 #include <nn/hac/AesKeygen.h>
-#include <nn/hac/ContentArchiveUtils.h>
 
 KeyConfiguration::KeyConfiguration()
 {
diff --git a/src/UserSettings.cpp b/src/UserSettings.cpp
index 0f82524..97fae08 100644
--- a/src/UserSettings.cpp
+++ b/src/UserSettings.cpp
@@ -13,7 +13,7 @@
 #include <fnd/SimpleTextOutput.h>
 #include <fnd/Vec.h>
 #include <fnd/ResourceFileReader.h>
-#include <nn/hac/ContentArchiveUtils.h>
+#include <nn/hac/ContentArchiveUtil.h>
 #include <nn/hac/AesKeygen.h>
 #include <nn/hac/define/gc.h>
 #include <nn/hac/define/pfs.h>
@@ -522,7 +522,7 @@ void UserSettings::populateKeyset(sCmdArgs& args)
 			fnd::aes::sAes128Key enc_title_key;
 			memcpy(enc_title_key.key, tik.getBody().getEncTitleKey(), 16);
 			fnd::aes::sAes128Key common_key, external_content_key;
-			if (mKeyCfg.getETicketCommonKey(nn::hac::ContentArchiveUtils::getMasterKeyRevisionFromKeyGeneration(tik.getBody().getCommonKeyId()), common_key) == true)
+			if (mKeyCfg.getETicketCommonKey(nn::hac::ContentArchiveUtil::getMasterKeyRevisionFromKeyGeneration(tik.getBody().getCommonKeyId()), common_key) == true)
 			{
 				nn::hac::AesKeygen::generateKey(external_content_key.key, tik.getBody().getEncTitleKey(), common_key.key);
 				mKeyCfg.addNcaExternalContentKey(tik.getBody().getRightsId(), external_content_key);
@@ -731,14 +731,14 @@ bool UserSettings::determineValidNcaFromSample(const fnd::Vec<byte_t>& sample) c
 {
 	// prepare decrypted NCA data
 	byte_t nca_raw[nn::hac::nca::kHeaderSize];
-	nn::hac::sContentArchiveHeader* nca_header = (nn::hac::sContentArchiveHeader*)(nca_raw + nn::hac::ContentArchiveUtils::sectorToOffset(1));
+	nn::hac::sContentArchiveHeader* nca_header = (nn::hac::sContentArchiveHeader*)(nca_raw + nn::hac::ContentArchiveUtil::sectorToOffset(1));
 	
 	if (sample.size() < nn::hac::nca::kHeaderSize)
 		return false;
 
 	fnd::aes::sAesXts128Key header_key;
 	mKeyCfg.getContentArchiveHeaderKey(header_key);
-	nn::hac::ContentArchiveUtils::decryptContentArchiveHeader(sample.data(), nca_raw, header_key);
+	nn::hac::ContentArchiveUtil::decryptContentArchiveHeader(sample.data(), nca_raw, header_key);
 
 	if (nca_header->st_magic.get() != nn::hac::nca::kNca2StructMagic && nca_header->st_magic.get() != nn::hac::nca::kNca3StructMagic)
 		return false;