From e83504002d538af74374b9ee657553ad5e7b81e2 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 1 Sep 2018 04:08:05 +0200 Subject: [PATCH] (SSL) Make these functions unique --- deps/mbedtls/ssl_cli.c | 4 ++-- deps/mbedtls/ssl_srv.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deps/mbedtls/ssl_cli.c b/deps/mbedtls/ssl_cli.c index 131e08437e..b21d221244 100644 --- a/deps/mbedtls/ssl_cli.c +++ b/deps/mbedtls/ssl_cli.c @@ -1057,7 +1057,7 @@ static int ssl_write_client_hello( mbedtls_ssl_context *ssl ) #endif /* MBEDTLS_SSL_MAX_FRAGMENT_LENGTH */ #if defined(MBEDTLS_SSL_TRUNCATED_HMAC) -static int ssl_parse_truncated_hmac_ext( mbedtls_ssl_context *ssl, +static int ssl_cli_parse_truncated_hmac_ext( mbedtls_ssl_context *ssl, const unsigned char *buf, size_t len ) { @@ -1720,7 +1720,7 @@ static int ssl_parse_server_hello( mbedtls_ssl_context *ssl ) case MBEDTLS_TLS_EXT_TRUNCATED_HMAC: MBEDTLS_SSL_DEBUG_MSG( 3, ( "found truncated_hmac extension" ) ); - if( ( ret = ssl_parse_truncated_hmac_ext( ssl, + if( ( ret = ssl_cli_parse_truncated_hmac_ext( ssl, ext + 4, ext_size ) ) != 0 ) { return( ret ); diff --git a/deps/mbedtls/ssl_srv.c b/deps/mbedtls/ssl_srv.c index 5f553d4c97..45f1d10bd2 100644 --- a/deps/mbedtls/ssl_srv.c +++ b/deps/mbedtls/ssl_srv.c @@ -369,7 +369,7 @@ static int ssl_parse_ecjpake_kkpp( mbedtls_ssl_context *ssl, #endif /* MBEDTLS_SSL_MAX_FRAGMENT_LENGTH */ #if defined(MBEDTLS_SSL_TRUNCATED_HMAC) -static int ssl_parse_truncated_hmac_ext( mbedtls_ssl_context *ssl, +static int ssl_srv_parse_truncated_hmac_ext( mbedtls_ssl_context *ssl, const unsigned char *buf, size_t len ) { @@ -1701,7 +1701,7 @@ read_record_header: case MBEDTLS_TLS_EXT_TRUNCATED_HMAC: MBEDTLS_SSL_DEBUG_MSG( 3, ( "found truncated hmac extension" ) ); - ret = ssl_parse_truncated_hmac_ext( ssl, ext + 4, ext_size ); + ret = ssl_srv_parse_truncated_hmac_ext( ssl, ext + 4, ext_size ); if( ret != 0 ) return( ret ); break;