From 48cc417546daa7d305ca2c70dece8eec8912dc37 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Tue, 2 Sep 2025 15:49:39 +0200 Subject: [PATCH] Added support for Brainpool curves and Ed448. Signed-off-by: Pol Henarejos --- src/fido/cbor.c | 3 +++ src/fido/cbor_make_credential.c | 42 +++++++++++++++++++++++---------- src/fido/fido.c | 9 +++++++ src/fido/fido.h | 17 ++++++++++--- 4 files changed, 55 insertions(+), 16 deletions(-) diff --git a/src/fido/cbor.c b/src/fido/cbor.c index ae09a0f..48f9a1b 100644 --- a/src/fido/cbor.c +++ b/src/fido/cbor.c @@ -214,6 +214,9 @@ CborError COSE_key(mbedtls_ecp_keypair *key, CborEncoder *mapEncoderParent, else if (key->grp.id == MBEDTLS_ECP_DP_ED25519) { alg = FIDO2_ALG_EDDSA; } + else if (key->grp.id == MBEDTLS_ECP_DP_ED448) { + alg = FIDO2_ALG_ED448; + } #endif return COSE_key_params(crv, alg, &key->grp, &key->Q, mapEncoderParent, mapEncoder); } diff --git a/src/fido/cbor_make_credential.c b/src/fido/cbor_make_credential.c index ae82b45..a4c0b9a 100644 --- a/src/fido/cbor_make_credential.c +++ b/src/fido/cbor_make_credential.c @@ -231,21 +231,36 @@ int cbor_make_credential(const uint8_t *data, size_t len) { if (strcmp(pubKeyCredParams[i].type.data, "public-key") != 0) { CBOR_ERROR(CTAP2_ERR_CBOR_UNEXPECTED_TYPE); } - if (pubKeyCredParams[i].alg == FIDO2_ALG_ES256) { + if (pubKeyCredParams[i].alg == FIDO2_ALG_ES256 || pubKeyCredParams[i].alg == FIDO2_ALG_ESP256) { if (curve <= 0) { curve = FIDO2_CURVE_P256; } } - else if (pubKeyCredParams[i].alg == FIDO2_ALG_ES384) { + else if (pubKeyCredParams[i].alg == FIDO2_ALG_ES384 || pubKeyCredParams[i].alg == FIDO2_ALG_ESP384) { if (curve <= 0) { curve = FIDO2_CURVE_P384; } } - else if (pubKeyCredParams[i].alg == FIDO2_ALG_ES512) { + else if (pubKeyCredParams[i].alg == FIDO2_ALG_ES512 || pubKeyCredParams[i].alg == FIDO2_ALG_ESP512) { if (curve <= 0) { curve = FIDO2_CURVE_P521; } } + else if (pubKeyCredParams[i].alg == FIDO2_ALG_ESB256) { + if (curve <= 0) { + curve = FIDO2_CURVE_BP256R1; + } + } + else if (pubKeyCredParams[i].alg == FIDO2_ALG_ESB384) { + if (curve <= 0) { + curve = FIDO2_CURVE_BP384R1; + } + } + else if (pubKeyCredParams[i].alg == FIDO2_ALG_ESB512) { + if (curve <= 0) { + curve = FIDO2_CURVE_BP512R1; + } + } else if (pubKeyCredParams[i].alg == FIDO2_ALG_ES256K #ifndef ENABLE_EMULATION && (phy_data.enabled_curves & PHY_CURVE_SECP256K1) @@ -256,11 +271,16 @@ int cbor_make_credential(const uint8_t *data, size_t len) { } } #ifdef MBEDTLS_EDDSA_C - else if (pubKeyCredParams[i].alg == FIDO2_ALG_EDDSA) { + else if (pubKeyCredParams[i].alg == FIDO2_ALG_EDDSA || pubKeyCredParams[i].alg == FIDO2_ALG_ED25519) { if (curve <= 0) { curve = FIDO2_CURVE_ED25519; } } + else if (pubKeyCredParams[i].alg == FIDO2_ALG_ED448) { + if (curve <= 0) { + curve = FIDO2_CURVE_ED448; + } + } #endif else if (pubKeyCredParams[i].alg <= FIDO2_ALG_RS256 && pubKeyCredParams[i].alg >= FIDO2_ALG_RS512) { // pass @@ -327,9 +347,7 @@ int cbor_make_credential(const uint8_t *data, size_t len) { continue; } Credential ecred = {0}; - if (credential_load(excludeList[e].id.data, excludeList[e].id.len, rp_id_hash, - &ecred) == 0 && - (ecred.extensions.credProtect != CRED_PROT_UV_REQUIRED || + if (credential_load(excludeList[e].id.data, excludeList[e].id.len, rp_id_hash, &ecred) == 0 && (ecred.extensions.credProtect != CRED_PROT_UV_REQUIRED || (flags & FIDO2_AUT_FLAG_UV))) { credential_free(&ecred); CBOR_ERROR(CTAP2_ERR_CREDENTIAL_EXCLUDED); @@ -367,9 +385,7 @@ int cbor_make_credential(const uint8_t *data, size_t len) { uint8_t cred_id[MAX_CRED_ID_LENGTH] = {0}; size_t cred_id_len = 0; - CBOR_CHECK(credential_create(&rp.id, &user.id, &user.parent.name, &user.displayName, &options, - &extensions, (!ka || ka->use_sign_count == ptrue), alg, curve, - cred_id, &cred_id_len)); + CBOR_CHECK(credential_create(&rp.id, &user.id, &user.parent.name, &user.displayName, &options, &extensions, (!ka || ka->use_sign_count == ptrue), alg, curve, cred_id, &cred_id_len)); if (getUserVerifiedFlagValue()) { flags |= FIDO2_AUT_FLAG_UV; @@ -523,14 +539,14 @@ int cbor_make_credential(const uint8_t *data, size_t len) { memcpy(pa, clientDataHash.data, clientDataHash.len); uint8_t hash[64] = {0}, sig[MBEDTLS_ECDSA_MAX_LEN] = {0}; const mbedtls_md_info_t *md = mbedtls_md_info_from_type(MBEDTLS_MD_SHA256); - if (ekey.grp.id == MBEDTLS_ECP_DP_SECP384R1) { + if (ekey.grp.id == MBEDTLS_ECP_DP_SECP384R1 || ekey.grp.id == MBEDTLS_ECP_DP_BP384R1) { md = mbedtls_md_info_from_type(MBEDTLS_MD_SHA384); } - else if (ekey.grp.id == MBEDTLS_ECP_DP_SECP521R1) { + else if (ekey.grp.id == MBEDTLS_ECP_DP_SECP521R1 || ekey.grp.id == MBEDTLS_ECP_DP_BP512R1) { md = mbedtls_md_info_from_type(MBEDTLS_MD_SHA512); } #ifdef MBEDTLS_EDDSA_C - else if (ekey.grp.id == MBEDTLS_ECP_DP_ED25519) { + else if (ekey.grp.id == MBEDTLS_ECP_DP_ED25519 || ekey.grp.id == MBEDTLS_ECP_DP_ED448) { md = NULL; } #endif diff --git a/src/fido/fido.c b/src/fido/fido.c index d59a870..5e66815 100644 --- a/src/fido/fido.c +++ b/src/fido/fido.c @@ -119,6 +119,15 @@ mbedtls_ecp_group_id fido_curve_to_mbedtls(int curve) { return MBEDTLS_ECP_DP_ED448; } #endif + else if (curve == FIDO2_CURVE_BP256R1) { + return MBEDTLS_ECP_DP_BP256R1; + } + else if (curve == FIDO2_CURVE_BP384R1) { + return MBEDTLS_ECP_DP_BP384R1; + } + else if (curve == FIDO2_CURVE_BP512R1) { + return MBEDTLS_ECP_DP_BP512R1; + } return MBEDTLS_ECP_DP_NONE; } int mbedtls_curve_to_fido(mbedtls_ecp_group_id id) { diff --git a/src/fido/fido.h b/src/fido/fido.h index 4bb2d9b..2a0ed2f 100644 --- a/src/fido/fido.h +++ b/src/fido/fido.h @@ -60,15 +60,23 @@ extern int encrypt(uint8_t protocol, const uint8_t *key, const uint8_t *in, uint extern int decrypt(uint8_t protocol, const uint8_t *key, const uint8_t *in, uint16_t in_len, uint8_t *out); extern int ecdh(uint8_t protocol, const mbedtls_ecp_point *Q, uint8_t *sharedSecret); -#define FIDO2_ALG_ES256 -7 //ECDSA-SHA256 P256 +#define FIDO2_ALG_ES256 -7 //ECDSA-SHA256 #define FIDO2_ALG_EDDSA -8 //EdDSA -#define FIDO2_ALG_ES384 -35 //ECDSA-SHA384 P384 -#define FIDO2_ALG_ES512 -36 //ECDSA-SHA512 P521 +#define FIDO2_ALG_ESP256 -9 //ECDSA-SHA256 P256 +#define FIDO2_ALG_ED25519 -19 //EDDSA Ed25519 +#define FIDO2_ALG_ES384 -35 //ECDSA-SHA384 +#define FIDO2_ALG_ES512 -36 //ECDSA-SHA512 #define FIDO2_ALG_ECDH_ES_HKDF_256 -25 //ECDH-ES + HKDF-256 #define FIDO2_ALG_ES256K -47 +#define FIDO2_ALG_ESP384 -51 //ECDSA-SHA384 P384 +#define FIDO2_ALG_ESP512 -52 //ECDSA-SHA512 P521 +#define FIDO2_ALG_ED448 -53 //EDDSA Ed448 #define FIDO2_ALG_RS256 -257 #define FIDO2_ALG_RS384 -258 #define FIDO2_ALG_RS512 -259 +#define FIDO2_ALG_ESB256 -265 //ECDSA-SHA256 BP256r1 +#define FIDO2_ALG_ESB384 -267 //ECDSA-SHA384 BP384r1 +#define FIDO2_ALG_ESB512 -268 //ECDSA-SHA512 BP512r1 #define FIDO2_CURVE_P256 1 #define FIDO2_CURVE_P384 2 @@ -78,6 +86,9 @@ extern int ecdh(uint8_t protocol, const mbedtls_ecp_point *Q, uint8_t *sharedSec #define FIDO2_CURVE_ED25519 6 #define FIDO2_CURVE_ED448 7 #define FIDO2_CURVE_P256K1 8 +#define FIDO2_CURVE_BP256R1 9 +#define FIDO2_CURVE_BP384R1 10 +#define FIDO2_CURVE_BP512R1 11 #define FIDO2_AUT_FLAG_UP 0x1 #define FIDO2_AUT_FLAG_UV 0x4