From 3d80b4edbc04565ea03d3780103115ace0191051 Mon Sep 17 00:00:00 2001
From: Michael Scire <SciresM@gmail.com>
Date: Tue, 20 Feb 2018 12:56:41 -0800
Subject: [PATCH] smcDecryptRsaPrivateKey

---
 exosphere/gcm.c      |  2 +-
 exosphere/gcm.h      |  2 +-
 exosphere/smc_api.c  |  4 ++++
 exosphere/smc_user.c | 52 ++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/exosphere/gcm.c b/exosphere/gcm.c
index cc6ddbf7b..20056137e 100644
--- a/exosphere/gcm.c
+++ b/exosphere/gcm.c
@@ -112,7 +112,7 @@ static void ghash(void *dst, const void *data, size_t data_size, const void *j_b
 
 
 /* This function is a doozy. It decrypts and validates a (non-standard) AES-GCM wrapped keypair. */
-size_t gcm_decrypt_key(unsigned int keyslot, void *dst, size_t dst_size, const void *src, size_t src_size, const void *sealed_kek, size_t kek_size, const void *wrapped_key, size_t key_size, unsigned int usecase, int is_personalized) {
+size_t gcm_decrypt_key(void *dst, size_t dst_size, const void *src, size_t src_size, const void *sealed_kek, size_t kek_size, const void *wrapped_key, size_t key_size, unsigned int usecase, int is_personalized) {
     if (is_personalized == 0) {
         /* Devkit keys use a different keyformat without a MAC/Device ID. */
         if (src_size <= 0x10 || src_size - 0x10 > dst_size) {
diff --git a/exosphere/gcm.h b/exosphere/gcm.h
index bfae2a984..03911ffba 100644
--- a/exosphere/gcm.h
+++ b/exosphere/gcm.h
@@ -3,6 +3,6 @@
 
 #include <stdint.h>
 
-size_t gcm_decrypt_key(unsigned int keyslot, void *dst, size_t dst_size, const void *src, size_t src_size, const void *sealed_kek, size_t kek_size, const void *wrapped_key, size_t key_size, unsigned int usecase, int is_personalized);
+size_t gcm_decrypt_key(void *dst, size_t dst_size, const void *src, size_t src_size, const void *sealed_kek, size_t kek_size, const void *wrapped_key, size_t key_size, unsigned int usecase, int is_personalized);
 
 #endif
diff --git a/exosphere/smc_api.c b/exosphere/smc_api.c
index 0419bb858..8afc3170e 100644
--- a/exosphere/smc_api.c
+++ b/exosphere/smc_api.c
@@ -309,6 +309,10 @@ uint32_t smc_compute_cmac(smc_args_t *args) {
     return smc_wrapper_sync(args, user_compute_cmac);
 }
 
+uint32_t smc_decrypt_rsa_private_key(smc_args_t *args) {
+    return smc_wrapper_sync(args, user_decrypt_rsa_private_key);
+}
+
 uint32_t smc_rsa_oaep(smc_args_t *args) {
     return smc_wrapper_async(args, user_rsa_oaep, smc_exp_mod_get_result);
 }
diff --git a/exosphere/smc_user.c b/exosphere/smc_user.c
index edc0f379c..234aa1903 100644
--- a/exosphere/smc_user.c
+++ b/exosphere/smc_user.c
@@ -296,6 +296,58 @@ uint32_t user_compute_cmac(smc_args_t *args) {
     return 0;
 }
 
+uint32_t user_decrypt_rsa_private_key(smc_args_t *args) {
+    uint64_t sealed_kek[2];
+    uint64_t wrapped_key[2];
+    int is_personalized;
+    
+    uint8_t user_data[0x400];
+    void *user_address;
+    size_t size;
+    upage_ref_t page_ref;
+
+    
+    /* Copy keydata */
+    sealed_kek[0] = args->X[1];
+    sealed_kek[1] = args->X[2];
+    if (args->X[3] > 1) {
+        return 2;
+    }
+    is_personalized = (int)args->X[3];
+    user_address = (void *)args->X[4];
+    size = = (size_t)args->X[5];
+    wrapped_key[0] = args->X[6];
+    wrapped_key[1] = args->X[7];
+    
+    if (size > 0x240) {
+        return 2;
+    }
+    
+    if (is_personalized && size < 0x31) {
+        return 2;
+    }
+    if (!is_personalized && (size < 0x11 /* || GET_BOOTROM_PATCH_VERSION >= 0x7F */)) {
+        return 2;
+    }
+    
+    if (upage_init(&page_ref, user_address) == 0 || user_copy_to_secure(&page_ref, user_data, user_address, size) == 0) {
+        return 2;
+    }
+    
+    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) {
+        return 2;
+    }
+    
+    if (secure_copy_to_user(&page_ref, user_address, user_data, size) == 0) {
+        return 2;
+    }
+
+    args->X[1] = out_size;
+    return 0;
+}
+
 uint32_t user_rsa_oaep(smc_args_t *args) {
     uint8_t modulus[0x100];
     uint8_t input[0x100];