mirrors/pico-hsm
1
0
Fork 0
mirror of https://github.com/polhenarejos/pico-hsm.git synced 2026-02-07 19:18:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Uniform ec key loading.

Browse source 
Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>
This commit is contained in:
Pol Henarejos 2023-08-24 16:05:34 +02:00
parent 9f49a144ac
commit 10a47f9177
No known key found for this signature in database
GPG key ID: C0095B7870A4CCD3
1 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/hsm/sc_hsm.c
View file

@ -623,7 +623,7 @@ int load_private_key_rsa(mbedtls_rsa_context *ctx, file_t *fkey) {
return CCID_OK;
}
int load_private_key_ec_purpose(mbedtls_ecp_keypair *ctx, file_t *fkey, bool sign) {
int load_private_key_ec(mbedtls_ecp_keypair *ctx, file_t *fkey) {
if (wait_button_pressed() == true) { // timeout
return CCID_VERIFICATION_FAILED;
}
@ -635,14 +635,6 @@ int load_private_key_ec_purpose(mbedtls_ecp_keypair *ctx, file_t *fkey, bool sig
return CCID_EXEC_ERROR;
}
mbedtls_ecp_group_id gid = kdata[0];
if (sign == true) {
if (gid == MBEDTLS_ECP_DP_CURVE25519) {
gid = MBEDTLS_ECP_DP_ED25519;
}
else if (gid == MBEDTLS_ECP_DP_CURVE448) {
gid = MBEDTLS_ECP_DP_ED448;
}
}
int r = mbedtls_ecp_read_key(gid, ctx, kdata + 1, key_size - 1);
if (r != 0) {
mbedtls_platform_zeroize(kdata, sizeof(kdata));
@ -662,11 +654,8 @@ int load_private_key_ec_purpose(mbedtls_ecp_keypair *ctx, file_t *fkey, bool sig
}
return CCID_OK;
}
int load_private_key_ec(mbedtls_ecp_keypair *ctx, file_t *fkey) {
return load_private_key_ec_purpose(ctx, fkey, true);
}
int load_private_key_ecdh(mbedtls_ecp_keypair *ctx, file_t *fkey) {
return load_private_key_ec_purpose(ctx, fkey, false);
return load_private_key_ec(ctx, fkey);
}
#define INS_VERIFY 0x20