Skip to content

Commit 0cbfaab

Browse files
Update network_transport files based on MbedTLSv3.6.3 (FreeRTOS#1340)
Update network_transport files based on MbedTLSv3.6.3
1 parent 1325aaa commit 0cbfaab

File tree

2 files changed

+25
-13
lines changed

2 files changed

+25
-13
lines changed

FreeRTOS-Plus/Source/Application-Protocols/network_transport/transport_mbedtls.c

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -462,13 +462,19 @@ static void setOptionalConfigurations( SSLContext_t * pSslContext,
462462
{
463463
mbedtlsError = mbedtls_ssl_set_hostname( &( pSslContext->context ),
464464
pHostName );
465+
}
466+
/* MbedTLS-3.6.3 requires calling the mbedtls_ssl_set_hostname() before calling mbedtls_ssl_handshake(). */
467+
else
468+
{
469+
mbedtlsError = mbedtls_ssl_set_hostname( &( pSslContext->context ),
470+
NULL );
471+
}
465472

466-
if( mbedtlsError != 0 )
467-
{
468-
LogError( ( "Failed to set server name: mbedTLSError= %s : %s.",
469-
mbedtlsHighLevelCodeOrDefault( mbedtlsError ),
470-
mbedtlsLowLevelCodeOrDefault( mbedtlsError ) ) );
471-
}
473+
if( mbedtlsError != 0 )
474+
{
475+
LogError( ( "Failed to set server name: mbedTLSError= %s : %s.",
476+
mbedtlsHighLevelCodeOrDefault( mbedtlsError ),
477+
mbedtlsLowLevelCodeOrDefault( mbedtlsError ) ) );
472478
}
473479

474480
/* Set Maximum Fragment Length if enabled. */

FreeRTOS-Plus/Source/Application-Protocols/network_transport/transport_mbedtls_pkcs11.c

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -463,15 +463,21 @@ static TlsTransportStatus_t tlsSetup( NetworkContext_t * pNetworkContext,
463463
{
464464
mbedtlsError = mbedtls_ssl_set_hostname( &( pTlsTransportParams->sslContext.context ),
465465
pHostName );
466+
}
467+
/* MbedTLS-3.6.3 requires calling the mbedtls_ssl_set_hostname() before calling mbedtls_ssl_handshake(). */
468+
else
469+
{
470+
mbedtlsError = mbedtls_ssl_set_hostname( &( pTlsTransportParams->sslContext.context ),
471+
NULL );
472+
}
466473

467-
if( mbedtlsError != 0 )
468-
{
469-
LogError( ( "Failed to set server name: mbedTLSError= %s : %s.",
470-
mbedtlsHighLevelCodeOrDefault( mbedtlsError ),
471-
mbedtlsLowLevelCodeOrDefault( mbedtlsError ) ) );
474+
if( mbedtlsError != 0 )
475+
{
476+
LogError( ( "Failed to set server name: mbedTLSError= %s : %s.",
477+
mbedtlsHighLevelCodeOrDefault( mbedtlsError ),
478+
mbedtlsLowLevelCodeOrDefault( mbedtlsError ) ) );
472479

473-
returnStatus = TLS_TRANSPORT_INTERNAL_ERROR;
474-
}
480+
returnStatus = TLS_TRANSPORT_INTERNAL_ERROR;
475481
}
476482
}
477483

0 commit comments

Comments
 (0)