Skip to content

ta: pkcs11: add CKM_AES_GCM key wrap/unwrap #7864

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
jenswikl merged 1 commit into from
Aug 12, 2026
Merged

ta: pkcs11: add CKM_AES_GCM key wrap/unwrap #7864

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 ta/pkcs11/src/pkcs11_attributes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1656,6 +1656,7 @@ check_created_attrs_against_processing(uint32_t proc_id,
case PKCS11_CKM_ECDH1_DERIVE:
case PKCS11_CKM_AES_ECB:
case PKCS11_CKM_AES_CBC:
case PKCS11_CKM_AES_GCM:
case PKCS11_CKM_AES_ECB_ENCRYPT_DATA:
case PKCS11_CKM_AES_CBC_ENCRYPT_DATA:
case PKCS11_CKM_RSA_AES_KEY_WRAP:
Expand Down
2 changes: 2 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 @@ -182,6 +182,8 @@ enum pkcs11_rc tee_ae_decrypt_final(struct pkcs11_session *session,
enum pkcs11_rc tee_ae_encrypt_final(struct pkcs11_session *session,
void *out, size_t *out_size);

size_t tee_ae_tag_size(struct pkcs11_session *session);

void tee_release_gcm_operation(struct pkcs11_session *session);

enum pkcs11_rc tee_init_gcm_operation(struct pkcs11_session *session,
Expand Down
7 changes: 7 additions & 0 deletions ta/pkcs11/src/processing_aes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,6 +543,13 @@ enum pkcs11_rc tee_init_gcm_operation(struct pkcs11_session *session,
return rc;
}

size_t tee_ae_tag_size(struct pkcs11_session *session)
{
struct ae_aes_context *ctx = session->processing->extra_ctx;

return ctx->tag_byte_len;
}

/* Release extra resources related to the GCM processing*/
void tee_release_gcm_operation(struct pkcs11_session *session)
{
Expand Down
53 changes: 53 additions & 0 deletions ta/pkcs11/src/processing_symm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1133,10 +1133,14 @@ enum pkcs11_rc wrap_data_by_symm_enc(struct pkcs11_session *session,
void *out_buf, uint32_t *out_sz)
{
TEE_Result res = TEE_ERROR_GENERIC;
enum pkcs11_rc rc = PKCS11_CKR_OK;
struct active_processing *proc = session->processing;
void *in_buf = NULL;
uint32_t align = 0;
uint32_t in_sz = data_sz;
size_t final_sz = 0;
size_t update_sz = 0;
size_t required = 0;
size_t tmp_sz = *out_sz;
uint8_t *tmp_buf = out_buf;

Expand Down Expand Up @@ -1192,6 +1196,29 @@ enum pkcs11_rc wrap_data_by_symm_enc(struct pkcs11_session *session,
TEE_Free(in_buf);

return tee2pkcs_error(res);
case PKCS11_CKM_AES_GCM:
required = data_sz + tee_ae_tag_size(session);
if (*out_sz < required) {
*out_sz = required;
return PKCS11_CKR_BUFFER_TOO_SMALL;
}

update_sz = *out_sz;
res = TEE_AEUpdate(proc->tee_op_handle, data, data_sz, tmp_buf,
&update_sz);
if (res) {
assert(res != TEE_ERROR_SHORT_BUFFER);
return tee2pkcs_error(res);
}

final_sz = *out_sz - update_sz;
rc = tee_ae_encrypt_final(session, tmp_buf + update_sz,
&final_sz);
if (rc)
return rc;

*out_sz = update_sz + final_sz;
return PKCS11_CKR_OK;
default:
return PKCS11_CKR_MECHANISM_INVALID;
}
Expand All @@ -1204,8 +1231,10 @@ enum pkcs11_rc unwrap_key_by_symm(struct pkcs11_session *session, void *data,
uint32_t *out_sz)
{
TEE_Result res = TEE_ERROR_GENERIC;
enum pkcs11_rc rc = PKCS11_CKR_OK;
struct active_processing *proc = session->processing;
size_t tmp_sz = 0;
size_t tag_sz = 0;

if (input_data_size_is_valid(proc, PKCS11_FUNCTION_DECRYPT, data_sz))
return PKCS11_CKR_WRAPPED_KEY_LEN_RANGE;
Expand Down Expand Up @@ -1235,6 +1264,30 @@ enum pkcs11_rc unwrap_key_by_symm(struct pkcs11_session *session, void *data,
return PKCS11_CKR_WRAPPED_KEY_INVALID;
}
break;
case PKCS11_CKM_AES_GCM:
tag_sz = tee_ae_tag_size(session);
if (data_sz < tag_sz)
return PKCS11_CKR_WRAPPED_KEY_LEN_RANGE;

rc = tee_ae_decrypt_update(session, data, data_sz);
if (rc)
return PKCS11_CKR_WRAPPED_KEY_INVALID;

tmp_sz = data_sz - tag_sz;
*out_buf = TEE_Malloc(tmp_sz ? tmp_sz : 1,
TEE_MALLOC_FILL_ZERO);
if (!*out_buf)
return PKCS11_CKR_DEVICE_MEMORY;

rc = tee_ae_decrypt_final(session, *out_buf, &tmp_sz);
if (rc) {
TEE_Free(*out_buf);
*out_buf = NULL;
return PKCS11_CKR_WRAPPED_KEY_INVALID;
}

*out_sz = tmp_sz;
break;
default:
return PKCS11_CKR_MECHANISM_INVALID;
}
Expand Down
2 changes: 1 addition & 1 deletion ta/pkcs11/src/token_capabilities.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ const struct pkcs11_mechachism_modes token_mechanism[] = {
TA_MECHANISM(PKCS11_CKM_AES_ECB, CKFM_CIPHER_WRAP),
TA_MECHANISM(PKCS11_CKM_AES_CBC, CKFM_CIPHER_WRAP),
TA_MECHANISM(PKCS11_CKM_AES_CTR, CKFM_CIPHER),
TA_MECHANISM(PKCS11_CKM_AES_GCM, CKFM_CIPHER),
TA_MECHANISM(PKCS11_CKM_AES_GCM, CKFM_CIPHER_WRAP),
TA_MECHANISM(PKCS11_CKM_AES_CTS, CKFM_CIPHER),
TA_MECHANISM(PKCS11_CKM_AES_CMAC, CKFM_AUTH_NO_RECOVER),
TA_MECHANISM(PKCS11_CKM_AES_CMAC_GENERAL, CKFM_AUTH_NO_RECOVER),
Expand Down
Loading