mirror of
https://github.com/Atmosphere-NX/Atmosphere.git
synced 2025-05-30 14:35:17 -04:00
spl: update for new-ipc (fixes two bugs in sf)
This commit is contained in:
Michael Scire
SciresM
parent
59140d8dfa
commit
635ae4e3da
23 changed files with 377 additions and 311 deletions
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
namespace sts::spl {
|
||||
|
||||
class DeprecatedService : public IServiceObject {
|
||||
class DeprecatedService : public sf::IServiceObject {
|
||||
protected:
|
||||
enum class CommandId {
|
||||
/* 1.0.0+ */
|
||||
|
|
@ -43,10 +43,12 @@ namespace sts::spl {
|
|||
CryptAesCtr = 15,
|
||||
ComputeCmac = 16,
|
||||
ImportEsKey = 17,
|
||||
UnwrapTitleKeyDeprecated = 18,
|
||||
UnwrapTitleKey = 18,
|
||||
LoadTitleKey = 19,
|
||||
|
||||
/* 2.0.0+ */
|
||||
UnwrapCommonTitleKeyDeprecated = 20,
|
||||
UnwrapCommonTitleKey = 20,
|
||||
AllocateAesKeyslot = 21,
|
||||
FreeAesKeyslot = 22,
|
||||
|
|
@ -61,58 +63,69 @@ namespace sts::spl {
|
|||
virtual ~DeprecatedService() { /* ... */ }
|
||||
protected:
|
||||
/* Actual commands. */
|
||||
virtual Result GetConfig(Out<u64> out, u32 which);
|
||||
virtual Result ExpMod(OutPointerWithClientSize<u8> out, InPointer<u8> base, InPointer<u8> exp, InPointer<u8> mod);
|
||||
virtual Result GenerateAesKek(Out<AccessKey> out_access_key, KeySource key_source, u32 generation, u32 option);
|
||||
virtual Result GetConfig(sf::Out<u64> out, u32 which);
|
||||
virtual Result ExpMod(const sf::OutPointerBuffer &out, const sf::InPointerBuffer &base, const sf::InPointerBuffer &exp, const sf::InPointerBuffer &mod);
|
||||
virtual Result GenerateAesKek(sf::Out<AccessKey> out_access_key, KeySource key_source, u32 generation, u32 option);
|
||||
virtual Result LoadAesKey(u32 keyslot, AccessKey access_key, KeySource key_source);
|
||||
virtual Result GenerateAesKey(Out<AesKey> out_key, AccessKey access_key, KeySource key_source);
|
||||
virtual Result GenerateAesKey(sf::Out<AesKey> out_key, AccessKey access_key, KeySource key_source);
|
||||
virtual Result SetConfig(u32 which, u64 value);
|
||||
virtual Result GenerateRandomBytes(OutPointerWithClientSize<u8> out);
|
||||
virtual Result ImportLotusKey(InPointer<u8> src, AccessKey access_key, KeySource key_source, u32 option);
|
||||
virtual Result DecryptLotusMessage(Out<u32> out_size, OutPointerWithClientSize<u8> out, InPointer<u8> base, InPointer<u8> mod, InPointer<u8> label_digest);
|
||||
virtual Result IsDevelopment(Out<bool> is_dev);
|
||||
virtual Result GenerateSpecificAesKey(Out<AesKey> out_key, KeySource key_source, u32 generation, u32 which);
|
||||
virtual Result DecryptRsaPrivateKey(OutPointerWithClientSize<u8> dst, InPointer<u8> src, AccessKey access_key, KeySource key_source, u32 option);
|
||||
virtual Result DecryptAesKey(Out<AesKey> out_key, KeySource key_source, u32 generation, u32 option);
|
||||
virtual Result CryptAesCtrDeprecated(OutBuffer<u8> out_buf, u32 keyslot, InBuffer<u8> in_buf, IvCtr iv_ctr);
|
||||
virtual Result CryptAesCtr(OutBuffer<u8, BufferType_Type1> out_buf, u32 keyslot, InBuffer<u8, BufferType_Type1> in_buf, IvCtr iv_ctr);
|
||||
virtual Result ComputeCmac(Out<Cmac> out_cmac, u32 keyslot, InPointer<u8> in_buf);
|
||||
virtual Result ImportEsKey(InPointer<u8> src, AccessKey access_key, KeySource key_source, u32 option);
|
||||
virtual Result UnwrapTitleKey(Out<AccessKey> out_access_key, InPointer<u8> base, InPointer<u8> mod, InPointer<u8> label_digest, u32 generation);
|
||||
virtual Result GenerateRandomBytes(const sf::OutPointerBuffer &out);
|
||||
virtual Result ImportLotusKey(const sf::InPointerBuffer &src, AccessKey access_key, KeySource key_source, u32 option);
|
||||
virtual Result DecryptLotusMessage(sf::Out<u32> out_size, const sf::OutPointerBuffer &out, const sf::InPointerBuffer &base, const sf::InPointerBuffer &mod, const sf::InPointerBuffer &label_digest);
|
||||
virtual Result IsDevelopment(sf::Out<bool> is_dev);
|
||||
virtual Result GenerateSpecificAesKey(sf::Out<AesKey> out_key, KeySource key_source, u32 generation, u32 which);
|
||||
virtual Result DecryptRsaPrivateKey(const sf::OutPointerBuffer &dst, const sf::InPointerBuffer &src, AccessKey access_key, KeySource key_source, u32 option);
|
||||
virtual Result DecryptAesKey(sf::Out<AesKey> out_key, KeySource key_source, u32 generation, u32 option);
|
||||
virtual Result CryptAesCtrDeprecated(const sf::OutBuffer &out_buf, u32 keyslot, const sf::InBuffer &in_buf, IvCtr iv_ctr);
|
||||
virtual Result CryptAesCtr(const sf::OutNonSecureBuffer &out_buf, u32 keyslot, const sf::InNonSecureBuffer &in_buf, IvCtr iv_ctr);
|
||||
virtual Result ComputeCmac(sf::Out<Cmac> out_cmac, u32 keyslot, const sf::InPointerBuffer &in_buf);
|
||||
virtual Result ImportEsKey(const sf::InPointerBuffer &src, AccessKey access_key, KeySource key_source, u32 option);
|
||||
virtual Result UnwrapTitleKeyDeprecated(sf::Out<AccessKey> out_access_key, const sf::InPointerBuffer &base, const sf::InPointerBuffer &mod, const sf::InPointerBuffer &label_digest);
|
||||
virtual Result UnwrapTitleKey(sf::Out<AccessKey> out_access_key, const sf::InPointerBuffer &base, const sf::InPointerBuffer &mod, const sf::InPointerBuffer &label_digest, u32 generation);
|
||||
virtual Result LoadTitleKey(u32 keyslot, AccessKey access_key);
|
||||
virtual Result UnwrapCommonTitleKey(Out<AccessKey> out_access_key, KeySource key_source, u32 generation);
|
||||
virtual Result AllocateAesKeyslot(Out<u32> out_keyslot);
|
||||
virtual Result UnwrapCommonTitleKeyDeprecated(sf::Out<AccessKey> out_access_key, KeySource key_source);
|
||||
virtual Result UnwrapCommonTitleKey(sf::Out<AccessKey> out_access_key, KeySource key_source, u32 generation);
|
||||
virtual Result AllocateAesKeyslot(sf::Out<u32> out_keyslot);
|
||||
virtual Result FreeAesKeyslot(u32 keyslot);
|
||||
virtual void GetAesKeyslotAvailableEvent(Out<CopiedHandle> out_hnd);
|
||||
virtual void GetAesKeyslotAvailableEvent(sf::OutCopyHandle out_hnd);
|
||||
virtual Result SetBootReason(BootReasonValue boot_reason);
|
||||
virtual Result GetBootReason(Out<BootReasonValue> out);
|
||||
virtual Result GetBootReason(sf::Out<BootReasonValue> out);
|
||||
public:
|
||||
DEFINE_SERVICE_DISPATCH_TABLE {
|
||||
MAKE_SERVICE_COMMAND_META(DeprecatedService, GetConfig),
|
||||
MAKE_SERVICE_COMMAND_META(DeprecatedService, ExpMod),
|
||||
MAKE_SERVICE_COMMAND_META(DeprecatedService, GenerateAesKek),
|
||||
MAKE_SERVICE_COMMAND_META(DeprecatedService, LoadAesKey),
|
||||
MAKE_SERVICE_COMMAND_META(DeprecatedService, GenerateAesKey),
|
||||
MAKE_SERVICE_COMMAND_META(DeprecatedService, SetConfig),
|
||||
MAKE_SERVICE_COMMAND_META(DeprecatedService, GenerateRandomBytes),
|
||||
MAKE_SERVICE_COMMAND_META(DeprecatedService, ImportLotusKey),
|
||||
MAKE_SERVICE_COMMAND_META(DeprecatedService, DecryptLotusMessage),
|
||||
MAKE_SERVICE_COMMAND_META(DeprecatedService, IsDevelopment),
|
||||
MAKE_SERVICE_COMMAND_META(DeprecatedService, GenerateSpecificAesKey),
|
||||
MAKE_SERVICE_COMMAND_META(DeprecatedService, DecryptRsaPrivateKey),
|
||||
MAKE_SERVICE_COMMAND_META(DeprecatedService, DecryptAesKey),
|
||||
MAKE_SERVICE_COMMAND_META(DeprecatedService, CryptAesCtrDeprecated, FirmwareVersion_100, FirmwareVersion_100),
|
||||
MAKE_SERVICE_COMMAND_META(DeprecatedService, CryptAesCtr, FirmwareVersion_200),
|
||||
MAKE_SERVICE_COMMAND_META(DeprecatedService, ComputeCmac),
|
||||
MAKE_SERVICE_COMMAND_META(DeprecatedService, ImportEsKey),
|
||||
MAKE_SERVICE_COMMAND_META(DeprecatedService, UnwrapTitleKey),
|
||||
MAKE_SERVICE_COMMAND_META(DeprecatedService, LoadTitleKey),
|
||||
MAKE_SERVICE_COMMAND_META(DeprecatedService, UnwrapCommonTitleKey, FirmwareVersion_200),
|
||||
MAKE_SERVICE_COMMAND_META(DeprecatedService, AllocateAesKeyslot, FirmwareVersion_200),
|
||||
MAKE_SERVICE_COMMAND_META(DeprecatedService, FreeAesKeyslot, FirmwareVersion_200),
|
||||
MAKE_SERVICE_COMMAND_META(DeprecatedService, GetAesKeyslotAvailableEvent, FirmwareVersion_200),
|
||||
MAKE_SERVICE_COMMAND_META(DeprecatedService, SetBootReason, FirmwareVersion_300),
|
||||
MAKE_SERVICE_COMMAND_META(DeprecatedService, GetBootReason, FirmwareVersion_300),
|
||||
MAKE_SERVICE_COMMAND_META(GetConfig),
|
||||
MAKE_SERVICE_COMMAND_META(ExpMod),
|
||||
MAKE_SERVICE_COMMAND_META(GenerateAesKek),
|
||||
MAKE_SERVICE_COMMAND_META(LoadAesKey),
|
||||
MAKE_SERVICE_COMMAND_META(GenerateAesKey),
|
||||
MAKE_SERVICE_COMMAND_META(SetConfig),
|
||||
MAKE_SERVICE_COMMAND_META(GenerateRandomBytes),
|
||||
MAKE_SERVICE_COMMAND_META(ImportLotusKey),
|
||||
MAKE_SERVICE_COMMAND_META(DecryptLotusMessage),
|
||||
MAKE_SERVICE_COMMAND_META(IsDevelopment),
|
||||
MAKE_SERVICE_COMMAND_META(GenerateSpecificAesKey),
|
||||
MAKE_SERVICE_COMMAND_META(DecryptRsaPrivateKey),
|
||||
MAKE_SERVICE_COMMAND_META(DecryptAesKey),
|
||||
|
||||
MAKE_SERVICE_COMMAND_META(CryptAesCtrDeprecated, hos::Version_100, hos::Version_100),
|
||||
MAKE_SERVICE_COMMAND_META(CryptAesCtr, hos::Version_200),
|
||||
|
||||
MAKE_SERVICE_COMMAND_META(ComputeCmac),
|
||||
MAKE_SERVICE_COMMAND_META(ImportEsKey),
|
||||
|
||||
MAKE_SERVICE_COMMAND_META(UnwrapTitleKeyDeprecated, hos::Version_100, hos::Version_200),
|
||||
MAKE_SERVICE_COMMAND_META(UnwrapTitleKey, hos::Version_300),
|
||||
|
||||
MAKE_SERVICE_COMMAND_META(LoadTitleKey),
|
||||
|
||||
MAKE_SERVICE_COMMAND_META(UnwrapCommonTitleKeyDeprecated, hos::Version_200, hos::Version_200),
|
||||
MAKE_SERVICE_COMMAND_META(UnwrapCommonTitleKey, hos::Version_300),
|
||||
|
||||
MAKE_SERVICE_COMMAND_META(AllocateAesKeyslot, hos::Version_200),
|
||||
MAKE_SERVICE_COMMAND_META(FreeAesKeyslot, hos::Version_200),
|
||||
MAKE_SERVICE_COMMAND_META(GetAesKeyslotAvailableEvent, hos::Version_200),
|
||||
|
||||
MAKE_SERVICE_COMMAND_META(SetBootReason, hos::Version_300),
|
||||
MAKE_SERVICE_COMMAND_META(GetBootReason, hos::Version_300),
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue