From 085aef59ca1201416e04df71d93ef12dc96f910b Mon Sep 17 00:00:00 2001 From: Ben Taylor Date: Fri, 2 Jan 2026 09:34:36 +0000 Subject: [PATCH] Change function name from mbedtls_pk_key_type_to_string to mbedtls_x509_pk_type_as_string Signed-off-by: Ben Taylor --- include/mbedtls/x509.h | 4 ++-- library/x509.c | 2 +- library/x509_crt.c | 2 +- library/x509_csr.c | 2 +- programs/ssl/ssl_client2.c | 2 +- programs/ssl/ssl_server2.c | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/mbedtls/x509.h b/include/mbedtls/x509.h index fca706f13b..fb0c314668 100644 --- a/include/mbedtls/x509.h +++ b/include/mbedtls/x509.h @@ -321,9 +321,9 @@ int mbedtls_x509_dn_gets(char *buf, size_t size, const mbedtls_x509_name *dn); * * \param[in] pk A mbedtls_pk_context struct containing the pk_key_type to convert - * \return A pointer to a string containing the pk_key_type. + * \return Returns a string describing the key type. */ -const char *mbedtls_pk_key_type_to_string(const mbedtls_pk_context *pk); +const char *mbedtls_x509_pk_type_as_string(const mbedtls_pk_context *pk); /** * \brief Convert the certificate DN string \p name into diff --git a/library/x509.c b/library/x509.c index 6ec1bb13df..67a6baa4c8 100644 --- a/library/x509.c +++ b/library/x509.c @@ -125,7 +125,7 @@ int mbedtls_x509_get_alg(unsigned char **p, const unsigned char *end, /* * Convert pk_key_type to a string */ -const char *mbedtls_pk_key_type_to_string(const mbedtls_pk_context *pk) +const char *mbedtls_x509_pk_type_as_string(const mbedtls_pk_context *pk) { psa_key_type_t key_type; diff --git a/library/x509_crt.c b/library/x509_crt.c index 48ebb12bab..59c3204467 100644 --- a/library/x509_crt.c +++ b/library/x509_crt.c @@ -1806,7 +1806,7 @@ int mbedtls_x509_crt_info(char *buf, size_t size, const char *prefix, /* Key size */ if ((ret = mbedtls_x509_key_size_helper(key_size_str, MBEDTLS_BEFORE_COLON, - mbedtls_pk_key_type_to_string(&crt->pk))) != 0) { + mbedtls_x509_pk_type_as_string(&crt->pk))) != 0) { return ret; } diff --git a/library/x509_csr.c b/library/x509_csr.c index 94b22372ed..3e8e407b26 100644 --- a/library/x509_csr.c +++ b/library/x509_csr.c @@ -551,7 +551,7 @@ int mbedtls_x509_csr_info(char *buf, size_t size, const char *prefix, MBEDTLS_X509_SAFE_SNPRINTF; if ((ret = mbedtls_x509_key_size_helper(key_size_str, MBEDTLS_BEFORE_COLON, - mbedtls_pk_key_type_to_string(&csr->pk))) != 0) { + mbedtls_x509_pk_type_as_string(&csr->pk))) != 0) { return ret; } diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c index b2db36f676..a7ef41aa15 100644 --- a/programs/ssl/ssl_client2.c +++ b/programs/ssl/ssl_client2.c @@ -1770,7 +1770,7 @@ usage: mbedtls_printf(" ok (key type: %s)\n", strlen(opt.key_file) || strlen(opt.key_opaque_alg1) ? - mbedtls_pk_key_type_to_string(&pkey) : "none"); + mbedtls_x509_pk_type_as_string(&pkey) : "none"); #endif /* MBEDTLS_SSL_HANDSHAKE_WITH_CERT_ENABLED */ /* diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c index a44c38c436..805b4ef1c8 100644 --- a/programs/ssl/ssl_server2.c +++ b/programs/ssl/ssl_server2.c @@ -2723,8 +2723,8 @@ usage: } mbedtls_printf(" ok (key types: %s, %s)\n", - key_cert_init ? mbedtls_pk_key_type_to_string(&pkey) : "none", - key_cert_init2 ? mbedtls_pk_key_type_to_string(&pkey2) : "none"); + key_cert_init ? mbedtls_x509_pk_type_as_string(&pkey) : "none", + key_cert_init2 ? mbedtls_x509_pk_type_as_string(&pkey2) : "none"); #endif /* MBEDTLS_SSL_HANDSHAKE_WITH_CERT_ENABLED */ #if defined(SNI_OPTION)