Skip to content

Commit

Permalink
Clang format
Browse files Browse the repository at this point in the history
  • Loading branch information
maddeleine committed Mar 27, 2024
1 parent 2c8eef5 commit 238fce7
Showing 1 changed file with 13 additions and 11 deletions.
24 changes: 13 additions & 11 deletions tests/unit/s2n_traffic_context_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -117,17 +117,17 @@ int main(int argc, char **argv)

/* Format version must be set before calling this function */
EXPECT_FAILURE_WITH_ERRNO(s2n_connection_get_traffic_context(conn, buffer, length),
S2N_ERR_INVALID_STATE);
S2N_ERR_INVALID_STATE);

/* Negotiation must be complete before calling this function */
EXPECT_SUCCESS(s2n_config_set_traffic_context_version(config, S2N_TRAFFIC_CONTEXT_V1));
EXPECT_FAILURE_WITH_ERRNO(s2n_connection_get_traffic_context(conn, buffer, length),
S2N_ERR_HANDSHAKE_NOT_COMPLETE);
S2N_ERR_HANDSHAKE_NOT_COMPLETE);

/* Buffer must be large enough to hold entire traffic context */
EXPECT_OK(s2n_skip_handshake(conn));
EXPECT_FAILURE_WITH_ERRNO(s2n_connection_get_traffic_context(conn, buffer, length),
S2N_ERR_INSUFFICIENT_MEM_SIZE);
S2N_ERR_INSUFFICIENT_MEM_SIZE);
};

/* Serializes TLS 1.2 */
Expand Down Expand Up @@ -252,17 +252,17 @@ int main(int argc, char **argv)
uint8_t client_secret[SHA256_DIGEST_LENGTH] = { 0 };
EXPECT_SUCCESS(s2n_stuffer_read_bytes(&stuffer, client_secret, SHA256_DIGEST_LENGTH));
EXPECT_BYTEARRAY_EQUAL(client_secret, server_conn->secrets.version.tls13.client_app_secret,
SHA256_DIGEST_LENGTH);
SHA256_DIGEST_LENGTH);

uint8_t server_secret[SHA256_DIGEST_LENGTH] = { 0 };
EXPECT_SUCCESS(s2n_stuffer_read_bytes(&stuffer, server_secret, SHA256_DIGEST_LENGTH));
EXPECT_BYTEARRAY_EQUAL(server_secret, server_conn->secrets.version.tls13.server_app_secret,
SHA256_DIGEST_LENGTH);
SHA256_DIGEST_LENGTH);

uint8_t resumption_secret[SHA256_DIGEST_LENGTH] = { 0 };
EXPECT_SUCCESS(s2n_stuffer_read_bytes(&stuffer, resumption_secret, SHA256_DIGEST_LENGTH));
EXPECT_BYTEARRAY_EQUAL(resumption_secret, server_conn->secrets.version.tls13.resumption_master_secret,
SHA256_DIGEST_LENGTH);
SHA256_DIGEST_LENGTH);

EXPECT_EQUAL(s2n_stuffer_data_available(&stuffer), 0);
};
Expand Down Expand Up @@ -294,8 +294,9 @@ int main(int argc, char **argv)
EXPECT_SUCCESS(s2n_recv(server_conn, &recv_buf, 1, &blocked));

uint8_t buffer[S2N_TRAFFIC_CONTEXT_TLS12_SIZE] = { 0 };
EXPECT_FAILURE_WITH_ERRNO(s2n_connection_get_traffic_context(server_conn, buffer,
sizeof(buffer)), S2N_ERR_INVALID_STATE);
EXPECT_FAILURE_WITH_ERRNO(s2n_connection_get_traffic_context(server_conn, buffer,
sizeof(buffer)),
S2N_ERR_INVALID_STATE);

/* Finish reading to successfully get the traffic context */
EXPECT_SUCCESS(s2n_recv(server_conn, &recv_buf, sizeof(recv_buf), &blocked));
Expand Down Expand Up @@ -332,7 +333,8 @@ int main(int argc, char **argv)
s2n_connection_ptr_free);
EXPECT_NOT_NULL(client_conn);
EXPECT_FAILURE_WITH_ERRNO(s2n_connection_set_traffic_context(client_conn, test_context,
sizeof(test_context)), S2N_ERR_INVALID_STATE);
sizeof(test_context)),
S2N_ERR_INVALID_STATE);
};

/* Succeeds if format version is known */
Expand All @@ -352,8 +354,8 @@ int main(int argc, char **argv)
DEFER_CLEANUP(struct s2n_connection *client_conn = s2n_connection_new(S2N_CLIENT),
s2n_connection_ptr_free);
EXPECT_NOT_NULL(client_conn);
EXPECT_SUCCESS(s2n_connection_set_traffic_context(client_conn, test_context,
sizeof(test_context)));
EXPECT_SUCCESS(s2n_connection_set_traffic_context(client_conn, test_context,
sizeof(test_context)));
};
};

Expand Down

0 comments on commit 238fce7

Please sign in to comment.