nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2025-01-09 14:07:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

spl: refactor to use R_TRY

Browse source
This commit is contained in:
Michael Scire 2019-06-17 09:00:15 -07:00
parent 1c503d59b5
commit a0cf3bbed8
2 changed files with 13 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
stratosphere/spl/source/spl_secmon_wrapper.cpp
View file

@ -387,10 +387,7 @@ Result SecureMonitorWrapper::GenerateRandomBytes(void *out, size_t size) {
for (size_t ofs = 0; ofs < size; ofs += CtrDrbg::MaxRequestSize) { for (size_t ofs = 0; ofs < size; ofs += CtrDrbg::MaxRequestSize) {
const size_t cur_size = std::min(size - ofs, CtrDrbg::MaxRequestSize); const size_t cur_size = std::min(size - ofs, CtrDrbg::MaxRequestSize);
Result rc = GenerateRandomBytesInternal(cur_dst, size); R_TRY(GenerateRandomBytesInternal(cur_dst, size));
if (R_FAILED(rc)) {
return rc;
}
cur_dst += cur_size; cur_dst += cur_size;
} }
@ -399,10 +396,7 @@ Result SecureMonitorWrapper::GenerateRandomBytes(void *out, size_t size) {
Result SecureMonitorWrapper::IsDevelopment(bool *out) { Result SecureMonitorWrapper::IsDevelopment(bool *out) {
u64 is_retail; u64 is_retail;
Result rc = this->GetConfig(&is_retail, SplConfigItem_IsRetail); R_TRY(this->GetConfig(&is_retail, SplConfigItem_IsRetail));
if (R_FAILED(rc)) {
return rc;
}
*out = (is_retail == 0); *out = (is_retail == 0);
return ResultSuccess; return ResultSuccess;
@ -432,15 +426,11 @@ Result SecureMonitorWrapper::GenerateAesKek(AccessKey *out_access_key, const Key
} }
Result SecureMonitorWrapper::LoadAesKey(u32 keyslot, const void *owner, const AccessKey &access_key, const KeySource &key_source) { Result SecureMonitorWrapper::LoadAesKey(u32 keyslot, const void *owner, const AccessKey &access_key, const KeySource &key_source) {
Result rc = ValidateAesKeyslot(keyslot, owner); R_TRY(ValidateAesKeyslot(keyslot, owner));
if (R_FAILED(rc)) {
return rc;
}
return ConvertToSplResult(SmcWrapper::LoadAesKey(keyslot, access_key, key_source)); return ConvertToSplResult(SmcWrapper::LoadAesKey(keyslot, access_key, key_source));
} }
Result SecureMonitorWrapper::GenerateAesKey(AesKey *out_key, const AccessKey &access_key, const KeySource &key_source) { Result SecureMonitorWrapper::GenerateAesKey(AesKey *out_key, const AccessKey &access_key, const KeySource &key_source) {
Result rc;
SmcResult smc_rc; SmcResult smc_rc;
static const KeySource s_generate_aes_key_source = { static const KeySource s_generate_aes_key_source = {
@ -448,9 +438,7 @@ Result SecureMonitorWrapper::GenerateAesKey(AesKey *out_key, const AccessKey &ac
}; };
ScopedAesKeyslot keyslot_holder(this); ScopedAesKeyslot keyslot_holder(this);
if (R_FAILED((rc = keyslot_holder.Allocate()))) { R_TRY(keyslot_holder.Allocate());
return rc;
}
smc_rc = SmcWrapper::LoadAesKey(keyslot_holder.GetKeyslot(), access_key, s_generate_aes_key_source); smc_rc = SmcWrapper::LoadAesKey(keyslot_holder.GetKeyslot(), access_key, s_generate_aes_key_source);
if (smc_rc == SmcResult_Success) { if (smc_rc == SmcResult_Success) {
@ -461,25 +449,18 @@ Result SecureMonitorWrapper::GenerateAesKey(AesKey *out_key, const AccessKey &ac
} }
Result SecureMonitorWrapper::DecryptAesKey(AesKey *out_key, const KeySource &key_source, u32 generation, u32 option) { Result SecureMonitorWrapper::DecryptAesKey(AesKey *out_key, const KeySource &key_source, u32 generation, u32 option) {
Result rc;
static const KeySource s_decrypt_aes_key_source = { static const KeySource s_decrypt_aes_key_source = {
.data = {0x11, 0x70, 0x24, 0x2B, 0x48, 0x69, 0x11, 0xF1, 0x11, 0xB0, 0x0C, 0x47, 0x7C, 0xC3, 0xEF, 0x7E} .data = {0x11, 0x70, 0x24, 0x2B, 0x48, 0x69, 0x11, 0xF1, 0x11, 0xB0, 0x0C, 0x47, 0x7C, 0xC3, 0xEF, 0x7E}
}; };
AccessKey access_key; AccessKey access_key;
if (R_FAILED((rc = GenerateAesKek(&access_key, s_decrypt_aes_key_source, generation, option)))) { R_TRY(GenerateAesKek(&access_key, s_decrypt_aes_key_source, generation, option));
return rc;
}
return GenerateAesKey(out_key, access_key, key_source); return GenerateAesKey(out_key, access_key, key_source);
} }
Result SecureMonitorWrapper::CryptAesCtr(void *dst, size_t dst_size, u32 keyslot, const void *owner, const void *src, size_t src_size, const IvCtr &iv_ctr) { Result SecureMonitorWrapper::CryptAesCtr(void *dst, size_t dst_size, u32 keyslot, const void *owner, const void *src, size_t src_size, const IvCtr &iv_ctr) {
Result rc = ValidateAesKeyslot(keyslot, owner); R_TRY(ValidateAesKeyslot(keyslot, owner));
if (R_FAILED(rc)) {
return rc;
}
/* Succeed immediately if there's nothing to crypt. */ /* Succeed immediately if there's nothing to crypt. */
if (src_size == 0) { if (src_size == 0) {
@ -546,10 +527,7 @@ Result SecureMonitorWrapper::CryptAesCtr(void *dst, size_t dst_size, u32 keyslot
} }
Result SecureMonitorWrapper::ComputeCmac(Cmac *out_cmac, u32 keyslot, const void *owner, const void *data, size_t size) { Result SecureMonitorWrapper::ComputeCmac(Cmac *out_cmac, u32 keyslot, const void *owner, const void *data, size_t size) {
Result rc = ValidateAesKeyslot(keyslot, owner); R_TRY(ValidateAesKeyslot(keyslot, owner));
if (R_FAILED(rc)) {
return rc;
}
if (size > MaxWorkBufferSize) { if (size > MaxWorkBufferSize) {
return ResultSplInvalidSize; return ResultSplInvalidSize;
@ -594,10 +572,7 @@ Result SecureMonitorWrapper::FreeAesKeyslot(u32 keyslot, const void *owner) {
return ResultSuccess; return ResultSuccess;
} }
Result rc = ValidateAesKeyslot(keyslot, owner); R_TRY(ValidateAesKeyslot(keyslot, owner));
if (R_FAILED(rc)) {
return rc;
}
/* Clear the keyslot. */ /* Clear the keyslot. */
{ {
@ -827,10 +802,7 @@ Result SecureMonitorWrapper::DecryptLotusMessage(u32 *out_size, void *dst, size_
} }
/* Nintendo doesn't check this result code, but we will. */ /* Nintendo doesn't check this result code, but we will. */
Result rc = SecureExpMod(g_work_buffer, 0x100, base, base_size, mod, mod_size, SmcSecureExpModMode_Lotus); R_TRY(SecureExpMod(g_work_buffer, 0x100, base, base_size, mod, mod_size, SmcSecureExpModMode_Lotus));
if (R_FAILED(rc)) {
return rc;
}
size_t data_size = DecodeRsaOaep(dst, dst_size, label_digest, label_digest_size, g_work_buffer, 0x100); size_t data_size = DecodeRsaOaep(dst, dst_size, label_digest, label_digest_size, g_work_buffer, 0x100);
if (data_size == 0) { if (data_size == 0) {
@ -846,10 +818,7 @@ Result SecureMonitorWrapper::GenerateSpecificAesKey(AesKey *out_key, const KeySo
} }
Result SecureMonitorWrapper::LoadTitleKey(u32 keyslot, const void *owner, const AccessKey &access_key) { Result SecureMonitorWrapper::LoadTitleKey(u32 keyslot, const void *owner, const AccessKey &access_key) {
Result rc = ValidateAesKeyslot(keyslot, owner); R_TRY(ValidateAesKeyslot(keyslot, owner));
if (R_FAILED(rc)) {
return rc;
}
return ConvertToSplResult(SmcWrapper::LoadTitleKey(keyslot, access_key)); return ConvertToSplResult(SmcWrapper::LoadTitleKey(keyslot, access_key));
} }

8
stratosphere/spl/source/spl_secmon_wrapper.hpp
View file

@ -129,11 +129,9 @@ class SecureMonitorWrapper {
} }
Result Allocate() { Result Allocate() {
Result rc = this->secmon_wrapper->AllocateAesKeyslot(&this->slot, this); R_TRY(this->secmon_wrapper->AllocateAesKeyslot(&this->slot, this));
if (R_SUCCEEDED(rc)) { this->has_slot = true;
this->has_slot = true; return ResultSuccess;
}
return rc;
} }
}; };
}; };