yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-02-03 06:31:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix unreachable code warnings with armc5

Browse source 
Some TLS-only code paths were not protected by an #ifdef and while some
compiler are happy to just silently remove them, armc5 complains:

Warning:  #111-D: statement is unreachable

Let's make armc5 happy.
This commit is contained in:
Manuel Pégourié-Gonnard 2019-06-18 10:56:09 +02:00
parent 19e8132e1e
commit 889bbc70b6
2 changed files with 36 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/mbedtls/ssl_internal.h
View file

@ -969,8 +969,11 @@ static inline size_t mbedtls_ssl_hs_hdr_len( const mbedtls_ssl_context *ssl )
#if defined(MBEDTLS_SSL_PROTO_DTLS) #if defined(MBEDTLS_SSL_PROTO_DTLS)
if( MBEDTLS_SSL_TRANSPORT_IS_DTLS( ssl->conf->transport ) ) if( MBEDTLS_SSL_TRANSPORT_IS_DTLS( ssl->conf->transport ) )
return( 12 ); return( 12 );
MBEDTLS_SSL_TRANSPORT_ELSE
#endif
#if defined(MBEDTLS_SSL_PROTO_TLS)
return( 4 );
#endif #endif
return( 4 );
} }
#if defined(MBEDTLS_SSL_PROTO_DTLS) #if defined(MBEDTLS_SSL_PROTO_DTLS)

47
library/ssl_tls.c
View file

@ -68,8 +68,11 @@ static inline size_t ssl_ep_len( const mbedtls_ssl_context *ssl )
#if defined(MBEDTLS_SSL_PROTO_DTLS) #if defined(MBEDTLS_SSL_PROTO_DTLS)
if( MBEDTLS_SSL_TRANSPORT_IS_DTLS( ssl->conf->transport ) ) if( MBEDTLS_SSL_TRANSPORT_IS_DTLS( ssl->conf->transport ) )
return( 2 ); return( 2 );
MBEDTLS_SSL_TRANSPORT_ELSE
#endif #endif
#if defined(MBEDTLS_SSL_PROTO_TLS)
return( 0 ); return( 0 );
#endif
} }
/* /*
@ -8598,25 +8601,29 @@ const char *mbedtls_ssl_get_version( const mbedtls_ssl_context *ssl )
return( "unknown (DTLS)" ); return( "unknown (DTLS)" );
} }
} }
#endif MBEDTLS_SSL_TRANSPORT_ELSE
#endif /* MBEDTLS_SSL_PROTO_DTLS */
switch( ssl->minor_ver ) #if defined(MBEDTLS_SSL_PROTO_TLS)
{ {
case MBEDTLS_SSL_MINOR_VERSION_0: switch( ssl->minor_ver )
return( "SSLv3.0" ); {
case MBEDTLS_SSL_MINOR_VERSION_0:
return( "SSLv3.0" );
case MBEDTLS_SSL_MINOR_VERSION_1: case MBEDTLS_SSL_MINOR_VERSION_1:
return( "TLSv1.0" ); return( "TLSv1.0" );
case MBEDTLS_SSL_MINOR_VERSION_2: case MBEDTLS_SSL_MINOR_VERSION_2:
return( "TLSv1.1" ); return( "TLSv1.1" );
case MBEDTLS_SSL_MINOR_VERSION_3: case MBEDTLS_SSL_MINOR_VERSION_3:
return( "TLSv1.2" ); return( "TLSv1.2" );
default: default:
return( "unknown" ); return( "unknown" );
}
} }
#endif /* MBEDTLS_SSL_PROTO_TLS */
} }
int mbedtls_ssl_get_record_expansion( const mbedtls_ssl_context *ssl ) int mbedtls_ssl_get_record_expansion( const mbedtls_ssl_context *ssl )
@ -9610,8 +9617,13 @@ int mbedtls_ssl_read( mbedtls_ssl_context *ssl, unsigned char *buf, size_t len )
{ {
continue; continue;
} }
MBEDTLS_SSL_TRANSPORT_ELSE
#endif
#if defined(MBEDTLS_SSL_PROTO_TLS)
{
return( MBEDTLS_ERR_SSL_UNEXPECTED_MESSAGE );
}
#endif #endif
return( MBEDTLS_ERR_SSL_UNEXPECTED_MESSAGE );
} }
#endif /* MBEDTLS_SSL_CLI_C */ #endif /* MBEDTLS_SSL_CLI_C */
@ -9627,8 +9639,13 @@ int mbedtls_ssl_read( mbedtls_ssl_context *ssl, unsigned char *buf, size_t len )
{ {
continue; continue;
} }
MBEDTLS_SSL_TRANSPORT_ELSE
#endif
#if defined(MBEDTLS_SSL_PROTO_TLS)
{
return( MBEDTLS_ERR_SSL_UNEXPECTED_MESSAGE );
}
#endif #endif
return( MBEDTLS_ERR_SSL_UNEXPECTED_MESSAGE );
} }
#endif /* MBEDTLS_SSL_SRV_C */ #endif /* MBEDTLS_SSL_SRV_C */