From ab555e0a6c91bb98faccd54f2b724a3a56c473b2 Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Mon, 4 Apr 2022 11:07:59 +0200 Subject: [PATCH] Rename mbedtls_get_mode_from_XXX to mbedtls_ssl_get_mode_from_XXX Signed-off-by: Neil Armstrong --- library/ssl_misc.h | 6 +++--- library/ssl_msg.c | 4 ++-- library/ssl_tls.c | 6 +++--- library/ssl_tls12_server.c | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/library/ssl_misc.h b/library/ssl_misc.h index 02fad93d12..16c11cb6bf 100644 --- a/library/ssl_misc.h +++ b/library/ssl_misc.h @@ -2220,15 +2220,15 @@ typedef enum { MBEDTLS_SSL_MODE_AEAD } mbedtls_ssl_mode_t; -mbedtls_ssl_mode_t mbedtls_get_mode_from_transform( +mbedtls_ssl_mode_t mbedtls_ssl_get_mode_from_transform( const mbedtls_ssl_transform *transform ); #if defined(MBEDTLS_SSL_ENCRYPT_THEN_MAC) -mbedtls_ssl_mode_t mbedtls_get_mode_from_ciphersuite( +mbedtls_ssl_mode_t mbedtls_ssl_get_mode_from_ciphersuite( int encrypt_then_mac, const mbedtls_ssl_ciphersuite_t *suite ); #else -mbedtls_ssl_mode_t mbedtls_get_mode_from_ciphersuite( +mbedtls_ssl_mode_t mbedtls_ssl_get_mode_from_ciphersuite( const mbedtls_ssl_ciphersuite_t *suite ); #endif /* MBEDTLS_SSL_ENCRYPT_THEN_MAC */ diff --git a/library/ssl_msg.c b/library/ssl_msg.c index 0bfe4c9ada..083c8d2e68 100644 --- a/library/ssl_msg.c +++ b/library/ssl_msg.c @@ -564,7 +564,7 @@ int mbedtls_ssl_encrypt_buf( mbedtls_ssl_context *ssl, return( MBEDTLS_ERR_SSL_INTERNAL_ERROR ); } - ssl_mode = mbedtls_get_mode_from_transform( transform ); + ssl_mode = mbedtls_ssl_get_mode_from_transform( transform ); data = rec->buf + rec->data_offset; post_avail = rec->buf_len - ( rec->data_len + rec->data_offset ); @@ -1140,7 +1140,7 @@ int mbedtls_ssl_decrypt_buf( mbedtls_ssl_context const *ssl, } data = rec->buf + rec->data_offset; - ssl_mode = mbedtls_get_mode_from_transform( transform ); + ssl_mode = mbedtls_ssl_get_mode_from_transform( transform ); #if defined(MBEDTLS_SSL_DTLS_CONNECTION_ID) /* diff --git a/library/ssl_tls.c b/library/ssl_tls.c index dfcc085a08..9d2769c85b 100644 --- a/library/ssl_tls.c +++ b/library/ssl_tls.c @@ -1767,7 +1767,7 @@ static inline mbedtls_ssl_mode_t mbedtls_get_mode( return( MBEDTLS_SSL_MODE_STREAM ); } -mbedtls_ssl_mode_t mbedtls_get_mode_from_transform( +mbedtls_ssl_mode_t mbedtls_ssl_get_mode_from_transform( const mbedtls_ssl_transform *transform ) { #if defined(MBEDTLS_USE_PSA_CRYPTO) @@ -1788,7 +1788,7 @@ mbedtls_ssl_mode_t mbedtls_get_mode_from_transform( #endif /* MBEDTLS_USE_PSA_CRYPTO */ } -mbedtls_ssl_mode_t mbedtls_get_mode_from_ciphersuite( +mbedtls_ssl_mode_t mbedtls_ssl_get_mode_from_ciphersuite( #if defined(MBEDTLS_SSL_ENCRYPT_THEN_MAC) int encrypt_then_mac, #endif /* MBEDTLS_SSL_ENCRYPT_THEN_MAC */ @@ -6968,7 +6968,7 @@ static int ssl_tls12_populate_transform( mbedtls_ssl_transform *transform, return( MBEDTLS_ERR_SSL_BAD_INPUT_DATA ); } - ssl_mode = mbedtls_get_mode_from_ciphersuite( + ssl_mode = mbedtls_ssl_get_mode_from_ciphersuite( #if defined(MBEDTLS_SSL_ENCRYPT_THEN_MAC) encrypt_then_mac, #endif /* MBEDTLS_SSL_ENCRYPT_THEN_MAC */ diff --git a/library/ssl_tls12_server.c b/library/ssl_tls12_server.c index d5282d7b80..facf09b7bf 100644 --- a/library/ssl_tls12_server.c +++ b/library/ssl_tls12_server.c @@ -1992,7 +1992,7 @@ static void ssl_write_encrypt_then_mac_ext( mbedtls_ssl_context *ssl, else { mbedtls_ssl_mode_t ssl_mode = - mbedtls_get_mode_from_ciphersuite( + mbedtls_ssl_get_mode_from_ciphersuite( ssl->session_negotiate->encrypt_then_mac, suite );