mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-04-01 22:20:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix coding style issues

Browse Source 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
This commit is contained in:
Jerry Yu 2022-01-21 16:16:01 +08:00
parent 941e07ff02
commit 971988528d
2 changed files with 48 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
library/ssl_misc.h
View File

@ -1871,30 +1871,35 @@ static inline int mbedtls_ssl_sig_alg_is_supported(
switch( hash ) switch( hash )
{ {
#if defined(MBEDTLS_MD5_C) #if defined(MBEDTLS_MD5_C)
case MBEDTLS_SSL_HASH_MD5: case MBEDTLS_SSL_HASH_MD5:
break; break;
#endif #endif
#if defined(MBEDTLS_SHA1_C)
#if defined(MBEDTLS_SHA1_C)
case MBEDTLS_SSL_HASH_SHA1: case MBEDTLS_SSL_HASH_SHA1:
break; break;
#endif #endif
#if defined(MBEDTLS_SHA224_C)
#if defined(MBEDTLS_SHA224_C)
case MBEDTLS_SSL_HASH_SHA224: case MBEDTLS_SSL_HASH_SHA224:
break; break;
#endif #endif
#if defined(MBEDTLS_SHA256_C)
#if defined(MBEDTLS_SHA256_C)
case MBEDTLS_SSL_HASH_SHA256: case MBEDTLS_SSL_HASH_SHA256:
break; break;
#endif #endif
#if defined(MBEDTLS_SHA384_C)
#if defined(MBEDTLS_SHA384_C)
case MBEDTLS_SSL_HASH_SHA384: case MBEDTLS_SSL_HASH_SHA384:
break; break;
#endif #endif
#if defined(MBEDTLS_SHA512_C)
#if defined(MBEDTLS_SHA512_C)
case MBEDTLS_SSL_HASH_SHA512: case MBEDTLS_SSL_HASH_SHA512:
break; break;
#endif #endif
default: default:
return( 0 ); return( 0 );
@ -1902,15 +1907,15 @@ static inline int mbedtls_ssl_sig_alg_is_supported(
switch( sig ) switch( sig )
{ {
#if defined(MBEDTLS_RSA_C) #if defined(MBEDTLS_RSA_C)
case MBEDTLS_SSL_SIG_RSA: case MBEDTLS_SSL_SIG_RSA:
break; break;
#endif #endif
#if defined(MBEDTLS_ECDSA_C) #if defined(MBEDTLS_ECDSA_C)
case MBEDTLS_SSL_SIG_ECDSA: case MBEDTLS_SSL_SIG_ECDSA:
break; break;
#endif #endif
default: default:
return( 0 ); return( 0 );
@ -1925,44 +1930,44 @@ static inline int mbedtls_ssl_sig_alg_is_supported(
{ {
switch( sig_alg ) switch( sig_alg )
{ {
#if defined(MBEDTLS_SHA256_C) && \ #if defined(MBEDTLS_SHA256_C) && \
defined(MBEDTLS_ECP_DP_SECP256R1_ENABLED) && \ defined(MBEDTLS_ECP_DP_SECP256R1_ENABLED) && \
defined(MBEDTLS_ECDSA_C) defined(MBEDTLS_ECDSA_C)
case MBEDTLS_TLS1_3_SIG_ECDSA_SECP256R1_SHA256: case MBEDTLS_TLS1_3_SIG_ECDSA_SECP256R1_SHA256:
break; break;
#endif /* MBEDTLS_SHA256_C && #endif /* MBEDTLS_SHA256_C &&
MBEDTLS_ECP_DP_SECP256R1_ENABLED && MBEDTLS_ECP_DP_SECP256R1_ENABLED &&
MBEDTLS_ECDSA_C */ MBEDTLS_ECDSA_C */
#if defined(MBEDTLS_SHA384_C) && \ #if defined(MBEDTLS_SHA384_C) && \
defined(MBEDTLS_ECP_DP_SECP384R1_ENABLED) && \ defined(MBEDTLS_ECP_DP_SECP384R1_ENABLED) && \
defined(MBEDTLS_ECDSA_C) defined(MBEDTLS_ECDSA_C)
case MBEDTLS_TLS1_3_SIG_ECDSA_SECP384R1_SHA384: case MBEDTLS_TLS1_3_SIG_ECDSA_SECP384R1_SHA384:
break; break;
#endif /* MBEDTLS_SHA384_C && #endif /* MBEDTLS_SHA384_C &&
MBEDTLS_ECP_DP_SECP384R1_ENABLED && MBEDTLS_ECP_DP_SECP384R1_ENABLED &&
MBEDTLS_ECDSA_C */ MBEDTLS_ECDSA_C */
#if defined(MBEDTLS_SHA512_C) && \ #if defined(MBEDTLS_SHA512_C) && \
defined(MBEDTLS_ECP_DP_SECP521R1_ENABLED) && \ defined(MBEDTLS_ECP_DP_SECP521R1_ENABLED) && \
defined(MBEDTLS_ECDSA_C) defined(MBEDTLS_ECDSA_C)
case MBEDTLS_TLS1_3_SIG_ECDSA_SECP521R1_SHA512: case MBEDTLS_TLS1_3_SIG_ECDSA_SECP521R1_SHA512:
break; break;
#endif /* MBEDTLS_SHA512_C && #endif /* MBEDTLS_SHA512_C &&
MBEDTLS_ECP_DP_SECP521R1_ENABLED && MBEDTLS_ECP_DP_SECP521R1_ENABLED &&
MBEDTLS_ECDSA_C */ MBEDTLS_ECDSA_C */
#if defined(MBEDTLS_SHA256_C) && \ #if defined(MBEDTLS_SHA256_C) && \
defined(MBEDTLS_X509_RSASSA_PSS_SUPPORT) defined(MBEDTLS_X509_RSASSA_PSS_SUPPORT)
case MBEDTLS_TLS1_3_SIG_RSA_PSS_RSAE_SHA256: case MBEDTLS_TLS1_3_SIG_RSA_PSS_RSAE_SHA256:
break; break;
#endif /* MBEDTLS_SHA256_C && #endif /* MBEDTLS_SHA256_C &&
MBEDTLS_X509_RSASSA_PSS_SUPPORT */ MBEDTLS_X509_RSASSA_PSS_SUPPORT */
#if defined(MBEDTLS_SHA256_C) && defined(MBEDTLS_RSA_C) #if defined(MBEDTLS_SHA256_C) && defined(MBEDTLS_RSA_C)
case MBEDTLS_TLS1_3_SIG_RSA_PKCS1_SHA256: case MBEDTLS_TLS1_3_SIG_RSA_PKCS1_SHA256:
break; break;
#endif /* MBEDTLS_SHA256_C && MBEDTLS_RSA_C*/ #endif /* MBEDTLS_SHA256_C && MBEDTLS_RSA_C*/
default: default:
return( 0 ); return( 0 );

5
library/ssl_srv.c
View File

@ -1805,13 +1805,14 @@ read_record_header:
{ {
uint16_t sig_algs[] = { MBEDTLS_SSL_SIG_ALG(MBEDTLS_SSL_HASH_SHA1) }; uint16_t sig_algs[] = { MBEDTLS_SSL_SIG_ALG(MBEDTLS_SSL_HASH_SHA1) };
mbedtls_md_type_t md_default = MBEDTLS_MD_NONE; mbedtls_md_type_t md_default = MBEDTLS_MD_NONE;
for( i = 0; i < sizeof(sig_algs)/sizeof(sig_algs[0]) ; i++ ) for( i = 0; i < sizeof( sig_algs ) / sizeof( sig_algs[0] ) ; i++ )
{ {
if( mbedtls_ssl_sig_alg_is_offered( ssl, sig_algs[ i ] ) ) if( mbedtls_ssl_sig_alg_is_offered( ssl, sig_algs[ i ] ) )
md_default = MBEDTLS_MD_SHA1; md_default = MBEDTLS_MD_SHA1;
} }
mbedtls_ssl_sig_hash_set_const_hash( &ssl->handshake->hash_algs, md_default ); mbedtls_ssl_sig_hash_set_const_hash( &ssl->handshake->hash_algs,
md_default );
} }
#endif /* MBEDTLS_SSL_PROTO_TLS1_2 && #endif /* MBEDTLS_SSL_PROTO_TLS1_2 &&