Mbed-TLS/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2026-10-13 20:37:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4498 from netfoundry/gcc11.fixes_2.16

Browse Source 
Backport 2.16: build with gcc11
This commit is contained in:
Gilles Peskine
2021-05-20 15:54:17 +02:00
committed by GitHub
parent 1012b7c696 69c5f5d81c
commit 85060d2fad
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
library/ssl_tls.c
+13 -10
View File
@@ -6364,8 +6364,6 @@ static void ssl_calc_finished_tls_sha256(
#if defined(MBEDTLS_SHA512_C)
typedef int (*finish_sha384_t)(mbedtls_sha512_context*, unsigned char*);
static void ssl_calc_finished_tls_sha384(
mbedtls_ssl_context *ssl, unsigned char *buf, int from )
{
@@ -6373,12 +6371,6 @@ static void ssl_calc_finished_tls_sha384(
const char *sender;
mbedtls_sha512_context sha512;
unsigned char padbuf[48];
/*
* For SHA-384, we can save 16 bytes by keeping padbuf 48 bytes long.
* However, to avoid stringop-overflow warning in gcc, we have to cast
* mbedtls_sha512_finish_ret().
*/
finish_sha384_t finish_sha384 = (finish_sha384_t)mbedtls_sha512_finish_ret;
mbedtls_ssl_session *session = ssl->session_negotiate;
if( !session )
@@ -6404,8 +6396,19 @@ static void ssl_calc_finished_tls_sha384(
sender = ( from == MBEDTLS_SSL_IS_CLIENT )
? "client finished"
: "server finished";
finish_sha384( &sha512, padbuf );
/* mbedtls_sha512_finish_ret's output parameter is declared as a
* 64-byte buffer, but sice we're using SHA-384, we know that the
* output fits in 48 bytes. This is correct C, but GCC 11.1 warns
* about it.
*/
#if defined(__GNUC__) && __GNUC__ >= 11
#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
ssl->handshake->tls_prf( session->master, 48, sender,
padbuf, 48, buf, len );
programs/test/udp_proxy.c
+2 -2
View File
@@ -991,8 +991,8 @@ exit:
for( delay_idx = 0; delay_idx < MAX_DELAYED_HS; delay_idx++ )
{
mbedtls_free( opt.delay_cli + delay_idx );
mbedtls_free( opt.delay_srv + delay_idx );
mbedtls_free( opt.delay_cli[delay_idx] );
mbedtls_free( opt.delay_srv[delay_idx] );
}
mbedtls_net_free( &client_fd );