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

Fix spurious -Wstringop-overflow with GCC 11.1

Browse source 
A previous fix in d596ca8a1e worked with
beta versions of GCC 11, but not with the final 11.1 release.

This time, just disable the warning locally.

Fix #4130

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine 2021-05-13 00:00:45 +02:00 committed by Shawn Carey
parent 4e54f25cc6
commit bb66dac971
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
library/ssl_tls.c
View file

@ -3265,8 +3265,6 @@ static void ssl_calc_finished_tls_sha256(
#if defined(MBEDTLS_SHA512_C) #if defined(MBEDTLS_SHA512_C)
typedef int (*finish_sha384_t)(mbedtls_sha512_context*, unsigned char*);
static void ssl_calc_finished_tls_sha384( static void ssl_calc_finished_tls_sha384(
mbedtls_ssl_context *ssl, unsigned char *buf, int from ) mbedtls_ssl_context *ssl, unsigned char *buf, int from )
{ {
@ -3325,13 +3323,19 @@ static void ssl_calc_finished_tls_sha384(
MBEDTLS_SSL_DEBUG_BUF( 4, "finished sha512 state", (unsigned char *) MBEDTLS_SSL_DEBUG_BUF( 4, "finished sha512 state", (unsigned char *)
sha512.state, sizeof( sha512.state ) ); sha512.state, sizeof( sha512.state ) );
#endif #endif
/* /* mbedtls_sha512_finish_ret's output parameter is declared as a
* For SHA-384, we can save 16 bytes by keeping padbuf 48 bytes long. * 64-byte buffer, but sice we're using SHA-384, we know that the
* However, to avoid stringop-overflow warning in gcc, we have to cast * output fits in 48 bytes. This is correct C, but GCC 11.1 warns
* mbedtls_sha512_finish_ret(). * about it.
*/ */
finish_sha384_t finish = (finish_sha384_t)mbedtls_sha512_finish_ret; #if defined(__GNUC__) && __GNUC__ >= 11
finish( &sha512, padbuf ); #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wstringop-overflow"
#endif
mbedtls_sha512_finish_ret( &sha512, padbuf );
#if defined(__GNUC__) && __GNUC__ >= 11
#pragma GCC diagnostic pop
#endif
mbedtls_sha512_free( &sha512 ); mbedtls_sha512_free( &sha512 );
#endif #endif