Commit 8ef10089a3 for openssl.org
commit 8ef10089a36a18a10549192462ae0e9a1faa3188
Author: Isaac Lewis <isaacsamual994@gmail.com>
Date: Thu Aug 27 16:24:48 2026 +1000
Apply OpenSSL clang-format style
Reviewed-by: Frederik Wedel-Heinen <fwh.openssl@gmail.com>
Reviewed-by: Daniel Kubec <kubec@openssl.foundation>
Merge-date: Wed Oct 28 06:06:15 2026
Merged-from: https://github.com/openssl/openssl/pull/32518
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 8056df4670..4eb3e584e8 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -578,19 +578,19 @@ static void ssl_connection_clear_tls13_secrets(SSL_CONNECTION *sc)
OPENSSL_cleanse(sc->handshake_secret, sizeof(sc->handshake_secret));
OPENSSL_cleanse(sc->master_secret, sizeof(sc->master_secret));
OPENSSL_cleanse(sc->resumption_master_secret,
- sizeof(sc->resumption_master_secret));
+ sizeof(sc->resumption_master_secret));
OPENSSL_cleanse(sc->client_finished_secret,
- sizeof(sc->client_finished_secret));
+ sizeof(sc->client_finished_secret));
OPENSSL_cleanse(sc->server_finished_secret,
- sizeof(sc->server_finished_secret));
+ sizeof(sc->server_finished_secret));
OPENSSL_cleanse(sc->client_app_traffic_secret,
- sizeof(sc->client_app_traffic_secret));
+ sizeof(sc->client_app_traffic_secret));
OPENSSL_cleanse(sc->server_app_traffic_secret,
- sizeof(sc->server_app_traffic_secret));
+ sizeof(sc->server_app_traffic_secret));
OPENSSL_cleanse(sc->exporter_master_secret,
- sizeof(sc->exporter_master_secret));
+ sizeof(sc->exporter_master_secret));
OPENSSL_cleanse(sc->early_exporter_master_secret,
- sizeof(sc->early_exporter_master_secret));
+ sizeof(sc->early_exporter_master_secret));
}
int ossl_ssl_connection_reset(SSL *s)
diff --git a/test/tls13secretstest.c b/test/tls13secretstest.c
index 78b793abc0..5130bb8e21 100644
--- a/test/tls13secretstest.c
+++ b/test/tls13secretstest.c
@@ -601,8 +601,8 @@ static int free_secret_marker;
static int free_secrets_were_cleared;
static void check_connection_secrets_on_free(void *parent, void *ptr,
- CRYPTO_EX_DATA *ad, int idx,
- long argl, void *argp)
+ CRYPTO_EX_DATA *ad, int idx,
+ long argl, void *argp)
{
SSL_CONNECTION *sc;
@@ -626,7 +626,8 @@ static int test_connection_secret_free(void)
|| !TEST_ptr(ssl = SSL_new(ctx))
|| !TEST_ptr(sc = SSL_CONNECTION_FROM_SSL_ONLY(ssl))
|| !TEST_int_ge(idx = SSL_get_ex_new_index(0, NULL, NULL, NULL,
- check_connection_secrets_on_free), 0)
+ check_connection_secrets_on_free),
+ 0)
|| !TEST_true(SSL_set_ex_data(ssl, idx, &free_secret_marker)))
goto err;