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

Fix DKEK are only created when requested and not by default.

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

10
src/hsm/sc_hsm.c
View File

@@ -772,12 +772,14 @@ static int cmd_initialize() {
} }
else if (tag == 0x97) { else if (tag == 0x97) {
kds = tag_data; kds = tag_data;
/*
for (int i = 0; i < MIN(*kds,MAX_KEY_DOMAINS); i++) { for (int i = 0; i < MIN(*kds,MAX_KEY_DOMAINS); i++) {
file_t *tf = file_new(EF_DKEK+i); file_t *tf = file_new(EF_DKEK+i);
if (!tf) if (!tf)
return SW_MEMORY_FAILURE(); return SW_MEMORY_FAILURE();
flash_write_data_to_file(tf, NULL, 0); flash_write_data_to_file(tf, NULL, 0);
} }
*/
} }
} }
file_t *tf_kd = search_by_fid(EF_KEY_DOMAIN, NULL, SPECIFY_EF); file_t *tf_kd = search_by_fid(EF_KEY_DOMAIN, NULL, SPECIFY_EF);
@@ -923,7 +925,7 @@ static int cmd_key_domain() {
uint16_t tf_kd_size = file_get_size(tf_kd); uint16_t tf_kd_size = file_get_size(tf_kd);
if (tf_kd_size == 0) if (tf_kd_size == 0)
return SW_WRONG_P1P2(); return SW_WRONG_P1P2();
uint8_t *kdata = file_get_data(tf_kd), dkeks = kdata ? *(kdata+2*p2) : 0, current_dkeks = kdata ? *(kdata+2*p2+1) : 0; uint8_t *kdata = file_get_data(tf_kd), dkeks = kdata ? kdata[2*p2] : 0, current_dkeks = kdata ? kdata[2*p2+1] : 0;
if (p1 == 0x0) { //dkek import if (p1 == 0x0) { //dkek import
if (apdu.nc > 0) { if (apdu.nc > 0) {
file_t *tf = file_new(EF_DKEK+p2); file_t *tf = file_new(EF_DKEK+p2);
@@ -944,8 +946,10 @@ static int cmd_key_domain() {
low_flash_available(); low_flash_available();
} }
else { else {
file_t *tf = search_dynamic_file(EF_DKEK+p2); //file_t *tf = search_dynamic_file(EF_DKEK+p2);
if (!tf) //if (!tf)
// return SW_INCORRECT_P1P2();
if (2*p2 >= tf_kd_size)
return SW_INCORRECT_P1P2(); return SW_INCORRECT_P1P2();
if (current_dkeks == 0xff) if (current_dkeks == 0xff)
return SW_REFERENCE_NOT_FOUND(); return SW_REFERENCE_NOT_FOUND();