mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-06-22 04:52:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

spl: fix cryptAesCtr definition

Browse Source
This commit is contained in:
Michael Scire 2019-04-25 05:37:40 -07:00 committed by fincs
parent ee34c620f7
commit 0666e4651e
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nx/include/switch/services/spl.h
View File

@ -64,7 +64,7 @@ Result splCryptoGenerateAesKek(const void *wrapped_kek, u32 key_generation, u32
Result splCryptoLoadAesKey(const void *sealed_kek, const void *wrapped_key, u32 keyslot); Result splCryptoLoadAesKey(const void *sealed_kek, const void *wrapped_key, u32 keyslot);
Result splCryptoGenerateAesKey(const void *sealed_kek, const void *wrapped_key, void *out_sealed_key); Result splCryptoGenerateAesKey(const void *sealed_kek, const void *wrapped_key, void *out_sealed_key);
Result splCryptoDecryptAesKey(const void *wrapped_key, u32 key_generation, u32 option, void *out_sealed_key); Result splCryptoDecryptAesKey(const void *wrapped_key, u32 key_generation, u32 option, void *out_sealed_key);
Result splCryptoCryptAesCtr(const void *input, void *output, size_t size, const void *ctr); Result splCryptoCryptAesCtr(const void *input, void *output, size_t size, u32 keyslot, const void *ctr);
Result splCryptoComputeCmac(const void *input, size_t size, u32 keyslot, void *out_cmac); Result splCryptoComputeCmac(const void *input, size_t size, u32 keyslot, void *out_cmac);
Result splCryptoLockAesEngine(u32 *out_keyslot); Result splCryptoLockAesEngine(u32 *out_keyslot);
Result splCryptoUnlockAesEngine(u32 keyslot); Result splCryptoUnlockAesEngine(u32 keyslot);

4
nx/source/services/spl.c
View File

@ -572,7 +572,7 @@ Result splCryptoDecryptAesKey(const void *wrapped_key, u32 key_generation, u32 o
return rc; return rc;
} }
Result splCryptoCryptAesCtr(const void *input, void *output, size_t size, const void *ctr) { Result splCryptoCryptAesCtr(const void *input, void *output, size_t size, u32 keyslot, const void *ctr) {
IpcCommand c; IpcCommand c;
ipcInitialize(&c); ipcInitialize(&c);
@ -583,6 +583,7 @@ Result splCryptoCryptAesCtr(const void *input, void *output, size_t size, const
u64 magic; u64 magic;
u64 cmd_id; u64 cmd_id;
u8 ctr[0x10]; u8 ctr[0x10];
u32 keyslot;
} *raw; } *raw;
raw = ipcPrepareHeader(&c, sizeof(*raw)); raw = ipcPrepareHeader(&c, sizeof(*raw));
@ -590,6 +591,7 @@ Result splCryptoCryptAesCtr(const void *input, void *output, size_t size, const
raw->magic = SFCI_MAGIC; raw->magic = SFCI_MAGIC;
raw->cmd_id = 15; raw->cmd_id = 15;
memcpy(raw->ctr, ctr, sizeof(raw->ctr)); memcpy(raw->ctr, ctr, sizeof(raw->ctr));
raw->keyslot = keyslot;
Result rc = serviceIpcDispatch(_splGetCryptoSrv()); Result rc = serviceIpcDispatch(_splGetCryptoSrv());