dearsky/pico-hsm
1
0
Fork 0
Code Issues 17 Pull Requests 4 Actions Packages Projects Releases 26 Wiki Activity

Fix Key Domain deletion.

Browse Source 
Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>
This commit is contained in:
Pol Henarejos
2022-08-12 19:46:08 +02:00
parent 7208d01547
commit de789cef66
1 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/hsm/sc_hsm.c
View File

@@ -853,7 +853,7 @@ uint8_t get_key_domain(file_t *fkey) {
const uint8_t *meta_tag = get_meta_tag(fkey, 0x92, &tag_len); const uint8_t *meta_tag = get_meta_tag(fkey, 0x92, &tag_len);
if (meta_tag) if (meta_tag)
return *meta_tag; return *meta_tag;
return 0; return 0xff;
} }
uint32_t get_key_counter(file_t *fkey) { uint32_t get_key_counter(file_t *fkey) {
@@ -911,6 +911,16 @@ uint32_t decrement_key_counter(file_t *fkey) {
return 0xffffffff; return 0xffffffff;
} }
int delete_file(file_t *ef) {
meta_delete(ef->fid);
if (flash_clear_file(ef) != CCID_OK)
return CCID_EXEC_ERROR;
if (delete_dynamic_file(ef) != CCID_OK)
return CCID_EXEC_ERROR;
low_flash_available();
return CCID_OK;
}
static int cmd_key_domain() { static int cmd_key_domain() {
//if (dkeks == 0) //if (dkeks == 0)
// return SW_COMMAND_NOT_ALLOWED(); // return SW_COMMAND_NOT_ALLOWED();
@@ -977,14 +987,18 @@ static int cmd_key_domain() {
} }
if (flash_write_data_to_file(tf_kd, t, tf_kd_size) != CCID_OK) if (flash_write_data_to_file(tf_kd, t, tf_kd_size) != CCID_OK)
return SW_EXEC_ERROR(); return SW_EXEC_ERROR();
uint8_t dk[DKEK_KEY_SIZE]; file_t *tf = NULL;
memset(dk, 0, sizeof(dk)); if ((tf = search_dynamic_file(EF_DKEK+p2))) {
if (store_dkek_key(p2, dk) != CCID_OK) if (delete_file(tf) != CCID_OK)
return SW_EXEC_ERROR(); return SW_EXEC_ERROR();
low_flash_available(); }
if ((tf = search_dynamic_file(EF_XKEK+p2))) {
if (delete_file(tf) != CCID_OK)
return SW_EXEC_ERROR();
}
return SW_OK(); return SW_OK();
} }
else if (p1 == 0x2) { else if (p1 == 0x2) { //XKEK Key Domain creation
if (apdu.nc > 0) { if (apdu.nc > 0) {
size_t pub_len = 0; size_t pub_len = 0;
const uint8_t *pub = cvc_get_pub(termca+2, (termca[1] << 8 | termca[0]), &pub_len); const uint8_t *pub = cvc_get_pub(termca+2, (termca[1] << 8 | termca[0]), &pub_len);
@@ -1294,12 +1308,8 @@ static int cmd_delete_file() {
} }
if (!authenticate_action(ef, ACL_OP_DELETE_SELF)) if (!authenticate_action(ef, ACL_OP_DELETE_SELF))
return SW_SECURITY_STATUS_NOT_SATISFIED(); return SW_SECURITY_STATUS_NOT_SATISFIED();
meta_delete(ef->fid); if (delete_file(ef) != CCID_OK)
if (flash_clear_file(ef) != CCID_OK)
return SW_EXEC_ERROR(); return SW_EXEC_ERROR();
if (delete_dynamic_file(ef) != CCID_OK)
return SW_EXEC_ERROR();
low_flash_available();
return SW_OK(); return SW_OK();
} }