mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2025-11-15 15:21:08 +03:00
Update name of mbedtls_ssl_pk_alg_from_sig_pk_alg to mbedtls_ssl_pk_sig_alg_from_sig
Signed-off-by: Ben Taylor <ben.taylor@linaro.org>
This commit is contained in:
@@ -1511,7 +1511,7 @@ static inline mbedtls_svc_key_id_t mbedtls_ssl_get_opaque_psk(
|
|||||||
#if defined(MBEDTLS_PK_C)
|
#if defined(MBEDTLS_PK_C)
|
||||||
unsigned char mbedtls_ssl_sig_from_pk(mbedtls_pk_context *pk);
|
unsigned char mbedtls_ssl_sig_from_pk(mbedtls_pk_context *pk);
|
||||||
unsigned char mbedtls_ssl_sig_from_pk_alg(mbedtls_pk_sigalg_t type);
|
unsigned char mbedtls_ssl_sig_from_pk_alg(mbedtls_pk_sigalg_t type);
|
||||||
mbedtls_pk_sigalg_t mbedtls_ssl_pk_alg_from_sig_pk_alg(unsigned char sig);
|
mbedtls_pk_sigalg_t mbedtls_ssl_pk_sig_alg_from_sig(unsigned char sig);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
mbedtls_md_type_t mbedtls_ssl_md_alg_from_hash(unsigned char hash);
|
mbedtls_md_type_t mbedtls_ssl_md_alg_from_hash(unsigned char hash);
|
||||||
@@ -2412,7 +2412,7 @@ static inline int mbedtls_ssl_sig_alg_is_offered(const mbedtls_ssl_context *ssl,
|
|||||||
static inline int mbedtls_ssl_get_pk_type_and_md_alg_from_sig_alg(
|
static inline int mbedtls_ssl_get_pk_type_and_md_alg_from_sig_alg(
|
||||||
uint16_t sig_alg, mbedtls_pk_sigalg_t *pk_type, mbedtls_md_type_t *md_alg)
|
uint16_t sig_alg, mbedtls_pk_sigalg_t *pk_type, mbedtls_md_type_t *md_alg)
|
||||||
{
|
{
|
||||||
*pk_type = mbedtls_ssl_pk_alg_from_sig_pk_alg(sig_alg & 0xff);
|
*pk_type = mbedtls_ssl_pk_sig_alg_from_sig(sig_alg & 0xff);
|
||||||
*md_alg = mbedtls_ssl_md_alg_from_hash((sig_alg >> 8) & 0xff);
|
*md_alg = mbedtls_ssl_md_alg_from_hash((sig_alg >> 8) & 0xff);
|
||||||
|
|
||||||
if (*pk_type != MBEDTLS_PK_SIGALG_NONE && *md_alg != MBEDTLS_MD_NONE) {
|
if (*pk_type != MBEDTLS_PK_SIGALG_NONE && *md_alg != MBEDTLS_MD_NONE) {
|
||||||
|
|||||||
@@ -5631,7 +5631,7 @@ unsigned char mbedtls_ssl_sig_from_pk_alg(mbedtls_pk_sigalg_t type)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
mbedtls_pk_sigalg_t mbedtls_ssl_pk_alg_from_sig_pk_alg(unsigned char sig)
|
mbedtls_pk_sigalg_t mbedtls_ssl_pk_sig_alg_from_sig(unsigned char sig)
|
||||||
{
|
{
|
||||||
switch (sig) {
|
switch (sig) {
|
||||||
#if defined(MBEDTLS_RSA_C)
|
#if defined(MBEDTLS_RSA_C)
|
||||||
|
|||||||
@@ -3416,7 +3416,7 @@ static int ssl_parse_certificate_verify(mbedtls_ssl_context *ssl)
|
|||||||
/*
|
/*
|
||||||
* Signature
|
* Signature
|
||||||
*/
|
*/
|
||||||
if ((pk_alg = mbedtls_ssl_pk_alg_from_sig_pk_alg(ssl->in_msg[i]))
|
if ((pk_alg = mbedtls_ssl_pk_sig_alg_from_sig(ssl->in_msg[i]))
|
||||||
== MBEDTLS_PK_SIGALG_NONE) {
|
== MBEDTLS_PK_SIGALG_NONE) {
|
||||||
MBEDTLS_SSL_DEBUG_MSG(1, ("peer not adhering to requested sig_alg"
|
MBEDTLS_SSL_DEBUG_MSG(1, ("peer not adhering to requested sig_alg"
|
||||||
" for verify message"));
|
" for verify message"));
|
||||||
|
|||||||
Reference in New Issue
Block a user