mirrors/pico-hsm
1
0
Fork 0
mirror of https://github.com/polhenarejos/pico-hsm.git synced 2026-01-17 09:28:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Do not make a PRKD on key unwrap since it is already done when storing.

Browse source 
Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>
This commit is contained in:
Pol Henarejos 2023-11-13 15:33:52 +01:00
parent e96e1d0097
commit 74afa07512
No known key found for this signature in database
GPG key ID: C0095B7870A4CCD3
1 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/hsm/cmd_key_unwrap.c
View file

@ -30,8 +30,8 @@ int cmd_key_unwrap() {
return SW_SECURITY_STATUS_NOT_SATISFIED(); return SW_SECURITY_STATUS_NOT_SATISFIED();
} }
int key_type = dkek_type_key(apdu.data); int key_type = dkek_type_key(apdu.data);
uint8_t kdom = -1, *allowed = NULL, prkd_buf[128]; uint8_t kdom = -1, *allowed = NULL;
size_t allowed_len = 0, prkd_len = 0; size_t allowed_len = 0;
if (key_type == 0x0) { if (key_type == 0x0) {
return SW_DATA_INVALID(); return SW_DATA_INVALID();
} }
@ -50,12 +50,10 @@ int cmd_key_unwrap() {
mbedtls_rsa_free(&ctx); mbedtls_rsa_free(&ctx);
return SW_EXEC_ERROR(); return SW_EXEC_ERROR();
} }
int key_size = ctx.len;
mbedtls_rsa_free(&ctx); mbedtls_rsa_free(&ctx);
if (r != CCID_OK) { if (r != CCID_OK) {
return SW_EXEC_ERROR(); return SW_EXEC_ERROR();
} }
prkd_len = asn1_build_prkd_rsa(NULL, 0, NULL, 0, key_size * 8, prkd_buf, sizeof(prkd_buf));
} }
else if (key_type & PICO_KEYS_KEY_EC) { else if (key_type & PICO_KEYS_KEY_EC) {
mbedtls_ecdsa_context ctx; mbedtls_ecdsa_context ctx;
@ -72,12 +70,10 @@ int cmd_key_unwrap() {
mbedtls_ecdsa_free(&ctx); mbedtls_ecdsa_free(&ctx);
return SW_EXEC_ERROR(); return SW_EXEC_ERROR();
} }
int key_size = ctx.grp.nbits;
mbedtls_ecdsa_free(&ctx); mbedtls_ecdsa_free(&ctx);
if (r != CCID_OK) { if (r != CCID_OK) {
return SW_EXEC_ERROR(); return SW_EXEC_ERROR();
} }
prkd_len = asn1_build_prkd_ecc(NULL, 0, NULL, 0, key_size, prkd_buf, sizeof(prkd_buf));
} }
else if (key_type & PICO_KEYS_KEY_AES) { else if (key_type & PICO_KEYS_KEY_AES) {
uint8_t aes_key[64]; uint8_t aes_key[64];
@ -113,7 +109,6 @@ int cmd_key_unwrap() {
if (r != CCID_OK) { if (r != CCID_OK) {
return SW_EXEC_ERROR(); return SW_EXEC_ERROR();
} }
prkd_len = asn1_build_prkd_aes(NULL, 0, NULL, 0, key_size * 8, prkd_buf, sizeof(prkd_buf));
} }
if ((allowed != NULL && allowed_len > 0) || kdom >= 0) { if ((allowed != NULL && allowed_len > 0) || kdom >= 0) {
size_t meta_len = (allowed_len > 0 ? 2 + allowed_len : 0) + (kdom >= 0 ? 3 : 0); size_t meta_len = (allowed_len > 0 ? 2 + allowed_len : 0) + (kdom >= 0 ? 3 : 0);
@ -134,13 +129,6 @@ int cmd_key_unwrap() {
return r; return r;
} }
} }
if (prkd_len > 0) {
file_t *fpk = file_new((PRKD_PREFIX << 8) | key_id);
r = flash_write_data_to_file(fpk, prkd_buf, prkd_len);
if (r != 0) {
return SW_EXEC_ERROR();
}
}
if (res_APDU_size > 0) { if (res_APDU_size > 0) {
file_t *fpk = file_new((EE_CERTIFICATE_PREFIX << 8) | key_id); file_t *fpk = file_new((EE_CERTIFICATE_PREFIX << 8) | key_id);
r = flash_write_data_to_file(fpk, res_APDU, res_APDU_size); r = flash_write_data_to_file(fpk, res_APDU, res_APDU_size);