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

Fix returning shared secret.

Browse Source 
I do not know why a 0x04 was prepended.

Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>
This commit is contained in:
Pol Henarejos
2023-02-14 11:28:11 +01:00
parent 407110def4
commit 14c7852143
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/hsm/cmd_decrypt_asym.c
View File

@@ -118,14 +118,13 @@ int cmd_decrypt_asym() {
return SW_DATA_INVALID(); return SW_DATA_INVALID();
} }
size_t olen = 0; size_t olen = 0;
res_APDU[0] = 0x04; r = mbedtls_ecdh_calc_secret(&ctx, &olen, res_APDU, MBEDTLS_ECP_MAX_BYTES, random_gen, NULL);
r = mbedtls_ecdh_calc_secret(&ctx, &olen, res_APDU+1, MBEDTLS_ECP_MAX_BYTES, random_gen, NULL);
mbedtls_ecdh_free(&ctx); mbedtls_ecdh_free(&ctx);
if (r != 0) { if (r != 0) {
return SW_EXEC_ERROR(); return SW_EXEC_ERROR();
} }
if (p2 == ALGO_EC_DH) if (p2 == ALGO_EC_DH)
res_APDU_size = olen+1; res_APDU_size = olen;
else { else {
res_APDU_size = 0; res_APDU_size = 0;
size_t ext_len = 0; size_t ext_len = 0;
@@ -153,7 +152,7 @@ int cmd_decrypt_asym() {
if (tf) { if (tf) {
if (file_get_size(tf) == kdom_uid_len && memcmp(file_get_data(tf), kdom_uid, kdom_uid_len) == 0) { if (file_get_size(tf) == kdom_uid_len && memcmp(file_get_data(tf), kdom_uid, kdom_uid_len) == 0) {
file_new(EF_DKEK+n); file_new(EF_DKEK+n);
if (store_dkek_key(n, res_APDU+1) != CCID_OK) if (store_dkek_key(n, res_APDU) != CCID_OK)
return SW_EXEC_ERROR(); return SW_EXEC_ERROR();
return SW_OK(); return SW_OK();
} }