Skip to content

Commit

Permalink
add SBI_GENERATE_KEY_PAIR_AND_SIGNATURE
Browse files Browse the repository at this point in the history
  • Loading branch information
@iku-iku-iku
iku-iku-iku committed Aug 21, 2024
1 parent 514f3f4 commit 759e4b6
Show file tree
Hide file tree
Showing 7 changed files with 106 additions and 2 deletions.
2 changes: 2 additions & 0 deletions opensbi-1.2/include/sm/attest.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,6 @@ void sign_enclave(void* signature, unsigned char *message, int len);

int verify_enclave(void* signature, unsigned char *message, int len);

void generate_key_pair_and_sigature(void *pri_key_arg, void *pub_key_arg, void *signature_arg);

#endif /* _ATTEST_H */
2 changes: 2 additions & 0 deletions opensbi-1.2/include/sm/enclave.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,8 @@ uintptr_t enclave_sys_write(uintptr_t *regs);
uintptr_t enclave_user_defined_ocall(uintptr_t *regs, uintptr_t ocall_buf_size);
uintptr_t enclave_derive_seal_key(uintptr_t* regs, uintptr_t salt_va,
uintptr_t salt_len, uintptr_t key_buf_va, uintptr_t key_buf_len);
uintptr_t enclave_generate_key_pair_and_signature(uintptr_t* regs, uintptr_t pri_key_va,
uintptr_t pub_key_va, uintptr_t signature_va);

int check_in_enclave_world();

Expand Down
4 changes: 4 additions & 0 deletions opensbi-1.2/include/sm/sm.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ extern uintptr_t _fw_start[], _fw_end[];
#define SBI_EXIT_ENCLAVE 99
#define SBI_ENCLAVE_OCALL 98
#define SBI_GET_KEY 88
#define SBI_GENERATE_KEY_PAIR_AND_SIGNATURE 87

//Error code of SBI_ALLOC_ENCLAVE_MEM
#define RETRY_SPIN_LOCK -3
Expand Down Expand Up @@ -92,6 +93,9 @@ uintptr_t sm_enclave_ocall(uintptr_t *regs, uintptr_t ocall_func_id, uintptr_t a
uintptr_t sm_enclave_get_key(uintptr_t* regs, uintptr_t salt_va, uintptr_t salt_len,
uintptr_t key_buf_va, uintptr_t key_buf_len);

uintptr_t sm_enclave_generate_key_pair_and_signature(uintptr_t *regs, uintptr_t pri_key_va,
uintptr_t pub_key_va, uintptr_t signature_va);

uintptr_t sm_exit_enclave(uintptr_t *regs, unsigned long retval);

uintptr_t sm_do_timer_irq(uintptr_t *regs, uintptr_t mcause, uintptr_t mepc);
Expand Down
3 changes: 3 additions & 0 deletions opensbi-1.2/lib/sbi/sbi_ecall_penglai.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,9 @@ static int sbi_ecall_penglai_enclave_handler(unsigned long extid, unsigned long
case SBI_GET_KEY://88
ret = sm_enclave_get_key((uintptr_t *)regs, regs->a0, regs->a1, regs->a2, regs->a3);
break;
case SBI_GENERATE_KEY_PAIR_AND_SIGNATURE://87
ret = sm_enclave_generate_key_pair_and_signature((uintptr_t *)regs, regs->a0, regs->a1, regs->a2);
break;
default:
sbi_printf("[Penglai@Monitor] enclave interface(funcid:%ld) not supported yet\n", funcid);
ret = SBI_ENOTSUPP;
Expand Down
22 changes: 21 additions & 1 deletion opensbi-1.2/lib/sbi/sm/attest.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,31 @@ void attest_init()
printm("SM2_KeyGeneration failed with ret value: %d\n", i);
}

void generate_key_pair_and_sigature(void *pri_key_arg, void *pub_key_arg, void *signature_arg)
{
int i;
struct prikey_t *pri_key = (struct prikey_t *)pri_key_arg;
struct pubkey_t *pub_key = (struct pubkey_t *)pub_key_arg;
struct signature_t *signature = (struct signature_t*)signature_arg;
struct prikey_t *sm_prikey = (struct prikey_t *)SM_PRI_KEY;

i = SM2_Init();
if(i)
printm("SM2_Init failed with ret value: %d\n", i);

i = SM2_KeyGeneration(pri_key->dA, pub_key->xA, pub_key->yA);
if(i)
printm("SM2_KeyGeneration failed with ret value: %d\n", i);

SM2_Sign((void *)pub_key, SIGNATURE_SIZE, sm_prikey->dA, (unsigned char *)(signature->r),
(unsigned char *)(signature->s));
}

void sign_enclave(void* signature_arg, unsigned char *message, int len)
{
struct signature_t *signature = (struct signature_t*)signature_arg;
struct prikey_t *sm_prikey = (struct prikey_t *)SM_PRI_KEY;

SM2_Sign(message, len, sm_prikey->dA, (unsigned char *)(signature->r),
(unsigned char *)(signature->s));
}
Expand Down
55 changes: 55 additions & 0 deletions opensbi-1.2/lib/sbi/sm/enclave.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1124,3 +1124,58 @@ uintptr_t resume_from_ocall(uintptr_t* regs, unsigned int eid)
retval = resume_enclave(regs, eid);
return retval;
}

uintptr_t enclave_generate_key_pair_and_signature(uintptr_t* regs, uintptr_t pri_key_va, uintptr_t pub_key_va, uintptr_t signature_va)
{
uintptr_t ret = 0;
int eid = get_enclave_id();
struct enclave_t *enclave = NULL;

pte_t *enclave_root_pt;
unsigned char pri_key[PRIVATE_KEY_SIZE];
unsigned char pub_key[PUBLIC_KEY_SIZE];
unsigned char signature[SIGNATURE_SIZE];

if(check_in_enclave_world() < 0)
{
printm_err("[Penglai Monitor@%s] check enclave world is failed\n", __func__);
return -1;
}

enclave = get_enclave(eid);

spin_lock(&enclave_metadata_lock);

if(!enclave || check_enclave_authentication(enclave)!=0 || enclave->state != RUNNING)
{
ret = -1UL;
printm_err("[Penglai Monitor@%s] check enclave authentication is failed\n", __func__);
goto out;
}

generate_key_pair_and_sigature(pri_key, pub_key, signature);

enclave_root_pt = (pte_t*)(enclave->thread_context.encl_ptbr << RISCV_PGSHIFT);
ret = copy_to_enclave(enclave_root_pt, (void *)signature_va, signature, SIGNATURE_SIZE);
if(ret != 0){
ret = -1UL;
printm_err("[Penglai Monitor@%s] unknown error happended when copy to enclave\n", __func__);
goto out;
}
ret = copy_to_enclave(enclave_root_pt, (void *)pri_key_va, pri_key, PRIVATE_KEY_SIZE);
if(ret != 0){
ret = -1UL;
printm_err("[Penglai Monitor@%s] unknown error happended when copy to enclave\n", __func__);
goto out;
}
ret = copy_to_enclave(enclave_root_pt, (void *)pub_key_va, pub_key, PUBLIC_KEY_SIZE);
if(ret != 0){
ret = -1UL;
printm_err("[Penglai Monitor@%s] unknown error happended when copy to enclave\n", __func__);
goto out;
}

out:
spin_unlock(&enclave_metadata_lock);
return ret;
}
20 changes: 19 additions & 1 deletion opensbi-1.2/lib/sbi/sm/sm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,24 @@ uintptr_t sm_enclave_get_key(uintptr_t *regs, uintptr_t salt_va,
return ret;
}

/**
* \brief generate key pair and signed the pub key with sm private key.
*
* \param regs The enclave regs
* \param pri_key_va The private key pointer in enclave address space
* \param pub_key_va The public key pointer in enclave address space
* \param signature_va The signature pointer in enclave address space
*/
uintptr_t sm_enclave_generate_key_pair_and_signature(uintptr_t *regs,
uintptr_t pri_key_va, uintptr_t pub_key_va, uintptr_t signature_va)
{
uintptr_t ret = 0;

ret = enclave_generate_key_pair_and_signature(regs, pri_key_va, pub_key_va, signature_va);

return ret;
}

/**
* \brief This transitional function is used to destroy the enclave.
*
Expand Down Expand Up @@ -387,4 +405,4 @@ uintptr_t sm_free_enclave_mem(uintptr_t size_ptr, unsigned long flag)

copy_to_host((void *)size_ptr, (void *)(&size), sizeof(unsigned long));
return ret;
}
}

0 comments on commit 759e4b6

Please sign in to comment.