From e12f1ddcfaa498b059f2eddc068589454292bff2 Mon Sep 17 00:00:00 2001 From: Jerry Yu Date: Thu, 13 Jan 2022 14:38:22 +0800 Subject: [PATCH] fix check names fail Signed-off-by: Jerry Yu --- library/ssl_misc.h | 13 +++++++++++++ library/ssl_tls.c | 10 ---------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/library/ssl_misc.h b/library/ssl_misc.h index 10aa8ef292..b0335fe74e 100644 --- a/library/ssl_misc.h +++ b/library/ssl_misc.h @@ -1829,4 +1829,17 @@ static inline const void *mbedtls_ssl_get_sig_algs( const mbedtls_ssl_context *s return NULL; } +#if defined(MBEDTLS_SSL_PROTO_TLS1_2) && \ + defined(MBEDTLS_KEY_EXCHANGE_WITH_CERT_ENABLED) +#if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_RSA_C) +#define MBEDTLS_SSL_SIG_ALG( hash ) (( hash << 8 ) | MBEDTLS_SSL_SIG_ECDSA), \ + (( hash << 8 ) | MBEDTLS_SSL_SIG_RSA), +#elif defined(MBEDTLS_ECDSA_C) +#define MBEDTLS_SSL_SIG_ALG( hash ) (( hash << 8 ) | MBEDTLS_SSL_SIG_ECDSA), +#elif defined(MBEDTLS_RSA_C) +#define MBEDTLS_SSL_SIG_ALG( hash ) (( hash << 8 ) | MBEDTLS_SSL_SIG_RSA), +#else +#define MBEDTLS_SSL_SIG_ALG( hash ) +#endif /* MBEDTLS_ECDSA_C && MBEDTLS_RSA_C */ +#endif /* MBEDTLS_SSL_PROTO_TLS1_2 && MBEDTLS_KEY_EXCHANGE_WITH_CERT_ENABLED */ #endif /* ssl_misc.h */ diff --git a/library/ssl_tls.c b/library/ssl_tls.c index b109ffaa0c..91e84b57ec 100644 --- a/library/ssl_tls.c +++ b/library/ssl_tls.c @@ -6403,16 +6403,6 @@ void mbedtls_ssl_config_init( mbedtls_ssl_config *conf ) } #if defined(MBEDTLS_KEY_EXCHANGE_WITH_CERT_ENABLED) -#if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_RSA_C) -#define MBEDTLS_SSL_SIG_ALG( hash ) (( hash << 8 ) | MBEDTLS_SSL_SIG_ECDSA), \ - (( hash << 8 ) | MBEDTLS_SSL_SIG_RSA), -#elif defined(MBEDTLS_ECDSA_C) -#define MBEDTLS_SSL_SIG_ALG( hash ) (( hash << 8 ) | MBEDTLS_SSL_SIG_ECDSA), -#elif defined(MBEDTLS_RSA_C) -#define MBEDTLS_SSL_SIG_ALG( hash ) (( hash << 8 ) | MBEDTLS_SSL_SIG_RSA), -#else -#define MBEDTLS_SSL_SIG_ALG( hash ) -#endif /* MBEDTLS_ECDSA_C && MBEDTLS_RSA_C */ #if !defined(MBEDTLS_DEPRECATED_REMOVED) /* The selection should be the same as mbedtls_x509_crt_profile_default in * x509_crt.c. Here, the order matters. Currently we favor stronger hashes,