nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-12-22 20:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix smcComputeCmac, generally improve userpage cache usage

Browse source
This commit is contained in:
Michael Scire 2018-03-08 04:59:00 -08:00
parent ec8f27f1be
commit 8e5228866c
3 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
exosphere/src/se.c
View file

@ -216,7 +216,7 @@ void clear_aes_keyslot_iv(unsigned int keyslot) {
} }
for (size_t i = 0; i < (0x10 >> 2); i++) { for (size_t i = 0; i < (0x10 >> 2); i++) {
SECURITY_ENGINE->AES_KEYTABLE_ADDR = (keyslot << 4) | 8; SECURITY_ENGINE->AES_KEYTABLE_ADDR = (keyslot << 4) | 8 | i;
SECURITY_ENGINE->AES_KEYTABLE_DATA = 0; SECURITY_ENGINE->AES_KEYTABLE_DATA = 0;
} }
} }
@ -585,10 +585,13 @@ void se_compute_aes_cmac(unsigned int keyslot, void *cmac, size_t cmac_size, con
generic_panic(); generic_panic();
} }
if (data_size) {
flush_dcache_range((uint8_t *)data, (uint8_t *)data + data_size);
}
/* Generate the derived key, to be XOR'd with final output block. */ /* Generate the derived key, to be XOR'd with final output block. */
uint8_t derived_key[0x10]; uint8_t derived_key[0x10] = {0};
memset(derived_key, 0, sizeof(derived_key)); se_aes_ecb_encrypt_block(keyslot, derived_key, sizeof(derived_key), derived_key, sizeof(derived_key), config_high);
se_aes_128_ecb_encrypt_block(keyslot, derived_key, sizeof(derived_key), derived_key, sizeof(derived_key));
shift_left_xor_rb(derived_key); shift_left_xor_rb(derived_key);
if (data_size & 0xF) { if (data_size & 0xF) {
shift_left_xor_rb(derived_key); shift_left_xor_rb(derived_key);
@ -598,6 +601,7 @@ void se_compute_aes_cmac(unsigned int keyslot, void *cmac, size_t cmac_size, con
SECURITY_ENGINE->CRYPTO_REG = (keyslot << 24) | (0x145); SECURITY_ENGINE->CRYPTO_REG = (keyslot << 24) | (0x145);
clear_aes_keyslot_iv(keyslot); clear_aes_keyslot_iv(keyslot);
unsigned int num_blocks = (data_size + 0xF) >> 4; unsigned int num_blocks = (data_size + 0xF) >> 4;
/* Handle aligned blocks. */ /* Handle aligned blocks. */
if (num_blocks > 1) { if (num_blocks > 1) {
@ -607,8 +611,7 @@ void se_compute_aes_cmac(unsigned int keyslot, void *cmac, size_t cmac_size, con
} }
/* Create final block. */ /* Create final block. */
uint8_t last_block[0x10]; uint8_t last_block[0x10] = {0};
memset(last_block, 0, sizeof(last_block));
if (data_size & 0xF) { if (data_size & 0xF) {
memcpy(last_block, data + (data_size & ~0xF), data_size & 0xF); memcpy(last_block, data + (data_size & ~0xF), data_size & 0xF);
last_block[data_size & 0xF] = 0x80; /* Last block = data || 100...0 */ last_block[data_size & 0xF] = 0x80; /* Last block = data || 100...0 */
@ -621,6 +624,7 @@ void se_compute_aes_cmac(unsigned int keyslot, void *cmac, size_t cmac_size, con
} }
/* Perform last operation. */ /* Perform last operation. */
SECURITY_ENGINE->BLOCK_COUNT_REG = 0;
flush_dcache_range(last_block, last_block + sizeof(last_block)); flush_dcache_range(last_block, last_block + sizeof(last_block));
trigger_se_blocking_op(OP_START, NULL, 0, last_block, sizeof(last_block)); trigger_se_blocking_op(OP_START, NULL, 0, last_block, sizeof(last_block));

7
exosphere/src/smc_user.c
View file

@ -357,6 +357,7 @@ uint32_t user_compute_cmac(smc_args_t *args) {
} }
flush_dcache_range(user_data, user_data + size); flush_dcache_range(user_data, user_data + size);
se_compute_aes_128_cmac(keyslot, result_cmac, 0x10, user_data, size); se_compute_aes_128_cmac(keyslot, result_cmac, 0x10, user_data, size);
/* Copy CMAC out. */ /* Copy CMAC out. */
@ -400,6 +401,8 @@ uint32_t user_load_rsa_oaep_key(smc_args_t *args) {
return 2; return 2;
} }
flush_dcache_range(user_data, user_data + size);
/* Ensure that our private key is 0x100 bytes. */ /* Ensure that our private key is 0x100 bytes. */
if (gcm_decrypt_key(user_data, size, user_data, size, sealed_kek, 0x10, wrapped_key, 0x10, CRYPTOUSECASE_RSAOAEP, is_personalized) < 0x100) { if (gcm_decrypt_key(user_data, size, user_data, size, sealed_kek, 0x10, wrapped_key, 0x10, CRYPTOUSECASE_RSAOAEP, is_personalized) < 0x100) {
return 2; return 2;
@ -447,6 +450,8 @@ uint32_t user_decrypt_rsa_private_key(smc_args_t *args) {
return 2; return 2;
} }
flush_dcache_range(user_data, user_data + size);
size_t out_size; size_t out_size;
if ((out_size = gcm_decrypt_key(user_data, size, user_data, size, sealed_kek, 0x10, wrapped_key, 0x10, CRYPTOUSECASE_RSAPRIVATE, is_personalized)) == 0) { if ((out_size = gcm_decrypt_key(user_data, size, user_data, size, sealed_kek, 0x10, wrapped_key, 0x10, CRYPTOUSECASE_RSAPRIVATE, is_personalized)) == 0) {
@ -495,6 +500,8 @@ uint32_t user_load_secure_exp_mod_key(smc_args_t *args) {
return 2; return 2;
} }
flush_dcache_range(user_data, user_data + size);
size_t out_size; size_t out_size;
/* Ensure that our key is non-zero bytes. */ /* Ensure that our key is non-zero bytes. */

2
exosphere/src/userpage.c
View file

@ -32,6 +32,8 @@ bool upage_init(upage_ref_t *upage, void *user_address) {
mmu_map_page(mmu_l3_tbl, USER_PAGE_SECURE_MONITOR_ADDR, upage->user_address, userpage_attributes); mmu_map_page(mmu_l3_tbl, USER_PAGE_SECURE_MONITOR_ADDR, upage->user_address, userpage_attributes);
tlb_invalidate_page_inner_shareable((void *)USER_PAGE_SECURE_MONITOR_ADDR); tlb_invalidate_page_inner_shareable((void *)USER_PAGE_SECURE_MONITOR_ADDR);
upage->secure_monitor_address = USER_PAGE_SECURE_MONITOR_ADDR; upage->secure_monitor_address = USER_PAGE_SECURE_MONITOR_ADDR;
} else {
generic_panic();
} }
} }