From d4db3c25f550615b5bf623ff1d362f9f61c07f43 Mon Sep 17 00:00:00 2001 From: WillChilds-Klein Date: Fri, 29 Sep 2023 20:14:51 +0000 Subject: [PATCH] Fix comment linter --- tests/unit/s2n_tls13_hybrid_shared_secret_test.c | 6 +++--- tls/extensions/s2n_server_key_share.c | 8 ++++---- tls/s2n_tls_parameters.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/unit/s2n_tls13_hybrid_shared_secret_test.c b/tests/unit/s2n_tls13_hybrid_shared_secret_test.c index dda8a32d463..ea784e165e1 100644 --- a/tests/unit/s2n_tls13_hybrid_shared_secret_test.c +++ b/tests/unit/s2n_tls13_hybrid_shared_secret_test.c @@ -414,9 +414,9 @@ int main(int argc, char **argv) EXPECT_NOT_NULL(client_conn = s2n_connection_new(S2N_CLIENT)); EXPECT_NOT_NULL(server_conn = s2n_connection_new(S2N_SERVER)); - // Expect success here regardless of whether a given |kem_group| is - // available because we will fall back on ECDH if no KEMs are - // available. + /* Expect success here regardless of whether a given |kem_group| is + * available because we will fall back on ECDH if no KEMs are + * available. */ EXPECT_SUCCESS(set_up_conns(client_conn, server_conn, test_vector->client_ecc_key, test_vector->server_ecc_key, kem_group, test_vector->pq_secret)); diff --git a/tls/extensions/s2n_server_key_share.c b/tls/extensions/s2n_server_key_share.c index c5571a6e432..4c32330110c 100644 --- a/tls/extensions/s2n_server_key_share.c +++ b/tls/extensions/s2n_server_key_share.c @@ -334,10 +334,10 @@ static int s2n_server_key_share_recv(struct s2n_connection *conn, struct s2n_stu } else if (s2n_kem_preferences_includes_tls13_kem_group(kem_pref, negotiated_named_group_iana)) { POSIX_GUARD(s2n_server_key_share_recv_pq_hybrid(conn, negotiated_named_group_iana, extension)); } else if (!s2n_pq_is_enabled() && negotiated_named_group_iana >= TLS_PQ_KEM_GROUP_ID_START) { - // |s2n_kem_preferences_includes_tls13_kem_group| will return false if - // PQ is disabled and thus no KEM groups are supported, so check - // whether the IANA name we've recieved indicates PQ KEM and return an - // appropriate error. + /* |s2n_kem_preferences_includes_tls13_kem_group| will return false if + * PQ is disabled and thus no KEM groups are supported, so check + * whether the IANA name we've recieved indicates PQ KEM and return an + * appropriate error. */ POSIX_BAIL(S2N_ERR_PQ_DISABLED); } else { POSIX_BAIL(S2N_ERR_ECDHE_UNSUPPORTED_CURVE); diff --git a/tls/s2n_tls_parameters.h b/tls/s2n_tls_parameters.h index 52a9eb6115b..3e812beed47 100644 --- a/tls/s2n_tls_parameters.h +++ b/tls/s2n_tls_parameters.h @@ -69,7 +69,7 @@ * https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml */ #define TLS_PQ_KEM_GROUP_ID_X25519_KYBER_512_R3 0x2F39 -#define TLS_PQ_KEM_GROUP_ID_START TLS_PQ_KEM_GROUP_ID_X25519_KYBER_512_R3 +#define TLS_PQ_KEM_GROUP_ID_START TLS_PQ_KEM_GROUP_ID_X25519_KYBER_512_R3 #define TLS_PQ_KEM_GROUP_ID_SECP256R1_KYBER_512_R3 0x2F3A #define TLS_PQ_KEM_GROUP_ID_SECP384R1_KYBER_768_R3 0x2F3C #define TLS_PQ_KEM_GROUP_ID_SECP521R1_KYBER_1024_R3 0x2F3D