mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-04-09 21:44:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename mbedtls_get_mode_from_XXX to mbedtls_ssl_get_mode_from_XXX

Browse Source 
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
This commit is contained in:
Neil Armstrong 2022-04-04 11:07:59 +02:00
parent 858581e81a
commit ab555e0a6c
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/ssl_misc.h
View File

@ -2220,15 +2220,15 @@ typedef enum {
MBEDTLS_SSL_MODE_AEAD MBEDTLS_SSL_MODE_AEAD
} mbedtls_ssl_mode_t; } 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 ); const mbedtls_ssl_transform *transform );
#if defined(MBEDTLS_SSL_ENCRYPT_THEN_MAC) #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, int encrypt_then_mac,
const mbedtls_ssl_ciphersuite_t *suite ); const mbedtls_ssl_ciphersuite_t *suite );
#else #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 ); const mbedtls_ssl_ciphersuite_t *suite );
#endif /* MBEDTLS_SSL_ENCRYPT_THEN_MAC */ #endif /* MBEDTLS_SSL_ENCRYPT_THEN_MAC */

4
library/ssl_msg.c
View File

@ -564,7 +564,7 @@ int mbedtls_ssl_encrypt_buf( mbedtls_ssl_context *ssl,
return( MBEDTLS_ERR_SSL_INTERNAL_ERROR ); 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; data = rec->buf + rec->data_offset;
post_avail = rec->buf_len - ( rec->data_len + 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; 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) #if defined(MBEDTLS_SSL_DTLS_CONNECTION_ID)
/* /*

6
library/ssl_tls.c
View File

@ -1767,7 +1767,7 @@ static inline mbedtls_ssl_mode_t mbedtls_get_mode(
return( MBEDTLS_SSL_MODE_STREAM ); 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 ) const mbedtls_ssl_transform *transform )
{ {
#if defined(MBEDTLS_USE_PSA_CRYPTO) #if defined(MBEDTLS_USE_PSA_CRYPTO)
@ -1788,7 +1788,7 @@ mbedtls_ssl_mode_t mbedtls_get_mode_from_transform(
#endif /* MBEDTLS_USE_PSA_CRYPTO */ #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) #if defined(MBEDTLS_SSL_ENCRYPT_THEN_MAC)
int encrypt_then_mac, int encrypt_then_mac,
#endif /* MBEDTLS_SSL_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 ); 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) #if defined(MBEDTLS_SSL_ENCRYPT_THEN_MAC)
encrypt_then_mac, encrypt_then_mac,
#endif /* MBEDTLS_SSL_ENCRYPT_THEN_MAC */ #endif /* MBEDTLS_SSL_ENCRYPT_THEN_MAC */

2
library/ssl_tls12_server.c
View File

@ -1992,7 +1992,7 @@ static void ssl_write_encrypt_then_mac_ext( mbedtls_ssl_context *ssl,
else else
{ {
mbedtls_ssl_mode_t ssl_mode = mbedtls_ssl_mode_t ssl_mode =
mbedtls_get_mode_from_ciphersuite( mbedtls_ssl_get_mode_from_ciphersuite(
ssl->session_negotiate->encrypt_then_mac, ssl->session_negotiate->encrypt_then_mac,
suite ); suite );