The-Homebrew-Cloud/libmocha
2
0
Fork 0
mirror of https://github.com/wiiu-env/libmocha.git synced 2024-11-25 21:14:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve Mocha_ODMGetDiscKey behaviour and add documentation

Browse Source
This commit is contained in:
Maschell 2022-07-22 13:58:00 +02:00
parent 819adf8030
commit 6b49c2099d
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/mocha/mocha.h
View File

@ -12,6 +12,7 @@ typedef enum MochaUtilsStatus {
MOCHA_RESULT_SUCCESS = 0, MOCHA_RESULT_SUCCESS = 0,
MOCHA_RESULT_INVALID_ARGUMENT = -0x01, MOCHA_RESULT_INVALID_ARGUMENT = -0x01,
MOCHA_RESULT_MAX_CLIENT = -0x02, MOCHA_RESULT_MAX_CLIENT = -0x02,
MOCHA_RESULT_NOT_FOUND = -0x06,
MOCHA_RESULT_UNSUPPORTED_API_VERSION = -0x10, MOCHA_RESULT_UNSUPPORTED_API_VERSION = -0x10,
MOCHA_RESULT_UNSUPPORTED_COMMAND = -0x11, MOCHA_RESULT_UNSUPPORTED_COMMAND = -0x11,
MOCHA_RESULT_LIB_UNINITIALIZED = -0x20, MOCHA_RESULT_LIB_UNINITIALIZED = -0x20,
@ -90,6 +91,17 @@ typedef struct WUDDiscKey {
uint8_t key[0x10]; uint8_t key[0x10];
} WUDDiscKey; } WUDDiscKey;
/**
* Reads the disc key (used to decrypt the SI partition) of the inserted disc.
*
* @param discKey target buffer where the result will be stored.
* @return MOCHA_RESULT_SUCCESS: The disc key of the inserted disc has been read into the given buffer.<br>
* MOCHA_RESULT_INVALID_ARGUMENT: The given discKey buffer was NULL <br>
* MOCHA_RESULT_LIB_UNINITIALIZED: Library was not initialized. Call Mocha_InitLibrary() before using this function.<br>
* MOCHA_RESULT_UNSUPPORTED_COMMAND: Command not supported by the currently loaded mocha version.<br>
* MOCHA_RESULT_NOT_FOUND: Failed to obtain disc key, no disc inserted?.
* MOCHA_RESULT_UNKNOWN_ERROR: Unknown error.
*/
MochaUtilsStatus Mocha_ODMGetDiscKey(WUDDiscKey *discKey); MochaUtilsStatus Mocha_ODMGetDiscKey(WUDDiscKey *discKey);
MochaUtilsStatus Mocha_SEEPROMRead(uint8_t *out_buffer, uint32_t offset, uint32_t size); MochaUtilsStatus Mocha_SEEPROMRead(uint8_t *out_buffer, uint32_t offset, uint32_t size);

6
source/utils.cpp
View File

@ -171,10 +171,12 @@ MochaUtilsStatus Mocha_ODMGetDiscKey(WUDDiscKey *discKey) {
ALIGN_0x40 uint32_t io_buffer[0x40 / 4]; ALIGN_0x40 uint32_t io_buffer[0x40 / 4];
// disc encryption key, only works with patched IOSU // disc encryption key, only works with patched IOSU
io_buffer[0] = 3; io_buffer[0] = 3;
IOSError ioctlResult = IOS_Ioctl(odm_handle, 0x06, io_buffer, 0x14, io_buffer, 0x20);
if (IOS_Ioctl(odm_handle, 0x06, io_buffer, 0x14, io_buffer, 0x20) == IOS_ERROR_OK) { if (ioctlResult == IOS_ERROR_OK) {
memcpy(discKey, io_buffer, 16); memcpy(discKey, io_buffer, 16);
res = MOCHA_RESULT_SUCCESS; res = MOCHA_RESULT_SUCCESS;
} else if (ioctlResult == (IOSError) 0xFFF1EFFF) {
res = MOCHA_RESULT_NOT_FOUND;
} }
IOS_Close(odm_handle); IOS_Close(odm_handle);
} }