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

Consistent renaming

Browse Source 
Signed-off-by: Pengyu Lv <pengyu.lv@arm.com>
This commit is contained in:
Pengyu Lv 2023-11-14 13:56:13 +08:00
parent 2333b826f4
commit b2cfafbb9e
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
library/ssl_misc.h
View File

@ -1955,32 +1955,32 @@ static inline int mbedtls_ssl_tls13_is_kex_mode_supported(mbedtls_ssl_context *s
return (ssl->handshake->tls13_kex_modes & kex_modes_mask) != 0; return (ssl->handshake->tls13_kex_modes & kex_modes_mask) != 0;
} }
static inline int mbedtls_ssl_tls13_psk_enabled(mbedtls_ssl_context *ssl) static inline int mbedtls_ssl_tls13_is_psk_supported(mbedtls_ssl_context *ssl)
{ {
return mbedtls_ssl_tls13_is_kex_mode_supported(ssl, return mbedtls_ssl_tls13_is_kex_mode_supported(ssl,
MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK); MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK);
} }
static inline int mbedtls_ssl_tls13_psk_ephemeral_enabled( static inline int mbedtls_ssl_tls13_is_psk_ephemeral_supported(
mbedtls_ssl_context *ssl) mbedtls_ssl_context *ssl)
{ {
return mbedtls_ssl_tls13_is_kex_mode_supported(ssl, return mbedtls_ssl_tls13_is_kex_mode_supported(ssl,
MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_EPHEMERAL); MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_EPHEMERAL);
} }
static inline int mbedtls_ssl_tls13_ephemeral_enabled(mbedtls_ssl_context *ssl) static inline int mbedtls_ssl_tls13_is_ephemeral_supported(mbedtls_ssl_context *ssl)
{ {
return mbedtls_ssl_tls13_is_kex_mode_supported(ssl, return mbedtls_ssl_tls13_is_kex_mode_supported(ssl,
MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_EPHEMERAL); MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_EPHEMERAL);
} }
static inline int mbedtls_ssl_tls13_some_ephemeral_enabled(mbedtls_ssl_context *ssl) static inline int mbedtls_ssl_tls13_is_some_ephemeral_supported(mbedtls_ssl_context *ssl)
{ {
return mbedtls_ssl_tls13_is_kex_mode_supported(ssl, return mbedtls_ssl_tls13_is_kex_mode_supported(ssl,
MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_EPHEMERAL_ALL); MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_EPHEMERAL_ALL);
} }
static inline int mbedtls_ssl_tls13_some_psk_enabled(mbedtls_ssl_context *ssl) static inline int mbedtls_ssl_tls13_is_some_psk_supported(mbedtls_ssl_context *ssl)
{ {
return mbedtls_ssl_tls13_is_kex_mode_supported(ssl, return mbedtls_ssl_tls13_is_kex_mode_supported(ssl,
MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_ALL); MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_ALL);

6
library/ssl_tls13_server.c
View File

@ -1040,7 +1040,7 @@ static int ssl_tls13_key_exchange_psk_available(mbedtls_ssl_context *ssl)
return ssl_tls13_ticket_is_kex_mode_permitted( return ssl_tls13_ticket_is_kex_mode_permitted(
ssl, MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK) && ssl, MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK) &&
mbedtls_ssl_conf_tls13_is_psk_enabled(ssl) && mbedtls_ssl_conf_tls13_is_psk_enabled(ssl) &&
mbedtls_ssl_tls13_psk_enabled(ssl) && mbedtls_ssl_tls13_is_psk_supported(ssl) &&
ssl_tls13_client_hello_has_exts_for_psk_key_exchange(ssl); ssl_tls13_client_hello_has_exts_for_psk_key_exchange(ssl);
#else #else
((void) ssl); ((void) ssl);
@ -1055,7 +1055,7 @@ static int ssl_tls13_key_exchange_psk_ephemeral_available(mbedtls_ssl_context *s
return ssl_tls13_ticket_is_kex_mode_permitted( return ssl_tls13_ticket_is_kex_mode_permitted(
ssl, MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_EPHEMERAL) && ssl, MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_EPHEMERAL) &&
mbedtls_ssl_conf_tls13_is_psk_ephemeral_enabled(ssl) && mbedtls_ssl_conf_tls13_is_psk_ephemeral_enabled(ssl) &&
mbedtls_ssl_tls13_psk_ephemeral_enabled(ssl) && mbedtls_ssl_tls13_is_psk_ephemeral_supported(ssl) &&
ssl_tls13_client_hello_has_exts_for_psk_ephemeral_key_exchange(ssl); ssl_tls13_client_hello_has_exts_for_psk_ephemeral_key_exchange(ssl);
#else #else
((void) ssl); ((void) ssl);
@ -3072,7 +3072,7 @@ static int ssl_tls13_handshake_wrapup(mbedtls_ssl_context *ssl)
* expected to be resolved with issue#6395. * expected to be resolved with issue#6395.
*/ */
/* Sent NewSessionTicket message only when client supports PSK */ /* Sent NewSessionTicket message only when client supports PSK */
if (mbedtls_ssl_tls13_some_psk_enabled(ssl)) { if (mbedtls_ssl_tls13_is_some_psk_supported(ssl)) {
mbedtls_ssl_handshake_set_state( mbedtls_ssl_handshake_set_state(
ssl, MBEDTLS_SSL_TLS1_3_NEW_SESSION_TICKET); ssl, MBEDTLS_SSL_TLS1_3_NEW_SESSION_TICKET);
} else } else