From 9258c9ff70b26345a21fe9e579f870054c8bac41 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Wed, 14 Aug 2024 15:32:09 +0200 Subject: [PATCH] Fix merge. Signed-off-by: Pol Henarejos --- src/hsm/cmd_keypair_gen.c | 9 ++++----- src/hsm/cvc.c | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/hsm/cmd_keypair_gen.c b/src/hsm/cmd_keypair_gen.c index 536123d..c76ae51 100644 --- a/src/hsm/cmd_keypair_gen.c +++ b/src/hsm/cmd_keypair_gen.c @@ -80,15 +80,14 @@ int cmd_keypair_gen() { return SW_FUNC_NOT_SUPPORTED(); } if (ec_id == MBEDTLS_ECP_DP_CURVE25519 || ec_id == MBEDTLS_ECP_DP_CURVE448) { - size_t g_len = 0; - uint8_t *g = NULL; - if (asn1_find_tag(p, tout, 0x83, &g_len, &g) != true) { + asn1_ctx_t g = { 0 }; + if (asn1_find_tag(&ctxo, 0x83, &g) != true) { return SW_WRONG_DATA(); } - if (ec_id == MBEDTLS_ECP_DP_CURVE25519 && (g[0] != 9)) { + if (ec_id == MBEDTLS_ECP_DP_CURVE25519 && (g.data[0] != 9)) { ec_id = MBEDTLS_ECP_DP_ED25519; } - else if (ec_id == MBEDTLS_ECP_DP_CURVE448 && (g_len != 56 || g[0] != 5)) { + else if (ec_id == MBEDTLS_ECP_DP_CURVE448 && (g.len != 56 || g.data[0] != 5)) { ec_id = MBEDTLS_ECP_DP_ED448; } } diff --git a/src/hsm/cvc.c b/src/hsm/cvc.c index 3e815ea..17790d8 100644 --- a/src/hsm/cvc.c +++ b/src/hsm/cvc.c @@ -89,7 +89,7 @@ uint16_t asn1_cvc_public_key_ecdsa(mbedtls_ecp_keypair *ecdsa, uint8_t *buf, uin uint16_t ctot_size = asn1_len_tag(0x87, (uint16_t)c_size); uint16_t oid_len = asn1_len_tag(0x6, sizeof(oid_ecdsa)); uint16_t tot_len = 0, tot_data_len = 0; - if (mbedtls_ecp_get_type(&ecdsa->grp) == MBEDTLS_ECP_TYPE_MONTGOMERY) || mbedtls_ecp_get_type(&ecdsa->grp) == MBEDTLS_ECP_TYPE_EDWARDS { + if (mbedtls_ecp_get_type(&ecdsa->grp) == MBEDTLS_ECP_TYPE_MONTGOMERY || mbedtls_ecp_get_type(&ecdsa->grp) == MBEDTLS_ECP_TYPE_EDWARDS) { tot_data_len = oid_len + ptot_size + otot_size + gtot_size + ytot_size; oid = oid_ri; }