diff options
| author | 2018-09-23 20:51:44 -0400 | |
|---|---|---|
| committer | 2018-10-07 13:15:11 -0400 | |
| commit | c79d2ca6cf076bb5704ad221ff2a500cb8a94b84 (patch) | |
| tree | bf9560a0a047d0cbf63ad4ea02dc3588b4f5dd8d /src | |
| parent | key_manager: Add support for crypto revisions past 04 (diff) | |
| download | yuzu-c79d2ca6cf076bb5704ad221ff2a500cb8a94b84.tar.gz yuzu-c79d2ca6cf076bb5704ad221ff2a500cb8a94b84.tar.xz yuzu-c79d2ca6cf076bb5704ad221ff2a500cb8a94b84.zip | |
key_manager: Add keyblob support
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/crypto/key_manager.cpp | 10 | ||||
| -rw-r--r-- | src/core/crypto/key_manager.h | 4 |
2 files changed, 14 insertions, 0 deletions
diff --git a/src/core/crypto/key_manager.cpp b/src/core/crypto/key_manager.cpp index 85776cdcb..0f1a86d1e 100644 --- a/src/core/crypto/key_manager.cpp +++ b/src/core/crypto/key_manager.cpp | |||
| @@ -21,6 +21,8 @@ | |||
| 21 | 21 | ||
| 22 | namespace Core::Crypto { | 22 | namespace Core::Crypto { |
| 23 | 23 | ||
| 24 | constexpr u64 CURRENT_CRYPTO_REVISION = 0x5; | ||
| 25 | |||
| 24 | Key128 GenerateKeyEncryptionKey(Key128 source, Key128 master, Key128 kek_seed, Key128 key_seed) { | 26 | Key128 GenerateKeyEncryptionKey(Key128 source, Key128 master, Key128 kek_seed, Key128 key_seed) { |
| 25 | Key128 out{}; | 27 | Key128 out{}; |
| 26 | 28 | ||
| @@ -37,6 +39,14 @@ Key128 GenerateKeyEncryptionKey(Key128 source, Key128 master, Key128 kek_seed, K | |||
| 37 | return out; | 39 | return out; |
| 38 | } | 40 | } |
| 39 | 41 | ||
| 42 | Key128 DeriveKeyblobKey(Key128 sbk, Key128 tsec, Key128 source) { | ||
| 43 | AESCipher<Key128> sbk_cipher(sbk, Mode::ECB); | ||
| 44 | AESCipher<Key128> tsec_cipher(tsec, Mode::ECB); | ||
| 45 | tsec_cipher.Transcode(source.data(), source.size(), source.data(), Op::Decrypt); | ||
| 46 | sbk_cipher.Transcode(source.data(), source.size(), source.data(), Op::Decrypt); | ||
| 47 | return source; | ||
| 48 | } | ||
| 49 | |||
| 40 | boost::optional<Key128> DeriveSDSeed() { | 50 | boost::optional<Key128> DeriveSDSeed() { |
| 41 | const FileUtil::IOFile save_43(FileUtil::GetUserPath(FileUtil::UserPath::NANDDir) + | 51 | const FileUtil::IOFile save_43(FileUtil::GetUserPath(FileUtil::UserPath::NANDDir) + |
| 42 | "/system/save/8000000000000043", | 52 | "/system/save/8000000000000043", |
diff --git a/src/core/crypto/key_manager.h b/src/core/crypto/key_manager.h index ffc13fa8f..b2c386bfb 100644 --- a/src/core/crypto/key_manager.h +++ b/src/core/crypto/key_manager.h | |||
| @@ -109,6 +109,8 @@ public: | |||
| 109 | private: | 109 | private: |
| 110 | boost::container::flat_map<KeyIndex<S128KeyType>, Key128> s128_keys; | 110 | boost::container::flat_map<KeyIndex<S128KeyType>, Key128> s128_keys; |
| 111 | boost::container::flat_map<KeyIndex<S256KeyType>, Key256> s256_keys; | 111 | boost::container::flat_map<KeyIndex<S256KeyType>, Key256> s256_keys; |
| 112 | std::array<std::array<u8, 0xB0>, 0x20> encrypted_keyblobs{}; | ||
| 113 | std::array<std::array<u8, 0x90>, 0x20> keyblobs{}; | ||
| 112 | 114 | ||
| 113 | bool dev_mode; | 115 | bool dev_mode; |
| 114 | void LoadFromFile(const std::string& filename, bool is_title_keys); | 116 | void LoadFromFile(const std::string& filename, bool is_title_keys); |
| @@ -122,6 +124,8 @@ private: | |||
| 122 | }; | 124 | }; |
| 123 | 125 | ||
| 124 | Key128 GenerateKeyEncryptionKey(Key128 source, Key128 master, Key128 kek_seed, Key128 key_seed); | 126 | Key128 GenerateKeyEncryptionKey(Key128 source, Key128 master, Key128 kek_seed, Key128 key_seed); |
| 127 | Key128 DeriveKeyblobKey(Key128 sbk, Key128 tsec, Key128 source); | ||
| 128 | |||
| 125 | boost::optional<Key128> DeriveSDSeed(); | 129 | boost::optional<Key128> DeriveSDSeed(); |
| 126 | Loader::ResultStatus DeriveSDKeys(std::array<Key256, 2>& sd_keys, const KeyManager& keys); | 130 | Loader::ResultStatus DeriveSDKeys(std::array<Key256, 2>& sd_keys, const KeyManager& keys); |
| 127 | 131 | ||