TeamHepta/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2026-03-20 19:21:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change function name from mbedtls_pk_key_type_to_string to mbedtls_x509_pk_type_as_string

Browse Source 
Signed-off-by: Ben Taylor <ben.taylor@linaro.org>
This commit is contained in:
Ben Taylor
2026-01-02 09:34:36 +00:00
parent f77d749127
commit 085aef59ca
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/mbedtls/x509.h
View File

@@ -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 * \param[in] pk A mbedtls_pk_context struct containing the pk_key_type to
convert 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 * \brief Convert the certificate DN string \p name into

2
library/x509.c
View File

@@ -125,7 +125,7 @@ int mbedtls_x509_get_alg(unsigned char **p, const unsigned char *end,
/* /*
* Convert pk_key_type to a string * 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; psa_key_type_t key_type;

2
library/x509_crt.c
View File

@@ -1806,7 +1806,7 @@ int mbedtls_x509_crt_info(char *buf, size_t size, const char *prefix,
/* Key size */ /* Key size */
if ((ret = mbedtls_x509_key_size_helper(key_size_str, MBEDTLS_BEFORE_COLON, 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; return ret;
} }

2
library/x509_csr.c
View File

@@ -551,7 +551,7 @@ int mbedtls_x509_csr_info(char *buf, size_t size, const char *prefix,
MBEDTLS_X509_SAFE_SNPRINTF; MBEDTLS_X509_SAFE_SNPRINTF;
if ((ret = mbedtls_x509_key_size_helper(key_size_str, MBEDTLS_BEFORE_COLON, 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; return ret;
} }

2
programs/ssl/ssl_client2.c
View File

@@ -1770,7 +1770,7 @@ usage:
mbedtls_printf(" ok (key type: %s)\n", mbedtls_printf(" ok (key type: %s)\n",
strlen(opt.key_file) || strlen(opt.key_opaque_alg1) ? 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 */ #endif /* MBEDTLS_SSL_HANDSHAKE_WITH_CERT_ENABLED */
/* /*

4
programs/ssl/ssl_server2.c
View File

@@ -2723,8 +2723,8 @@ usage:
} }
mbedtls_printf(" ok (key types: %s, %s)\n", mbedtls_printf(" ok (key types: %s, %s)\n",
key_cert_init ? mbedtls_pk_key_type_to_string(&pkey) : "none", key_cert_init ? mbedtls_x509_pk_type_as_string(&pkey) : "none",
key_cert_init2 ? mbedtls_pk_key_type_to_string(&pkey2) : "none"); key_cert_init2 ? mbedtls_x509_pk_type_as_string(&pkey2) : "none");
#endif /* MBEDTLS_SSL_HANDSHAKE_WITH_CERT_ENABLED */ #endif /* MBEDTLS_SSL_HANDSHAKE_WITH_CERT_ENABLED */
#if defined(SNI_OPTION) #if defined(SNI_OPTION)