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

Fix initializing device.

Browse Source
This commit is contained in:
Pol Henarejos
2022-05-31 00:09:21 +02:00
parent 00e8596a0e
commit 271240f11c
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/hsm/sc_hsm.c
View File

@@ -742,7 +742,7 @@ static int cmd_initialize() {
return SW_EXEC_ERROR(); return SW_EXEC_ERROR();
file_t *tf = search_dynamic_file(EF_DKEK); file_t *tf = search_dynamic_file(EF_DKEK);
if (!tf) { if (!tf) {
file_t *tf = file_new(EF_DKEK); tf = file_new(EF_DKEK);
if (!tf) if (!tf)
return SW_MEMORY_FAILURE(); return SW_MEMORY_FAILURE();
} }
@@ -1962,7 +1962,6 @@ static int cmd_derive_asym() {
int r; int r;
r = load_private_key_ecdsa(&ctx, fkey); r = load_private_key_ecdsa(&ctx, fkey);
printf("r %d\n",r);
if (r != CCID_OK) { if (r != CCID_OK) {
mbedtls_ecdsa_free(&ctx); mbedtls_ecdsa_free(&ctx);
if (r == CCID_VERIFICATION_FAILED) if (r == CCID_VERIFICATION_FAILED)
@@ -1973,7 +1972,6 @@ static int cmd_derive_asym() {
mbedtls_mpi_init(&a); mbedtls_mpi_init(&a);
mbedtls_mpi_init(&nd); mbedtls_mpi_init(&nd);
r = mbedtls_mpi_read_binary(&a, apdu.data+1, apdu.nc-1); r = mbedtls_mpi_read_binary(&a, apdu.data+1, apdu.nc-1);
printf("r %d\n",r);
if (r != 0) { if (r != 0) {
mbedtls_ecdsa_free(&ctx); mbedtls_ecdsa_free(&ctx);
mbedtls_mpi_free(&a); mbedtls_mpi_free(&a);
@@ -1981,7 +1979,6 @@ static int cmd_derive_asym() {
return SW_DATA_INVALID(); return SW_DATA_INVALID();
} }
r = mbedtls_mpi_add_mod(&ctx.grp, &nd, &ctx.d, &a); r = mbedtls_mpi_add_mod(&ctx.grp, &nd, &ctx.d, &a);
printf("r %d\n",r);
if (r != 0) { if (r != 0) {
mbedtls_ecdsa_free(&ctx); mbedtls_ecdsa_free(&ctx);
mbedtls_mpi_free(&a); mbedtls_mpi_free(&a);
@@ -1989,7 +1986,6 @@ static int cmd_derive_asym() {
return SW_EXEC_ERROR(); return SW_EXEC_ERROR();
} }
r = mbedtls_mpi_copy(&ctx.d, &nd); r = mbedtls_mpi_copy(&ctx.d, &nd);
printf("r %d\n",r);
if (r != 0) { if (r != 0) {
mbedtls_ecdsa_free(&ctx); mbedtls_ecdsa_free(&ctx);
mbedtls_mpi_free(&a); mbedtls_mpi_free(&a);
@@ -1999,7 +1995,6 @@ static int cmd_derive_asym() {
sc_context_t *card_ctx = create_context(); sc_context_t *card_ctx = create_context();
uint8_t kdom = get_key_domain(fkey); uint8_t kdom = get_key_domain(fkey);
r = store_keys(&ctx, SC_PKCS15_TYPE_PRKEY_EC, dest_id, card_ctx, kdom); r = store_keys(&ctx, SC_PKCS15_TYPE_PRKEY_EC, dest_id, card_ctx, kdom);
printf("r %d %d\n",r,kdom);
free(card_ctx); free(card_ctx);
if (r != CCID_OK) { if (r != CCID_OK) {
mbedtls_ecdsa_free(&ctx); mbedtls_ecdsa_free(&ctx);