lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-30 22:43:08 +03:00
Code Activity

Split SHA-512 and SHA-384 guards for hash availability code

Browse Source 
Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine
2021-05-12 22:52:09 +02:00
parent fc9c07ff8f
commit c54010c3ec
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
library/ssl_tls.c
View File

@ -6846,8 +6846,10 @@ void mbedtls_ssl_config_init( mbedtls_ssl_config *conf )
#if defined(MBEDTLS_KEY_EXCHANGE_WITH_CERT_ENABLED) #if defined(MBEDTLS_KEY_EXCHANGE_WITH_CERT_ENABLED)
static int ssl_preset_default_hashes[] = { static int ssl_preset_default_hashes[] = {
#if defined(MBEDTLS_SHA512_C) && !defined(MBEDTLS_SHA512_NO_SHA384) #if defined(MBEDTLS_SHA512_C)
MBEDTLS_MD_SHA512, MBEDTLS_MD_SHA512,
#endif
#if defined(MBEDTLS_SHA512_C) && !defined(MBEDTLS_SHA512_NO_SHA384)
MBEDTLS_MD_SHA384, MBEDTLS_MD_SHA384,
#endif #endif
#if defined(MBEDTLS_SHA256_C) #if defined(MBEDTLS_SHA256_C)
@ -7210,6 +7212,8 @@ mbedtls_md_type_t mbedtls_ssl_md_alg_from_hash( unsigned char hash )
#if defined(MBEDTLS_SHA512_C) && !defined(MBEDTLS_SHA512_NO_SHA384) #if defined(MBEDTLS_SHA512_C) && !defined(MBEDTLS_SHA512_NO_SHA384)
case MBEDTLS_SSL_HASH_SHA384: case MBEDTLS_SSL_HASH_SHA384:
return( MBEDTLS_MD_SHA384 ); return( MBEDTLS_MD_SHA384 );
#endif
#if defined(MBEDTLS_SHA512_C)
case MBEDTLS_SSL_HASH_SHA512: case MBEDTLS_SSL_HASH_SHA512:
return( MBEDTLS_MD_SHA512 ); return( MBEDTLS_MD_SHA512 );
#endif #endif
@ -7242,6 +7246,8 @@ unsigned char mbedtls_ssl_hash_from_md_alg( int md )
#if defined(MBEDTLS_SHA512_C) && !defined(MBEDTLS_SHA512_NO_SHA384) #if defined(MBEDTLS_SHA512_C) && !defined(MBEDTLS_SHA512_NO_SHA384)
case MBEDTLS_MD_SHA384: case MBEDTLS_MD_SHA384:
return( MBEDTLS_SSL_HASH_SHA384 ); return( MBEDTLS_SSL_HASH_SHA384 );
#endif
#if defined(MBEDTLS_SHA512_C)
case MBEDTLS_MD_SHA512: case MBEDTLS_MD_SHA512:
return( MBEDTLS_SSL_HASH_SHA512 ); return( MBEDTLS_SSL_HASH_SHA512 );
#endif #endif