From 1cd1e01897a2c8b1a10654852bfcee51d19f7fc3 Mon Sep 17 00:00:00 2001 From: Ben Taylor Date: Tue, 18 Mar 2025 11:50:39 +0000 Subject: [PATCH] Correct code style Signed-off-by: Ben Taylor --- library/ssl_client.c | 4 ++-- library/ssl_tls.c | 12 +++++++----- library/ssl_tls12_server.c | 2 +- library/ssl_tls13_server.c | 4 ++-- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/library/ssl_client.c b/library/ssl_client.c index f8abfde377..cb57a97669 100644 --- a/library/ssl_client.c +++ b/library/ssl_client.c @@ -726,7 +726,7 @@ static int ssl_generate_random(mbedtls_ssl_context *ssl) } ret = psa_generate_random(randbytes + gmt_unix_time_len, - MBEDTLS_CLIENT_HELLO_RANDOM_LEN - gmt_unix_time_len); + MBEDTLS_CLIENT_HELLO_RANDOM_LEN - gmt_unix_time_len); return ret; } @@ -868,7 +868,7 @@ static int ssl_prepare_client_hello(mbedtls_ssl_context *ssl) if (session_id_len > 0) { ret = psa_generate_random(session_negotiate->id, - session_id_len); + session_id_len); if (ret != 0) { MBEDTLS_SSL_DEBUG_RET(1, "creating session id failed", ret); return ret; diff --git a/library/ssl_tls.c b/library/ssl_tls.c index 3b62df4ca9..2a759832bf 100644 --- a/library/ssl_tls.c +++ b/library/ssl_tls.c @@ -4464,11 +4464,13 @@ void mbedtls_ssl_handshake_free(mbedtls_ssl_context *ssl) #if defined(MBEDTLS_SSL_ASYNC_PRIVATE) if (ssl->conf != NULL) { - if (ssl->conf->f_async_cancel != NULL) { - if(handshake->async_in_progress != 0) { - ssl->conf->f_async_cancel(ssl); - handshake->async_in_progress = 0; - }}} + if (ssl->conf->f_async_cancel != NULL) { + if (handshake->async_in_progress != 0) { + ssl->conf->f_async_cancel(ssl); + handshake->async_in_progress = 0; + } + } + } #endif /* MBEDTLS_SSL_ASYNC_PRIVATE */ diff --git a/library/ssl_tls12_server.c b/library/ssl_tls12_server.c index 055e75ad8b..e1785504b6 100644 --- a/library/ssl_tls12_server.c +++ b/library/ssl_tls12_server.c @@ -2198,7 +2198,7 @@ static int ssl_write_server_hello(mbedtls_ssl_context *ssl) { ssl->session_negotiate->id_len = n = 32; if ((ret = psa_generate_random(ssl->session_negotiate->id, - n)) != 0) { + n)) != 0) { return ret; } } diff --git a/library/ssl_tls13_server.c b/library/ssl_tls13_server.c index 6fa90d444f..dc50bee868 100644 --- a/library/ssl_tls13_server.c +++ b/library/ssl_tls13_server.c @@ -1997,7 +1997,7 @@ static int ssl_tls13_prepare_server_hello(mbedtls_ssl_context *ssl) ssl->handshake->randbytes + MBEDTLS_CLIENT_HELLO_RANDOM_LEN; if ((ret = psa_generate_random(server_randbytes, - MBEDTLS_SERVER_HELLO_RANDOM_LEN)) != 0) { + MBEDTLS_SERVER_HELLO_RANDOM_LEN)) != 0) { MBEDTLS_SSL_DEBUG_RET(1, "psa_generate_random", ret); return ret; } @@ -3173,7 +3173,7 @@ static int ssl_tls13_prepare_new_session_ticket(mbedtls_ssl_context *ssl, /* Generate ticket_age_add */ if ((ret = psa_generate_random((unsigned char *) &session->ticket_age_add, - sizeof(session->ticket_age_add)) != 0)) { + sizeof(session->ticket_age_add)) != 0)) { MBEDTLS_SSL_DEBUG_RET(1, "generate_ticket_age_add", ret); return ret; }