diff options
| author | 2018-09-23 20:31:00 -0400 | |
|---|---|---|
| committer | 2018-10-07 13:15:11 -0400 | |
| commit | 721632fe6602c18cc7e143b62020cbf436ced606 (patch) | |
| tree | 340ffca048c3a28204f4dd59a140c957e99e35ad /src/core/crypto/key_manager.cpp | |
| parent | externals/mbedtls: Enable CMAC module (diff) | |
| download | yuzu-721632fe6602c18cc7e143b62020cbf436ced606.tar.gz yuzu-721632fe6602c18cc7e143b62020cbf436ced606.tar.xz yuzu-721632fe6602c18cc7e143b62020cbf436ced606.zip | |
key_manager: Rename KEK to Kek
Diffstat (limited to 'src/core/crypto/key_manager.cpp')
| -rw-r--r-- | src/core/crypto/key_manager.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/core/crypto/key_manager.cpp b/src/core/crypto/key_manager.cpp index bf3a70944..467eb423e 100644 --- a/src/core/crypto/key_manager.cpp +++ b/src/core/crypto/key_manager.cpp | |||
| @@ -71,23 +71,24 @@ boost::optional<Key128> DeriveSDSeed() { | |||
| 71 | return seed; | 71 | return seed; |
| 72 | } | 72 | } |
| 73 | 73 | ||
| 74 | Loader::ResultStatus DeriveSDKeys(std::array<Key256, 2>& sd_keys, const KeyManager& keys) { | 74 | Loader::ResultStatus DeriveSDKeys(std::array<Key256, 2>& sd_keys, KeyManager& keys) { |
| 75 | if (!keys.HasKey(S128KeyType::Source, static_cast<u64>(SourceKeyType::SDKEK))) | 75 | if (!keys.HasKey(S128KeyType::Source, static_cast<u64>(SourceKeyType::SDKek))) |
| 76 | return Loader::ResultStatus::ErrorMissingSDKEKSource; | 76 | return Loader::ResultStatus::ErrorMissingSDKEKSource; |
| 77 | if (!keys.HasKey(S128KeyType::Source, static_cast<u64>(SourceKeyType::AESKEKGeneration))) | 77 | if (!keys.HasKey(S128KeyType::Source, static_cast<u64>(SourceKeyType::AESKekGeneration))) |
| 78 | return Loader::ResultStatus::ErrorMissingAESKEKGenerationSource; | 78 | return Loader::ResultStatus::ErrorMissingAESKEKGenerationSource; |
| 79 | if (!keys.HasKey(S128KeyType::Source, static_cast<u64>(SourceKeyType::AESKeyGeneration))) | 79 | if (!keys.HasKey(S128KeyType::Source, static_cast<u64>(SourceKeyType::AESKeyGeneration))) |
| 80 | return Loader::ResultStatus::ErrorMissingAESKeyGenerationSource; | 80 | return Loader::ResultStatus::ErrorMissingAESKeyGenerationSource; |
| 81 | 81 | ||
| 82 | const auto sd_kek_source = | 82 | const auto sd_kek_source = |
| 83 | keys.GetKey(S128KeyType::Source, static_cast<u64>(SourceKeyType::SDKEK)); | 83 | keys.GetKey(S128KeyType::Source, static_cast<u64>(SourceKeyType::SDKek)); |
| 84 | const auto aes_kek_gen = | 84 | const auto aes_kek_gen = |
| 85 | keys.GetKey(S128KeyType::Source, static_cast<u64>(SourceKeyType::AESKEKGeneration)); | 85 | keys.GetKey(S128KeyType::Source, static_cast<u64>(SourceKeyType::AESKekGeneration)); |
| 86 | const auto aes_key_gen = | 86 | const auto aes_key_gen = |
| 87 | keys.GetKey(S128KeyType::Source, static_cast<u64>(SourceKeyType::AESKeyGeneration)); | 87 | keys.GetKey(S128KeyType::Source, static_cast<u64>(SourceKeyType::AESKeyGeneration)); |
| 88 | const auto master_00 = keys.GetKey(S128KeyType::Master); | 88 | const auto master_00 = keys.GetKey(S128KeyType::Master); |
| 89 | const auto sd_kek = | 89 | const auto sd_kek = |
| 90 | GenerateKeyEncryptionKey(sd_kek_source, master_00, aes_kek_gen, aes_key_gen); | 90 | GenerateKeyEncryptionKey(sd_kek_source, master_00, aes_kek_gen, aes_key_gen); |
| 91 | keys.SetKey(S128KeyType::SDKek, sd_kek); | ||
| 91 | 92 | ||
| 92 | if (!keys.HasKey(S128KeyType::SDSeed)) | 93 | if (!keys.HasKey(S128KeyType::SDSeed)) |
| 93 | return Loader::ResultStatus::ErrorMissingSDSeed; | 94 | return Loader::ResultStatus::ErrorMissingSDSeed; |