Rename mbedtls_ssl_get_pk_type_and_md_alg_from_sig_alg to mbedtls_ssl_get_pk_sigalg_and_md_alg_from_sig_alg

Ben Taylor · Ben Taylor · commit 42074c193fc2 · 2025-10-31T08:40:36.000Z
Signed-off-by: Ben Taylor &lt;ben.taylor@linaro.org&gt;
diff --git a/library/ssl_misc.h b/library/ssl_misc.h
@@ -2409,7 +2409,7 @@ static inline int mbedtls_ssl_sig_alg_is_offered(const mbedtls_ssl_context *ssl,
     return 0;
 }
 
-static inline int mbedtls_ssl_get_pk_type_and_md_alg_from_sig_alg(
+static inline int mbedtls_ssl_get_pk_sigalg_and_md_alg_from_sig_alg(
     uint16_t sig_alg, mbedtls_pk_sigalg_t *pk_type, mbedtls_md_type_t *md_alg)
 {
     *pk_type = mbedtls_ssl_pk_sig_alg_from_sig(sig_alg & 0xff);
diff --git a/library/ssl_tls12_client.c b/library/ssl_tls12_client.c
@@ -1908,7 +1908,7 @@ static int ssl_parse_server_key_exchange(mbedtls_ssl_context *ssl)
          */
         MBEDTLS_SSL_CHK_BUF_READ_PTR(p, end, 2);
         sig_alg = MBEDTLS_GET_UINT16_BE(p, 0);
-        if (mbedtls_ssl_get_pk_type_and_md_alg_from_sig_alg(
+        if (mbedtls_ssl_get_pk_sigalg_and_md_alg_from_sig_alg(
                 sig_alg, &pk_alg, &md_alg) != 0 &&
             !mbedtls_ssl_sig_alg_is_offered(ssl, sig_alg) &&
             !mbedtls_ssl_sig_alg_is_supported(ssl, sig_alg)) {
diff --git a/library/ssl_tls13_generic.c b/library/ssl_tls13_generic.c
@@ -261,7 +261,7 @@ static int ssl_tls13_parse_certificate_verify(mbedtls_ssl_context *ssl,
         goto error;
     }
 
-    if (mbedtls_ssl_get_pk_type_and_md_alg_from_sig_alg(
+    if (mbedtls_ssl_get_pk_sigalg_and_md_alg_from_sig_alg(
             algorithm, &sig_alg, &md_alg) != 0) {
         goto error;
     }
@@ -945,7 +945,7 @@ static int ssl_tls13_write_certificate_verify_body(mbedtls_ssl_context *ssl,
             continue;
         }
 
-        if (mbedtls_ssl_get_pk_type_and_md_alg_from_sig_alg(
+        if (mbedtls_ssl_get_pk_sigalg_and_md_alg_from_sig_alg(
                 *sig_alg, &pk_type, &md_alg) != 0) {
             return MBEDTLS_ERR_SSL_INTERNAL_ERROR;
         }

Original file line number	Diff line number	Diff line change
`@@ -2409,7 +2409,7 @@ static inline int mbedtls_ssl_sig_alg_is_offered(const mbedtls_ssl_context *ssl,`
`2409`	`2409`	`return 0;`
`2410`	`2410`	`}`
`2411`	`2411`
`2412`		`-static inline int mbedtls_ssl_get_pk_type_and_md_alg_from_sig_alg(`
	`2412`	`+static inline int mbedtls_ssl_get_pk_sigalg_and_md_alg_from_sig_alg(`
`2413`	`2413`	`uint16_t sig_alg, mbedtls_pk_sigalg_t pk_type, mbedtls_md_type_t md_alg)`
`2414`	`2414`	`{`
`2415`	`2415`	`*pk_type = mbedtls_ssl_pk_sig_alg_from_sig(sig_alg & 0xff);`
Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ static int ssl_tls13_parse_certificate_verify(mbedtls_ssl_context *ssl,`
`261`	`261`	`goto error;`
`262`	`262`	`}`
`263`	`263`
`264`		`- if (mbedtls_ssl_get_pk_type_and_md_alg_from_sig_alg(`
	`264`	`+ if (mbedtls_ssl_get_pk_sigalg_and_md_alg_from_sig_alg(`
`265`	`265`	`algorithm, &sig_alg, &md_alg) != 0) {`
`266`	`266`	`goto error;`
`267`	`267`	`}`
`@@ -945,7 +945,7 @@ static int ssl_tls13_write_certificate_verify_body(mbedtls_ssl_context *ssl,`
`945`	`945`	`continue;`
`946`	`946`	`}`
`947`	`947`
`948`		`- if (mbedtls_ssl_get_pk_type_and_md_alg_from_sig_alg(`
	`948`	`+ if (mbedtls_ssl_get_pk_sigalg_and_md_alg_from_sig_alg(`
`949`	`949`	`*sig_alg, &pk_type, &md_alg) != 0) {`
`950`	`950`	`return MBEDTLS_ERR_SSL_INTERNAL_ERROR;`
`951`	`951`	`}`