Mirrors/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

file_sys/crypto: Fix missing/unnecessary includes

Browse source
This commit is contained in:
Zach Hilman 2018-08-24 22:15:32 -04:00
parent d1a6dd61d1
commit 6314a799aa
9 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/core/crypto/key_manager.cpp
View file

@ -133,7 +133,7 @@ KeyManager::KeyManager() {
}
AttemptLoadKeyFile(yuzu_keys_dir, hactool_keys_dir, "title.keys", true);
AttemptLoadKeyFile(yuzu_keys_dir, yuzu_keys_dir, "title.keys_autogenerated", false);
AttemptLoadKeyFile(yuzu_keys_dir, yuzu_keys_dir, "title.keys_autogenerated", true);
}
void KeyManager::LoadFromFile(const std::string& filename, bool is_title_keys) {
@ -223,8 +223,7 @@ void KeyManager::WriteKeyToFile(bool title_key, std::string_view keyname,
<< "# If you are experiencing issues involving keys, it may help to delete this file\n";
}
file << std::endl
<< fmt::format("{} = {}", keyname, Common::HexArrayToString(key)) << std::endl;
file << fmt::format("\n{} = {}", keyname, Common::HexArrayToString(key));
AttemptLoadKeyFile(yuzu_keys_dir, yuzu_keys_dir, filename, title_key);
}

1
src/core/crypto/key_manager.h
View file

@ -6,6 +6,7 @@
#include <array>
#include <string>
#include <string_view>
#include <type_traits>
#include <vector>
#include <boost/container/flat_map.hpp>

1
src/core/crypto/xts_encryption_layer.cpp
View file

@ -2,6 +2,7 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include <algorithm>
#include <cstring>
#include "common/assert.h"
#include "core/crypto/xts_encryption_layer.h"

1
src/core/crypto/xts_encryption_layer.h
View file

@ -4,7 +4,6 @@
#pragma once
#include <vector>
#include "core/crypto/aes_util.h"
#include "core/crypto/encryption_layer.h"
#include "core/crypto/key_manager.h"