From b190c1bb0b9ddbe69c58f86f6316231219b2af5c Mon Sep 17 00:00:00 2001 From: Ben Taylor Date: Tue, 21 Oct 2025 08:32:33 +0100 Subject: [PATCH] Replace change to restartable with ext Signed-off-by: Ben Taylor --- library/x509write_csr.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/library/x509write_csr.c b/library/x509write_csr.c index c50482ddc..5755a42b4 100644 --- a/library/x509write_csr.c +++ b/library/x509write_csr.c @@ -217,10 +217,6 @@ static int x509write_csr_der_internal(mbedtls_x509write_csr *ctx, &hash_len) != PSA_SUCCESS) { return MBEDTLS_ERR_PLATFORM_HW_ACCEL_FAILED; } - if ((ret = mbedtls_pk_sign_restartable(ctx->key, ctx->md_alg, hash, 0, - sig, sig_size, &sig_len, NULL)) != 0) { - return ret; - } if (mbedtls_pk_can_do(ctx->key, MBEDTLS_PK_RSA)) { pk_alg = MBEDTLS_PK_RSA; @@ -230,6 +226,11 @@ static int x509write_csr_der_internal(mbedtls_x509write_csr *ctx, return MBEDTLS_ERR_X509_INVALID_ALG; } + if ((ret = mbedtls_pk_sign_ext((mbedtls_pk_sigalg_t) pk_alg, ctx->key, ctx->md_alg, hash, 0, + sig, sig_size, &sig_len)) != 0) { + return ret; + } + if ((ret = mbedtls_x509_oid_get_oid_by_sig_alg((mbedtls_pk_sigalg_t) pk_alg, ctx->md_alg, &sig_oid, &sig_oid_len)) != 0) { return ret;