Skip to content

PKCS#11 Ed25519 #5559

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jforissier merged 1 commit into from
Oct 6, 2022
Merged

PKCS#11 Ed25519 #5559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions core/include/crypto/crypto.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ struct x25519_keypair {
struct ed25519_keypair {
uint8_t *priv;
uint8_t *pub;
uint32_t curve;
};

/*
Expand Down
8 changes: 8 additions & 0 deletions core/tee/tee_svc_cryp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,6 +473,13 @@ const struct tee_cryp_obj_type_attrs tee_cryp_obj_ed25519_keypair_attrs[] = {
.ops_index = ATTR_OPS_INDEX_25519,
RAW_DATA(struct ed25519_keypair, pub)
},

{
.attr_id = TEE_ATTR_ECC_CURVE,
.flags = TEE_TYPE_ATTR_SIZE_INDICATOR | TEE_TYPE_ATTR_GEN_KEY_REQ,
.ops_index = ATTR_OPS_INDEX_VALUE,
RAW_DATA(struct ed25519_keypair, curve)
},
};

struct tee_cryp_obj_type_props {
Expand Down Expand Up @@ -1765,6 +1772,7 @@ static TEE_Result get_ec_key_size(uint32_t curve, size_t *key_size)
*key_size = 521;
break;
case TEE_ECC_CURVE_SM2:
case TEE_ECC_CURVE_25519:
*key_size = 256;
break;
default:
Expand Down
4 changes: 4 additions & 0 deletions ta/pkcs11/include/pkcs11_ta.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1169,6 +1169,7 @@ enum pkcs11_key_type {
PKCS11_CKK_DSA = 0x001,
PKCS11_CKK_DH = 0x002,
PKCS11_CKK_EC = 0x003,
PKCS11_CKK_EDDSA = 0x004,
PKCS11_CKK_GENERIC_SECRET = 0x010,
PKCS11_CKK_AES = 0x01f,
PKCS11_CKK_MD5_HMAC = 0x027,
Expand All @@ -1177,6 +1178,7 @@ enum pkcs11_key_type {
PKCS11_CKK_SHA384_HMAC = 0x02c,
PKCS11_CKK_SHA512_HMAC = 0x02d,
PKCS11_CKK_SHA224_HMAC = 0x02e,
PKCS11_CKK_EC_EDWARDS = 0x040,
/* Vendor extension: reserved for undefined ID (~0U) */
PKCS11_CKK_UNDEFINED_ID = PKCS11_UNDEFINED_ID,
};
Expand Down Expand Up @@ -1250,6 +1252,8 @@ enum pkcs11_mechanism_id {
PKCS11_CKM_ECDSA_SHA384 = 0x01045,
PKCS11_CKM_ECDSA_SHA512 = 0x01046,
PKCS11_CKM_ECDH1_DERIVE = 0x01050,
PKCS11_CKM_EC_EDWARDS_KEY_PAIR_GEN = 0x01055,
PKCS11_CKM_EDDSA = 0x01057,
PKCS11_CKM_AES_KEY_GEN = 0x01080,
PKCS11_CKM_AES_ECB = 0x01081,
PKCS11_CKM_AES_CBC = 0x01082,
Expand Down
51 changes: 51 additions & 0 deletions ta/pkcs11/src/pkcs11_attributes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,12 @@ static const uint32_t ec_private_key_opt_or_null[] = {
PKCS11_CKA_VALUE,
};

static const uint32_t eddsa_private_key_opt_or_null[] = {
PKCS11_CKA_EC_PARAMS,
PKCS11_CKA_VALUE,
PKCS11_CKA_EC_POINT,
};

static enum pkcs11_rc create_storage_attributes(struct obj_attrs **out,
struct obj_attrs *temp)
{
Expand Down Expand Up @@ -767,6 +773,7 @@ static enum pkcs11_rc create_pub_key_attributes(struct obj_attrs **out,
}
break;
case PKCS11_CKK_EC:
case PKCS11_CKK_EC_EDWARDS:
mandated = ec_public_key_mandated;
oon = ec_public_key_opt_or_null;
mandated_count = ARRAY_SIZE(ec_public_key_mandated);
Expand Down Expand Up @@ -829,6 +836,12 @@ static enum pkcs11_rc create_priv_key_attributes(struct obj_attrs **out,
mandated_count = ARRAY_SIZE(ec_private_key_mandated);
oon_count = ARRAY_SIZE(ec_private_key_opt_or_null);
break;
case PKCS11_CKK_EC_EDWARDS:
mandated = ec_private_key_mandated;
oon = eddsa_private_key_opt_or_null;
mandated_count = ARRAY_SIZE(ec_private_key_mandated);
oon_count = ARRAY_SIZE(eddsa_private_key_opt_or_null);
break;
default:
EMSG("Invalid key type %#"PRIx32"/%s",
get_key_type(*out), id2str_key_type(get_key_type(*out)));
Expand Down Expand Up @@ -978,6 +991,10 @@ create_attributes_from_template(struct obj_attrs **out, void *template,
*/
if (function == PKCS11_FUNCTION_GENERATE_PAIR) {
switch (mecha) {
case PKCS11_CKM_EC_EDWARDS_KEY_PAIR_GEN:
class = template_class;
type = PKCS11_CKK_EDDSA;
break;
case PKCS11_CKM_EC_KEY_PAIR_GEN:
class = template_class;
type = PKCS11_CKK_EC;
Expand Down Expand Up @@ -1055,6 +1072,14 @@ create_attributes_from_template(struct obj_attrs **out, void *template,
goto out;
}
break;
case PKCS11_CKM_EC_EDWARDS_KEY_PAIR_GEN:
if ((get_class(temp) != PKCS11_CKO_PUBLIC_KEY &&
get_class(temp) != PKCS11_CKO_PRIVATE_KEY) ||
get_key_type(temp) != PKCS11_CKK_EC_EDWARDS) {
rc = PKCS11_CKR_TEMPLATE_INCONSISTENT;
goto out;
}
break;
case PKCS11_CKM_RSA_PKCS_KEY_PAIR_GEN:
if ((get_class(temp) != PKCS11_CKO_PUBLIC_KEY &&
get_class(temp) != PKCS11_CKO_PRIVATE_KEY) ||
Expand Down Expand Up @@ -1382,6 +1407,7 @@ enum pkcs11_rc check_created_attrs_against_processing(uint32_t proc_id,
break;
case PKCS11_CKM_GENERIC_SECRET_KEY_GEN:
case PKCS11_CKM_AES_KEY_GEN:
case PKCS11_CKM_EC_EDWARDS_KEY_PAIR_GEN:
case PKCS11_CKM_EC_KEY_PAIR_GEN:
case PKCS11_CKM_RSA_PKCS_KEY_PAIR_GEN:
assert(check_attr_bval(proc_id, head, PKCS11_CKA_LOCAL, true));
Expand All @@ -1398,6 +1424,9 @@ enum pkcs11_rc check_created_attrs_against_processing(uint32_t proc_id,
case PKCS11_CKM_AES_KEY_GEN:
assert(get_key_type(head) == PKCS11_CKK_AES);
break;
case PKCS11_CKM_EC_EDWARDS_KEY_PAIR_GEN:
assert(get_key_type(head) == PKCS11_CKK_EC_EDWARDS);
break;
case PKCS11_CKM_EC_KEY_PAIR_GEN:
assert(get_key_type(head) == PKCS11_CKK_EC);
break;
Expand Down Expand Up @@ -1448,6 +1477,9 @@ static void get_key_min_max_sizes(enum pkcs11_key_type key_type,
case PKCS11_CKK_EC:
mechanism = PKCS11_CKM_EC_KEY_PAIR_GEN;
break;
case PKCS11_CKK_EDDSA:
mechanism = PKCS11_CKM_EC_EDWARDS_KEY_PAIR_GEN;
break;
case PKCS11_CKK_RSA:
mechanism = PKCS11_CKM_RSA_PKCS_KEY_PAIR_GEN;
break;
Expand Down Expand Up @@ -1539,6 +1571,7 @@ enum pkcs11_rc check_created_attrs(struct obj_attrs *key1,
key_length = ROUNDUP(key_length, 8) / 8;
break;
case PKCS11_CKK_EC:
case PKCS11_CKK_EC_EDWARDS:
break;
default:
return PKCS11_CKR_TEMPLATE_INCONSISTENT;
Expand All @@ -1548,6 +1581,7 @@ enum pkcs11_rc check_created_attrs(struct obj_attrs *key1,
switch (get_key_type(private)) {
case PKCS11_CKK_RSA:
case PKCS11_CKK_EC:
case PKCS11_CKK_EC_EDWARDS:
break;
default:
return PKCS11_CKR_TEMPLATE_INCONSISTENT;
Expand All @@ -1560,6 +1594,7 @@ enum pkcs11_rc check_created_attrs(struct obj_attrs *key1,
*/
switch (get_key_type(key1)) {
case PKCS11_CKK_EC:
case PKCS11_CKK_EC_EDWARDS:
return PKCS11_CKR_OK;
default:
break;
Expand Down Expand Up @@ -1742,6 +1777,22 @@ check_parent_attrs_against_processing(enum pkcs11_mechanism_id proc_id,
}
break;

case PKCS11_CKM_EDDSA:
if (key_type != PKCS11_CKK_EC_EDWARDS) {
EMSG("Invalid key %s for mechanism %s",
id2str_type(key_type, key_class),
id2str_proc(proc_id));
return PKCS11_CKR_KEY_TYPE_INCONSISTENT;
}
if (key_class != PKCS11_CKO_PUBLIC_KEY &&
key_class != PKCS11_CKO_PRIVATE_KEY) {
EMSG("Invalid key class for mechanism %s",
id2str_proc(proc_id));

return PKCS11_CKR_KEY_FUNCTION_NOT_PERMITTED;
}
break;

case PKCS11_CKM_ECDSA:
case PKCS11_CKM_ECDSA_SHA1:
case PKCS11_CKM_ECDSA_SHA224:
Expand Down
3 changes: 3 additions & 0 deletions ta/pkcs11/src/pkcs11_helpers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,8 @@ static const struct any_id __maybe_unused string_key_type[] = {
PKCS11_ID(PKCS11_CKK_SHA384_HMAC),
PKCS11_ID(PKCS11_CKK_SHA512_HMAC),
PKCS11_ID(PKCS11_CKK_EC),
PKCS11_ID(PKCS11_CKK_EC_EDWARDS),
PKCS11_ID(PKCS11_CKK_EDDSA),
PKCS11_ID(PKCS11_CKK_RSA),
PKCS11_ID(PKCS11_CKK_UNDEFINED_ID)
};
Expand Down Expand Up @@ -495,6 +497,7 @@ bool key_type_is_asymm_key(uint32_t id)

switch (key_type) {
case PKCS11_CKK_EC:
case PKCS11_CKK_EC_EDWARDS:
case PKCS11_CKK_RSA:
return true;
default:
Expand Down
4 changes: 4 additions & 0 deletions ta/pkcs11/src/processing.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ size_t get_object_key_bit_size(struct pkcs11_object *obj)

return a_size * 8;
case PKCS11_CKK_EC:
case PKCS11_CKK_EC_EDWARDS:
if (get_attribute_ptr(attrs, PKCS11_CKA_EC_PARAMS,
&a_ptr, &a_size) || !a_ptr)
return 0;
Expand Down Expand Up @@ -503,6 +504,9 @@ enum pkcs11_rc entry_generate_key_pair(struct pkcs11_client *client,

/* Generate key pair */
switch (proc_params->id) {
case PKCS11_CKM_EC_EDWARDS_KEY_PAIR_GEN:
rc = generate_eddsa_keys(proc_params, &pub_head, &priv_head);
break;
case PKCS11_CKM_EC_KEY_PAIR_GEN:
rc = generate_ec_keys(proc_params, &pub_head, &priv_head);
break;
Expand Down
25 changes: 25 additions & 0 deletions ta/pkcs11/src/processing.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,19 @@ struct rsa_oaep_processing_ctx {
uint8_t source_data[];
};

/**
* EDDSA processing context
*
* @flag: Prehash flag
* @ctx_len: Length of the context data
* @ctx: Context data
*/
struct eddsa_processing_ctx {
uint32_t flag;
uint32_t ctx_len;
uint8_t ctx[];
};

/*
* Entry points from PKCS11 TA invocation commands
*/
Expand Down Expand Up @@ -152,6 +165,10 @@ enum pkcs11_rc load_tee_ec_key_attrs(TEE_Attribute **tee_attrs,
size_t *tee_count,
struct pkcs11_object *obj);

enum pkcs11_rc load_tee_eddsa_key_attrs(TEE_Attribute **tee_attrs,
size_t *tee_count,
struct pkcs11_object *obj);

size_t ec_params2tee_keysize(void *attr, size_t size);

uint32_t ec_params2tee_curve(void *attr, size_t size);
Expand All @@ -164,6 +181,10 @@ enum pkcs11_rc generate_ec_keys(struct pkcs11_attribute_head *proc_params,
struct obj_attrs **pub_head,
struct obj_attrs **priv_head);

enum pkcs11_rc generate_eddsa_keys(struct pkcs11_attribute_head *proc_params,
struct obj_attrs **pub_head,
struct obj_attrs **priv_head);

size_t ecdsa_get_input_max_byte_size(TEE_OperationHandle op);

/*
Expand All @@ -187,6 +208,10 @@ enum pkcs11_rc
pkcs2tee_proc_params_rsa_oaep(struct active_processing *proc,
struct pkcs11_attribute_head *proc_params);

enum pkcs11_rc
pkcs2tee_proc_params_eddsa(struct active_processing *proc,
struct pkcs11_attribute_head *proc_params);

enum pkcs11_rc pkcs2tee_algo_rsa_oaep(uint32_t *tee_id, uint32_t *tee_hash_id,
struct pkcs11_attribute_head *params);

Expand Down
40 changes: 40 additions & 0 deletions ta/pkcs11/src/processing_asymm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ bool processing_is_tee_asymm(uint32_t proc_id)
case PKCS11_CKM_SHA384_RSA_PKCS_PSS:
case PKCS11_CKM_SHA512_RSA_PKCS_PSS:
/* EC flavors */
case PKCS11_CKM_EDDSA:
case PKCS11_CKM_ECDSA:
case PKCS11_CKM_ECDH1_DERIVE:
case PKCS11_CKM_ECDSA_SHA1:
Expand Down Expand Up @@ -92,6 +93,7 @@ pkcs2tee_algorithm(uint32_t *tee_id, uint32_t *tee_hash_id,
{ PKCS11_CKM_ECDSA_SHA384, 1, TEE_ALG_SHA384 },
{ PKCS11_CKM_ECDSA_SHA512, 1, TEE_ALG_SHA512 },
{ PKCS11_CKM_ECDH1_DERIVE, 1, 0 },
{ PKCS11_CKM_EDDSA, TEE_ALG_ED25519, 0 },
};
size_t n = 0;
enum pkcs11_rc rc = PKCS11_CKR_GENERAL_ERROR;
Expand Down Expand Up @@ -184,6 +186,12 @@ static enum pkcs11_rc pkcs2tee_key_type(uint32_t *tee_type,
else
*tee_type = TEE_TYPE_RSA_PUBLIC_KEY;
break;
case PKCS11_CKK_EC_EDWARDS:
if (class == PKCS11_CKO_PRIVATE_KEY)
*tee_type = TEE_TYPE_ED25519_KEYPAIR;
else
*tee_type = TEE_TYPE_ED25519_PUBLIC_KEY;
break;
default:
TEE_Panic(type);
break;
Expand Down Expand Up @@ -315,6 +323,10 @@ static enum pkcs11_rc load_tee_key(struct pkcs11_session *session,
case PKCS11_CKK_EC:
rc = load_tee_ec_key_attrs(&tee_attrs, &tee_attrs_count, obj);
break;
case PKCS11_CKK_EC_EDWARDS:
rc = load_tee_eddsa_key_attrs(&tee_attrs, &tee_attrs_count,
obj);
break;
default:
break;
}
Expand Down Expand Up @@ -381,6 +393,9 @@ init_tee_operation(struct pkcs11_session *session,
case PKCS11_CKM_RSA_PKCS_OAEP:
rc = pkcs2tee_proc_params_rsa_oaep(proc, proc_params);
break;
case PKCS11_CKM_EDDSA:
rc = pkcs2tee_proc_params_eddsa(proc, proc_params);
break;
default:
break;
}
Expand Down Expand Up @@ -438,6 +453,7 @@ enum pkcs11_rc step_asymm_operation(struct pkcs11_session *session,
struct active_processing *proc = session->processing;
struct rsa_oaep_processing_ctx *rsa_oaep_ctx = NULL;
struct rsa_pss_processing_ctx *rsa_pss_ctx = NULL;
struct eddsa_processing_ctx *eddsa_ctx = NULL;
size_t sz = 0;

if (TEE_PARAM_TYPE_GET(ptypes, 1) == TEE_PARAM_TYPE_MEMREF_INPUT) {
Expand Down Expand Up @@ -492,6 +508,29 @@ enum pkcs11_rc step_asymm_operation(struct pkcs11_session *session,
rsa_pss_ctx->salt_len, 0);
tee_attrs_count++;
break;
case PKCS11_CKM_EDDSA:
eddsa_ctx = proc->extra_ctx;

tee_attrs = TEE_Malloc(2 * sizeof(TEE_Attribute),
TEE_USER_MEM_HINT_NO_FILL_ZERO);
if (!tee_attrs) {
rc = PKCS11_CKR_DEVICE_MEMORY;
goto out;
}

if (eddsa_ctx->flag) {
TEE_InitValueAttribute(&tee_attrs[tee_attrs_count],
TEE_ATTR_EDDSA_PREHASH, 0, 0);
tee_attrs_count++;
}

if (eddsa_ctx->ctx_len > 0) {
TEE_InitRefAttribute(&tee_attrs[tee_attrs_count],
TEE_ATTR_EDDSA_CTX, eddsa_ctx->ctx,
eddsa_ctx->ctx_len);
tee_attrs_count++;
}
break;
case PKCS11_CKM_RSA_PKCS_OAEP:
rsa_oaep_ctx = proc->extra_ctx;

Expand Down Expand Up @@ -672,6 +711,7 @@ enum pkcs11_rc step_asymm_operation(struct pkcs11_session *session,
/* Next perform actual signing operation */
switch (proc->mecha_type) {
case PKCS11_CKM_ECDSA:
case PKCS11_CKM_EDDSA:
case PKCS11_CKM_RSA_PKCS:
case PKCS11_CKM_RSA_PKCS_OAEP:
case PKCS11_CKM_RSA_PKCS_PSS:
Expand Down
Loading