diff options
| author | 2020-09-14 16:47:25 -0400 | |
|---|---|---|
| committer | 2020-09-14 16:49:59 -0400 | |
| commit | e0dd440b1ff9bf4578d7b69912dfe4283bfd4e6a (patch) | |
| tree | 3ef2537360711465dc0b08a79aa22a4180aa4f49 /src/core/crypto/key_manager.h | |
| parent | Merge pull request #4651 from lioncash/kernel-global (diff) | |
| download | yuzu-e0dd440b1ff9bf4578d7b69912dfe4283bfd4e6a.tar.gz yuzu-e0dd440b1ff9bf4578d7b69912dfe4283bfd4e6a.tar.xz yuzu-e0dd440b1ff9bf4578d7b69912dfe4283bfd4e6a.zip | |
crypto/key_manager: Remove dependency on the global system accessor
We can supply the content provider as an argument instead of hardcoding
a global accessor in the implementation.
Diffstat (limited to 'src/core/crypto/key_manager.h')
| -rw-r--r-- | src/core/crypto/key_manager.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/core/crypto/key_manager.h b/src/core/crypto/key_manager.h index 321b75323..0a7220286 100644 --- a/src/core/crypto/key_manager.h +++ b/src/core/crypto/key_manager.h | |||
| @@ -20,6 +20,10 @@ namespace Common::FS { | |||
| 20 | class IOFile; | 20 | class IOFile; |
| 21 | } | 21 | } |
| 22 | 22 | ||
| 23 | namespace FileSys { | ||
| 24 | class ContentProvider; | ||
| 25 | } | ||
| 26 | |||
| 23 | namespace Loader { | 27 | namespace Loader { |
| 24 | enum class ResultStatus : u16; | 28 | enum class ResultStatus : u16; |
| 25 | } | 29 | } |
| @@ -252,7 +256,7 @@ public: | |||
| 252 | 256 | ||
| 253 | bool BaseDeriveNecessary() const; | 257 | bool BaseDeriveNecessary() const; |
| 254 | void DeriveBase(); | 258 | void DeriveBase(); |
| 255 | void DeriveETicket(PartitionDataManager& data); | 259 | void DeriveETicket(PartitionDataManager& data, const FileSys::ContentProvider& provider); |
| 256 | void PopulateTickets(); | 260 | void PopulateTickets(); |
| 257 | void SynthesizeTickets(); | 261 | void SynthesizeTickets(); |
| 258 | 262 | ||