Skip to content

Commit cccb5b6

Browse files
committed
library: ssl: replace mbedtls_pk_can_do_ext with mbedtls_pk_can_do_psa
Signed-off-by: Valerio Setti <[email protected]>
1 parent 86def1a commit cccb5b6

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

library/ssl_tls.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8245,14 +8245,14 @@ unsigned int mbedtls_ssl_tls12_get_preferred_hash_for_sig_alg(
82458245
mbedtls_md_psa_alg_from_type(md_alg);
82468246

82478247
if (sig_alg_received == MBEDTLS_SSL_SIG_ECDSA &&
8248-
!mbedtls_pk_can_do_ext(ssl->handshake->key_cert->key,
8248+
!mbedtls_pk_can_do_psa(ssl->handshake->key_cert->key,
82498249
PSA_ALG_ECDSA(psa_hash_alg),
82508250
PSA_KEY_USAGE_SIGN_HASH)) {
82518251
continue;
82528252
}
82538253

82548254
if (sig_alg_received == MBEDTLS_SSL_SIG_RSA &&
8255-
!mbedtls_pk_can_do_ext(ssl->handshake->key_cert->key,
8255+
!mbedtls_pk_can_do_psa(ssl->handshake->key_cert->key,
82568256
PSA_ALG_RSA_PKCS1V15_SIGN(
82578257
psa_hash_alg),
82588258
PSA_KEY_USAGE_SIGN_HASH)) {

library/ssl_tls12_server.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -694,11 +694,11 @@ static int ssl_pick_cert(mbedtls_ssl_context *ssl,
694694
int key_type_matches = 0;
695695
#if defined(MBEDTLS_SSL_ASYNC_PRIVATE)
696696
key_type_matches = ((ssl->conf->f_async_sign_start != NULL ||
697-
mbedtls_pk_can_do_ext(cur->key, pk_alg, pk_usage)) &&
698-
mbedtls_pk_can_do_ext(&cur->cert->pk, pk_alg, pk_usage));
697+
mbedtls_pk_can_do_psa(cur->key, pk_alg, pk_usage)) &&
698+
mbedtls_pk_can_do_psa(&cur->cert->pk, pk_alg, pk_usage));
699699
#else
700700
key_type_matches = (
701-
mbedtls_pk_can_do_ext(cur->key, pk_alg, pk_usage));
701+
mbedtls_pk_can_do_psa(cur->key, pk_alg, pk_usage));
702702
#endif /* MBEDTLS_SSL_ASYNC_PRIVATE */
703703
if (!key_type_matches) {
704704
MBEDTLS_SSL_DEBUG_MSG(3, ("certificate mismatch: key type"));

library/ssl_tls13_server.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1160,7 +1160,7 @@ static int ssl_tls13_pick_key_cert(mbedtls_ssl_context *ssl)
11601160
if (mbedtls_ssl_tls13_check_sig_alg_cert_key_match(
11611161
*sig_alg, &key_cert->cert->pk)
11621162
&& psa_alg != PSA_ALG_NONE &&
1163-
mbedtls_pk_can_do_ext(&key_cert->cert->pk, psa_alg,
1163+
mbedtls_pk_can_do_psa(&key_cert->cert->pk, psa_alg,
11641164
PSA_KEY_USAGE_SIGN_HASH) == 1
11651165
) {
11661166
ssl->handshake->key_cert = key_cert;

0 commit comments

Comments
 (0)