summaryrefslogtreecommitdiff
path: root/src/core/crypto
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/crypto')
-rw-r--r--src/core/crypto/key_manager.cpp5
-rw-r--r--src/core/crypto/key_manager.h1
-rw-r--r--src/core/crypto/xts_encryption_layer.cpp1
-rw-r--r--src/core/crypto/xts_encryption_layer.h1
4 files changed, 4 insertions, 4 deletions
diff --git a/src/core/crypto/key_manager.cpp b/src/core/crypto/key_manager.cpp
index 0b14bf15c..0b6c07de8 100644
--- a/src/core/crypto/key_manager.cpp
+++ b/src/core/crypto/key_manager.cpp
@@ -133,7 +133,7 @@ KeyManager::KeyManager() {
133 } 133 }
134 134
135 AttemptLoadKeyFile(yuzu_keys_dir, hactool_keys_dir, "title.keys", true); 135 AttemptLoadKeyFile(yuzu_keys_dir, hactool_keys_dir, "title.keys", true);
136 AttemptLoadKeyFile(yuzu_keys_dir, yuzu_keys_dir, "title.keys_autogenerated", false); 136 AttemptLoadKeyFile(yuzu_keys_dir, yuzu_keys_dir, "title.keys_autogenerated", true);
137} 137}
138 138
139void KeyManager::LoadFromFile(const std::string& filename, bool is_title_keys) { 139void KeyManager::LoadFromFile(const std::string& filename, bool is_title_keys) {
@@ -223,8 +223,7 @@ void KeyManager::WriteKeyToFile(bool title_key, std::string_view keyname,
223 << "# If you are experiencing issues involving keys, it may help to delete this file\n"; 223 << "# If you are experiencing issues involving keys, it may help to delete this file\n";
224 } 224 }
225 225
226 file << std::endl 226 file << fmt::format("\n{} = {}", keyname, Common::HexArrayToString(key));
227 << fmt::format("{} = {}", keyname, Common::HexArrayToString(key)) << std::endl;
228 AttemptLoadKeyFile(yuzu_keys_dir, yuzu_keys_dir, filename, title_key); 227 AttemptLoadKeyFile(yuzu_keys_dir, yuzu_keys_dir, filename, title_key);
229} 228}
230 229
diff --git a/src/core/crypto/key_manager.h b/src/core/crypto/key_manager.h
index 7a8728f76..7ca3e6cbc 100644
--- a/src/core/crypto/key_manager.h
+++ b/src/core/crypto/key_manager.h
@@ -6,6 +6,7 @@
6 6
7#include <array> 7#include <array>
8#include <string> 8#include <string>
9#include <string_view>
9#include <type_traits> 10#include <type_traits>
10#include <vector> 11#include <vector>
11#include <boost/container/flat_map.hpp> 12#include <boost/container/flat_map.hpp>
diff --git a/src/core/crypto/xts_encryption_layer.cpp b/src/core/crypto/xts_encryption_layer.cpp
index c6e5df1ce..c10832cfe 100644
--- a/src/core/crypto/xts_encryption_layer.cpp
+++ b/src/core/crypto/xts_encryption_layer.cpp
@@ -2,6 +2,7 @@
2// Licensed under GPLv2 or any later version 2// Licensed under GPLv2 or any later version
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include <algorithm>
5#include <cstring> 6#include <cstring>
6#include "common/assert.h" 7#include "common/assert.h"
7#include "core/crypto/xts_encryption_layer.h" 8#include "core/crypto/xts_encryption_layer.h"
diff --git a/src/core/crypto/xts_encryption_layer.h b/src/core/crypto/xts_encryption_layer.h
index 1e1acaf4a..7a1f1dc64 100644
--- a/src/core/crypto/xts_encryption_layer.h
+++ b/src/core/crypto/xts_encryption_layer.h
@@ -4,7 +4,6 @@
4 4
5#pragma once 5#pragma once
6 6
7#include <vector>
8#include "core/crypto/aes_util.h" 7#include "core/crypto/aes_util.h"
9#include "core/crypto/encryption_layer.h" 8#include "core/crypto/encryption_layer.h"
10#include "core/crypto/key_manager.h" 9#include "core/crypto/key_manager.h"