Skip to content
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

Jump to bottom

ta/crypt: update to mbedTLS 3.4.0 API #697

Merged
merged 1 commit into from
Oct 12, 2023
Merged

ta/crypt: update to mbedTLS 3.4.0 API #697

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
6 changes: 3 additions & 3 deletions ta/crypt/mbedtls_taf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ ta_entry_mbedtls_self_tests(uint32_t param_type,
DO_MBEDTLS_SELF_TEST(base64);
DO_MBEDTLS_SELF_TEST(mpi);
DO_MBEDTLS_SELF_TEST(rsa);
DO_MBEDTLS_SELF_TEST(x509);

return TEE_SUCCESS;
#else
Expand Down Expand Up @@ -187,7 +186,8 @@ static TEE_Result parse_issuer_key(mbedtls_pk_context *pk)
return TEE_ERROR_OUT_OF_MEMORY;

memcpy(buf, mid_key, mid_key_size);
ret = mbedtls_pk_parse_key(pk, buf, mid_key_size + 1, NULL, 0);
ret = mbedtls_pk_parse_key(pk, buf, mid_key_size + 1,
NULL, 0, NULL, NULL);
TEE_Free(buf);
if (ret) {
EMSG("mbedtls_pk_parse_key: failed: %#x", ret);
Expand Down Expand Up @@ -275,7 +275,7 @@ TEE_Result ta_entry_mbedtls_sign_cert(uint32_t param_type,
goto out;
}

mbedtls_x509write_crt_set_md_alg(&crt, csr.sig_md);
mbedtls_x509write_crt_set_md_alg(&crt, csr.MBEDTLS_PRIVATE(sig_md));
mbedtls_x509write_crt_set_subject_key(&crt, &csr.pk);
mbedtls_x509write_crt_set_issuer_key(&crt, &issuer_key);

Expand Down
Loading