From baa14a975ef92ee6fb301f0e684f56f18f2c55a7 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Fri, 3 Nov 2017 09:09:36 -0700 Subject: Update clang-format to 5.0 --- test/core/tsi/fake_transport_security_test.c | 34 ++--- test/core/tsi/ssl_transport_security_test.c | 204 +++++++++++++-------------- test/core/tsi/transport_security_test.c | 58 ++++---- test/core/tsi/transport_security_test_lib.c | 150 ++++++++++---------- test/core/tsi/transport_security_test_lib.h | 40 +++--- 5 files changed, 242 insertions(+), 244 deletions(-) (limited to 'test/core/tsi') diff --git a/test/core/tsi/fake_transport_security_test.c b/test/core/tsi/fake_transport_security_test.c index 11be8802b7..39b36cd848 100644 --- a/test/core/tsi/fake_transport_security_test.c +++ b/test/core/tsi/fake_transport_security_test.c @@ -33,18 +33,18 @@ typedef struct fake_tsi_test_fixture { tsi_test_fixture base; } fake_tsi_test_fixture; -static void fake_test_setup_handshakers(tsi_test_fixture *fixture) { +static void fake_test_setup_handshakers(tsi_test_fixture* fixture) { fixture->client_handshaker = tsi_create_fake_handshaker(true /* is_client. */); fixture->server_handshaker = tsi_create_fake_handshaker(false /* is_client. */); } -static void validate_handshaker_peers(tsi_handshaker_result *result) { +static void validate_handshaker_peers(tsi_handshaker_result* result) { GPR_ASSERT(result != NULL); tsi_peer peer; GPR_ASSERT(tsi_handshaker_result_extract_peer(result, &peer) == TSI_OK); - const tsi_peer_property *property = + const tsi_peer_property* property = tsi_peer_get_property_by_name(&peer, TSI_CERTIFICATE_TYPE_PEER_PROPERTY); GPR_ASSERT(property != NULL); GPR_ASSERT(memcmp(property->value.data, TSI_FAKE_CERTIFICATE_TYPE, @@ -52,46 +52,46 @@ static void validate_handshaker_peers(tsi_handshaker_result *result) { tsi_peer_destruct(&peer); } -static void fake_test_check_handshaker_peers(tsi_test_fixture *fixture) { +static void fake_test_check_handshaker_peers(tsi_test_fixture* fixture) { validate_handshaker_peers(fixture->client_result); validate_handshaker_peers(fixture->server_result); } -static void fake_test_destruct(tsi_test_fixture *fixture) {} +static void fake_test_destruct(tsi_test_fixture* fixture) {} static const struct tsi_test_fixture_vtable vtable = { fake_test_setup_handshakers, fake_test_check_handshaker_peers, fake_test_destruct}; -static tsi_test_fixture *fake_tsi_test_fixture_create() { - fake_tsi_test_fixture *fake_fixture = gpr_zalloc(sizeof(*fake_fixture)); +static tsi_test_fixture* fake_tsi_test_fixture_create() { + fake_tsi_test_fixture* fake_fixture = gpr_zalloc(sizeof(*fake_fixture)); tsi_test_fixture_init(&fake_fixture->base); fake_fixture->base.vtable = &vtable; return &fake_fixture->base; } void fake_tsi_test_do_handshake_tiny_handshake_buffer() { - tsi_test_fixture *fixture = fake_tsi_test_fixture_create(); + tsi_test_fixture* fixture = fake_tsi_test_fixture_create(); fixture->handshake_buffer_size = TSI_TEST_TINY_HANDSHAKE_BUFFER_SIZE; tsi_test_do_handshake(fixture); tsi_test_fixture_destroy(fixture); } void fake_tsi_test_do_handshake_small_handshake_buffer() { - tsi_test_fixture *fixture = fake_tsi_test_fixture_create(); + tsi_test_fixture* fixture = fake_tsi_test_fixture_create(); fixture->handshake_buffer_size = TSI_TEST_SMALL_HANDSHAKE_BUFFER_SIZE; tsi_test_do_handshake(fixture); tsi_test_fixture_destroy(fixture); } void fake_tsi_test_do_handshake() { - tsi_test_fixture *fixture = fake_tsi_test_fixture_create(); + tsi_test_fixture* fixture = fake_tsi_test_fixture_create(); tsi_test_do_handshake(fixture); tsi_test_fixture_destroy(fixture); } void fake_tsi_test_do_round_trip_for_all_configs() { - unsigned int *bit_array = + unsigned int* bit_array = gpr_zalloc(sizeof(unsigned int) * TSI_TEST_NUM_OF_ARGUMENTS); const unsigned int mask = 1U << (TSI_TEST_NUM_OF_ARGUMENTS - 1); for (unsigned int val = 0; val < TSI_TEST_NUM_OF_COMBINATIONS; val++) { @@ -100,8 +100,8 @@ void fake_tsi_test_do_round_trip_for_all_configs() { bit_array[ind] = (v & mask) ? 1 : 0; v <<= 1; } - tsi_test_fixture *fixture = fake_tsi_test_fixture_create(); - fake_tsi_test_fixture *fake_fixture = (fake_tsi_test_fixture *)fixture; + tsi_test_fixture* fixture = fake_tsi_test_fixture_create(); + fake_tsi_test_fixture* fake_fixture = (fake_tsi_test_fixture*)fixture; tsi_test_frame_protector_config_destroy(fake_fixture->base.config); fake_fixture->base.config = tsi_test_frame_protector_config_create( bit_array[0], bit_array[1], bit_array[2], bit_array[3], bit_array[4], @@ -120,9 +120,9 @@ void fake_tsi_test_do_round_trip_odd_buffer_size() { for (size_t ind3 = 0; ind3 < size; ind3++) { for (size_t ind4 = 0; ind4 < size; ind4++) { for (size_t ind5 = 0; ind5 < size; ind5++) { - tsi_test_fixture *fixture = fake_tsi_test_fixture_create(); - fake_tsi_test_fixture *fake_fixture = - (fake_tsi_test_fixture *)fixture; + tsi_test_fixture* fixture = fake_tsi_test_fixture_create(); + fake_tsi_test_fixture* fake_fixture = + (fake_tsi_test_fixture*)fixture; tsi_test_frame_protector_config_set_buffer_size( fake_fixture->base.config, odd_sizes[ind1], odd_sizes[ind2], odd_sizes[ind3], odd_sizes[ind4], odd_sizes[ind5]); @@ -135,7 +135,7 @@ void fake_tsi_test_do_round_trip_odd_buffer_size() { } } -int main(int argc, char **argv) { +int main(int argc, char** argv) { grpc_test_init(argc, argv); grpc_init(); fake_tsi_test_do_handshake_tiny_handshake_buffer(); diff --git a/test/core/tsi/ssl_transport_security_test.c b/test/core/tsi/ssl_transport_security_test.c index 2399b054b1..ad133bcd6c 100644 --- a/test/core/tsi/ssl_transport_security_test.c +++ b/test/core/tsi/ssl_transport_security_test.c @@ -52,8 +52,8 @@ typedef enum AlpnMode { typedef struct ssl_alpn_lib { AlpnMode alpn_mode; - char **server_alpn_protocols; - char **client_alpn_protocols; + char** server_alpn_protocols; + char** client_alpn_protocols; uint16_t num_server_alpn_protocols; uint16_t num_client_alpn_protocols; } ssl_alpn_lib; @@ -61,9 +61,9 @@ typedef struct ssl_alpn_lib { typedef struct ssl_key_cert_lib { bool use_bad_server_cert; bool use_bad_client_cert; - char *root_cert; - tsi_ssl_pem_key_cert_pair *server_pem_key_cert_pairs; - tsi_ssl_pem_key_cert_pair *bad_server_pem_key_cert_pairs; + char* root_cert; + tsi_ssl_pem_key_cert_pair* server_pem_key_cert_pairs; + tsi_ssl_pem_key_cert_pair* bad_server_pem_key_cert_pairs; tsi_ssl_pem_key_cert_pair client_pem_key_cert_pair; tsi_ssl_pem_key_cert_pair bad_client_pem_key_cert_pair; uint16_t server_num_key_cert_pairs; @@ -72,29 +72,29 @@ typedef struct ssl_key_cert_lib { typedef struct ssl_tsi_test_fixture { tsi_test_fixture base; - ssl_key_cert_lib *key_cert_lib; - ssl_alpn_lib *alpn_lib; + ssl_key_cert_lib* key_cert_lib; + ssl_alpn_lib* alpn_lib; bool force_client_auth; - char *server_name_indication; - tsi_ssl_server_handshaker_factory *server_handshaker_factory; - tsi_ssl_client_handshaker_factory *client_handshaker_factory; + char* server_name_indication; + tsi_ssl_server_handshaker_factory* server_handshaker_factory; + tsi_ssl_client_handshaker_factory* client_handshaker_factory; } ssl_tsi_test_fixture; -static void ssl_test_setup_handshakers(tsi_test_fixture *fixture) { - ssl_tsi_test_fixture *ssl_fixture = (ssl_tsi_test_fixture *)fixture; +static void ssl_test_setup_handshakers(tsi_test_fixture* fixture) { + ssl_tsi_test_fixture* ssl_fixture = (ssl_tsi_test_fixture*)fixture; GPR_ASSERT(ssl_fixture != NULL); GPR_ASSERT(ssl_fixture->key_cert_lib != NULL); GPR_ASSERT(ssl_fixture->alpn_lib != NULL); - ssl_key_cert_lib *key_cert_lib = ssl_fixture->key_cert_lib; - ssl_alpn_lib *alpn_lib = ssl_fixture->alpn_lib; + ssl_key_cert_lib* key_cert_lib = ssl_fixture->key_cert_lib; + ssl_alpn_lib* alpn_lib = ssl_fixture->alpn_lib; /* Create client handshaker factory. */ - tsi_ssl_pem_key_cert_pair *client_key_cert_pair = NULL; + tsi_ssl_pem_key_cert_pair* client_key_cert_pair = NULL; if (ssl_fixture->force_client_auth) { client_key_cert_pair = key_cert_lib->use_bad_client_cert ? &key_cert_lib->bad_client_pem_key_cert_pair : &key_cert_lib->client_pem_key_cert_pair; } - char **client_alpn_protocols = NULL; + char** client_alpn_protocols = NULL; uint16_t num_client_alpn_protocols = 0; if (alpn_lib->alpn_mode == ALPN_CLIENT_NO_SERVER || alpn_lib->alpn_mode == ALPN_CLIENT_SERVER_OK || @@ -104,11 +104,10 @@ static void ssl_test_setup_handshakers(tsi_test_fixture *fixture) { } GPR_ASSERT(tsi_create_ssl_client_handshaker_factory( client_key_cert_pair, key_cert_lib->root_cert, NULL, - (const char **)client_alpn_protocols, - num_client_alpn_protocols, + (const char**)client_alpn_protocols, num_client_alpn_protocols, &ssl_fixture->client_handshaker_factory) == TSI_OK); /* Create server handshaker factory. */ - char **server_alpn_protocols = NULL; + char** server_alpn_protocols = NULL; uint16_t num_server_alpn_protocols = 0; if (alpn_lib->alpn_mode == ALPN_SERVER_NO_CLIENT || alpn_lib->alpn_mode == ALPN_CLIENT_SERVER_OK || @@ -127,18 +126,17 @@ static void ssl_test_setup_handshakers(tsi_test_fixture *fixture) { ? key_cert_lib->bad_server_num_key_cert_pairs : key_cert_lib->server_num_key_cert_pairs, key_cert_lib->root_cert, ssl_fixture->force_client_auth, NULL, - (const char **)server_alpn_protocols, - num_server_alpn_protocols, + (const char**)server_alpn_protocols, num_server_alpn_protocols, &ssl_fixture->server_handshaker_factory) == TSI_OK); /* Create server and client handshakers. */ - tsi_handshaker *client_handshaker = NULL; + tsi_handshaker* client_handshaker = NULL; GPR_ASSERT(tsi_ssl_client_handshaker_factory_create_handshaker( ssl_fixture->client_handshaker_factory, ssl_fixture->server_name_indication, &client_handshaker) == TSI_OK); ssl_fixture->base.client_handshaker = tsi_create_adapter_handshaker(client_handshaker); - tsi_handshaker *server_handshaker = NULL; + tsi_handshaker* server_handshaker = NULL; GPR_ASSERT(tsi_ssl_server_handshaker_factory_create_handshaker( ssl_fixture->server_handshaker_factory, &server_handshaker) == TSI_OK); @@ -146,40 +144,40 @@ static void ssl_test_setup_handshakers(tsi_test_fixture *fixture) { tsi_create_adapter_handshaker(server_handshaker); } -static void check_alpn(ssl_tsi_test_fixture *ssl_fixture, - const tsi_peer *peer) { +static void check_alpn(ssl_tsi_test_fixture* ssl_fixture, + const tsi_peer* peer) { GPR_ASSERT(ssl_fixture != NULL); GPR_ASSERT(ssl_fixture->alpn_lib != NULL); - ssl_alpn_lib *alpn_lib = ssl_fixture->alpn_lib; - const tsi_peer_property *alpn_property = + ssl_alpn_lib* alpn_lib = ssl_fixture->alpn_lib; + const tsi_peer_property* alpn_property = tsi_peer_get_property_by_name(peer, TSI_SSL_ALPN_SELECTED_PROTOCOL); if (alpn_lib->alpn_mode != ALPN_CLIENT_SERVER_OK) { GPR_ASSERT(alpn_property == NULL); } else { GPR_ASSERT(alpn_property != NULL); - const char *expected_match = "baz"; + const char* expected_match = "baz"; GPR_ASSERT(memcmp(alpn_property->value.data, expected_match, alpn_property->value.length) == 0); } } -static const tsi_peer_property * -check_basic_authenticated_peer_and_get_common_name(const tsi_peer *peer) { - const tsi_peer_property *cert_type_property = +static const tsi_peer_property* +check_basic_authenticated_peer_and_get_common_name(const tsi_peer* peer) { + const tsi_peer_property* cert_type_property = tsi_peer_get_property_by_name(peer, TSI_CERTIFICATE_TYPE_PEER_PROPERTY); GPR_ASSERT(cert_type_property != NULL); GPR_ASSERT(memcmp(cert_type_property->value.data, TSI_X509_CERTIFICATE_TYPE, cert_type_property->value.length) == 0); - const tsi_peer_property *property = tsi_peer_get_property_by_name( + const tsi_peer_property* property = tsi_peer_get_property_by_name( peer, TSI_X509_SUBJECT_COMMON_NAME_PEER_PROPERTY); GPR_ASSERT(property != NULL); return property; } -void check_server0_peer(tsi_peer *peer) { - const tsi_peer_property *property = +void check_server0_peer(tsi_peer* peer) { + const tsi_peer_property* property = check_basic_authenticated_peer_and_get_common_name(peer); - const char *expected_match = "*.test.google.com.au"; + const char* expected_match = "*.test.google.com.au"; GPR_ASSERT(memcmp(property->value.data, expected_match, property->value.length) == 0); GPR_ASSERT(tsi_peer_get_property_by_name( @@ -194,9 +192,9 @@ void check_server0_peer(tsi_peer *peer) { tsi_peer_destruct(peer); } -static bool check_subject_alt_name(tsi_peer *peer, const char *name) { +static bool check_subject_alt_name(tsi_peer* peer, const char* name) { for (size_t i = 0; i < peer->property_count; i++) { - const tsi_peer_property *prop = &peer->properties[i]; + const tsi_peer_property* prop = &peer->properties[i]; if (strcmp(prop->name, TSI_X509_SUBJECT_ALTERNATIVE_NAME_PEER_PROPERTY) == 0) { if (memcmp(prop->value.data, name, prop->value.length) == 0) { @@ -207,10 +205,10 @@ static bool check_subject_alt_name(tsi_peer *peer, const char *name) { return false; } -void check_server1_peer(tsi_peer *peer) { - const tsi_peer_property *property = +void check_server1_peer(tsi_peer* peer) { + const tsi_peer_property* property = check_basic_authenticated_peer_and_get_common_name(peer); - const char *expected_match = "*.test.google.com"; + const char* expected_match = "*.test.google.com"; GPR_ASSERT(memcmp(property->value.data, expected_match, property->value.length) == 0); GPR_ASSERT(check_subject_alt_name(peer, "*.test.google.fr") == 1); @@ -226,29 +224,29 @@ void check_server1_peer(tsi_peer *peer) { tsi_peer_destruct(peer); } -static void check_client_peer(ssl_tsi_test_fixture *ssl_fixture, - tsi_peer *peer) { +static void check_client_peer(ssl_tsi_test_fixture* ssl_fixture, + tsi_peer* peer) { GPR_ASSERT(ssl_fixture != NULL); GPR_ASSERT(ssl_fixture->alpn_lib != NULL); - ssl_alpn_lib *alpn_lib = ssl_fixture->alpn_lib; + ssl_alpn_lib* alpn_lib = ssl_fixture->alpn_lib; if (!ssl_fixture->force_client_auth) { GPR_ASSERT(peer->property_count == (alpn_lib->alpn_mode == ALPN_CLIENT_SERVER_OK ? 1 : 0)); } else { - const tsi_peer_property *property = + const tsi_peer_property* property = check_basic_authenticated_peer_and_get_common_name(peer); - const char *expected_match = "testclient"; + const char* expected_match = "testclient"; GPR_ASSERT(memcmp(property->value.data, expected_match, property->value.length) == 0); } tsi_peer_destruct(peer); } -static void ssl_test_check_handshaker_peers(tsi_test_fixture *fixture) { - ssl_tsi_test_fixture *ssl_fixture = (ssl_tsi_test_fixture *)fixture; +static void ssl_test_check_handshaker_peers(tsi_test_fixture* fixture) { + ssl_tsi_test_fixture* ssl_fixture = (ssl_tsi_test_fixture*)fixture; GPR_ASSERT(ssl_fixture != NULL); GPR_ASSERT(ssl_fixture->key_cert_lib != NULL); - ssl_key_cert_lib *key_cert_lib = ssl_fixture->key_cert_lib; + ssl_key_cert_lib* key_cert_lib = ssl_fixture->key_cert_lib; tsi_peer peer; bool expect_success = !(key_cert_lib->use_bad_server_cert || @@ -277,17 +275,17 @@ static void ssl_test_check_handshaker_peers(tsi_test_fixture *fixture) { } static void ssl_test_pem_key_cert_pair_destroy(tsi_ssl_pem_key_cert_pair kp) { - gpr_free((void *)kp.private_key); - gpr_free((void *)kp.cert_chain); + gpr_free((void*)kp.private_key); + gpr_free((void*)kp.cert_chain); } -static void ssl_test_destruct(tsi_test_fixture *fixture) { - ssl_tsi_test_fixture *ssl_fixture = (ssl_tsi_test_fixture *)fixture; +static void ssl_test_destruct(tsi_test_fixture* fixture) { + ssl_tsi_test_fixture* ssl_fixture = (ssl_tsi_test_fixture*)fixture; if (ssl_fixture == NULL) { return; } /* Destroy ssl_alpn_lib. */ - ssl_alpn_lib *alpn_lib = ssl_fixture->alpn_lib; + ssl_alpn_lib* alpn_lib = ssl_fixture->alpn_lib; for (size_t i = 0; i < alpn_lib->num_server_alpn_protocols; i++) { gpr_free(alpn_lib->server_alpn_protocols[i]); } @@ -298,7 +296,7 @@ static void ssl_test_destruct(tsi_test_fixture *fixture) { gpr_free(alpn_lib->client_alpn_protocols); gpr_free(alpn_lib); /* Destroy ssl_key_cert_lib. */ - ssl_key_cert_lib *key_cert_lib = ssl_fixture->key_cert_lib; + ssl_key_cert_lib* key_cert_lib = ssl_fixture->key_cert_lib; for (size_t i = 0; i < key_cert_lib->server_num_key_cert_pairs; i++) { ssl_test_pem_key_cert_pair_destroy( key_cert_lib->server_pem_key_cert_pairs[i]); @@ -325,26 +323,26 @@ static const struct tsi_test_fixture_vtable vtable = { ssl_test_setup_handshakers, ssl_test_check_handshaker_peers, ssl_test_destruct}; -static char *load_file(const char *dir_path, const char *file_name) { - char *file_path = +static char* load_file(const char* dir_path, const char* file_name) { + char* file_path = gpr_zalloc(sizeof(char) * (strlen(dir_path) + strlen(file_name) + 1)); memcpy(file_path, dir_path, strlen(dir_path)); memcpy(file_path + strlen(dir_path), file_name, strlen(file_name)); grpc_slice slice; GPR_ASSERT(grpc_load_file(file_path, 1, &slice) == GRPC_ERROR_NONE); - char *data = grpc_slice_to_c_string(slice); + char* data = grpc_slice_to_c_string(slice); grpc_slice_unref(slice); gpr_free(file_path); return data; } -static tsi_test_fixture *ssl_tsi_test_fixture_create() { - ssl_tsi_test_fixture *ssl_fixture = gpr_zalloc(sizeof(*ssl_fixture)); +static tsi_test_fixture* ssl_tsi_test_fixture_create() { + ssl_tsi_test_fixture* ssl_fixture = gpr_zalloc(sizeof(*ssl_fixture)); tsi_test_fixture_init(&ssl_fixture->base); ssl_fixture->base.test_unused_bytes = false; ssl_fixture->base.vtable = &vtable; /* Create ssl_key_cert_lib. */ - ssl_key_cert_lib *key_cert_lib = gpr_zalloc(sizeof(*key_cert_lib)); + ssl_key_cert_lib* key_cert_lib = gpr_zalloc(sizeof(*key_cert_lib)); key_cert_lib->use_bad_server_cert = false; key_cert_lib->use_bad_client_cert = false; key_cert_lib->server_num_key_cert_pairs = @@ -380,11 +378,11 @@ static tsi_test_fixture *ssl_tsi_test_fixture_create() { key_cert_lib->root_cert = load_file(SSL_TSI_TEST_CREDENTIALS_DIR, "ca.pem"); ssl_fixture->key_cert_lib = key_cert_lib; /* Create ssl_alpn_lib. */ - ssl_alpn_lib *alpn_lib = gpr_zalloc(sizeof(*alpn_lib)); + ssl_alpn_lib* alpn_lib = gpr_zalloc(sizeof(*alpn_lib)); alpn_lib->server_alpn_protocols = - gpr_zalloc(sizeof(char *) * SSL_TSI_TEST_ALPN_NUM); + gpr_zalloc(sizeof(char*) * SSL_TSI_TEST_ALPN_NUM); alpn_lib->client_alpn_protocols = - gpr_zalloc(sizeof(char *) * SSL_TSI_TEST_ALPN_NUM); + gpr_zalloc(sizeof(char*) * SSL_TSI_TEST_ALPN_NUM); alpn_lib->server_alpn_protocols[0] = gpr_strdup(SSL_TSI_TEST_ALPN1); alpn_lib->server_alpn_protocols[1] = gpr_strdup(SSL_TSI_TEST_ALPN3); alpn_lib->client_alpn_protocols[0] = gpr_strdup(SSL_TSI_TEST_ALPN2); @@ -400,28 +398,28 @@ static tsi_test_fixture *ssl_tsi_test_fixture_create() { } void ssl_tsi_test_do_handshake_tiny_handshake_buffer() { - tsi_test_fixture *fixture = ssl_tsi_test_fixture_create(); + tsi_test_fixture* fixture = ssl_tsi_test_fixture_create(); fixture->handshake_buffer_size = TSI_TEST_TINY_HANDSHAKE_BUFFER_SIZE; tsi_test_do_handshake(fixture); tsi_test_fixture_destroy(fixture); } void ssl_tsi_test_do_handshake_small_handshake_buffer() { - tsi_test_fixture *fixture = ssl_tsi_test_fixture_create(); + tsi_test_fixture* fixture = ssl_tsi_test_fixture_create(); fixture->handshake_buffer_size = TSI_TEST_SMALL_HANDSHAKE_BUFFER_SIZE; tsi_test_do_handshake(fixture); tsi_test_fixture_destroy(fixture); } void ssl_tsi_test_do_handshake() { - tsi_test_fixture *fixture = ssl_tsi_test_fixture_create(); + tsi_test_fixture* fixture = ssl_tsi_test_fixture_create(); tsi_test_do_handshake(fixture); tsi_test_fixture_destroy(fixture); } void ssl_tsi_test_do_handshake_with_client_authentication() { - tsi_test_fixture *fixture = ssl_tsi_test_fixture_create(); - ssl_tsi_test_fixture *ssl_fixture = (ssl_tsi_test_fixture *)fixture; + tsi_test_fixture* fixture = ssl_tsi_test_fixture_create(); + ssl_tsi_test_fixture* ssl_fixture = (ssl_tsi_test_fixture*)fixture; ssl_fixture->force_client_auth = true; tsi_test_do_handshake(fixture); tsi_test_fixture_destroy(fixture); @@ -429,8 +427,8 @@ void ssl_tsi_test_do_handshake_with_client_authentication() { void ssl_tsi_test_do_handshake_with_server_name_indication_exact_domain() { /* server1 cert contains "waterzooi.test.google.be" in SAN. */ - tsi_test_fixture *fixture = ssl_tsi_test_fixture_create(); - ssl_tsi_test_fixture *ssl_fixture = (ssl_tsi_test_fixture *)fixture; + tsi_test_fixture* fixture = ssl_tsi_test_fixture_create(); + ssl_tsi_test_fixture* ssl_fixture = (ssl_tsi_test_fixture*)fixture; ssl_fixture->server_name_indication = "waterzooi.test.google.be"; tsi_test_do_handshake(fixture); tsi_test_fixture_destroy(fixture); @@ -438,24 +436,24 @@ void ssl_tsi_test_do_handshake_with_server_name_indication_exact_domain() { void ssl_tsi_test_do_handshake_with_server_name_indication_wild_star_domain() { /* server1 cert contains "*.test.google.fr" in SAN. */ - tsi_test_fixture *fixture = ssl_tsi_test_fixture_create(); - ssl_tsi_test_fixture *ssl_fixture = (ssl_tsi_test_fixture *)fixture; + tsi_test_fixture* fixture = ssl_tsi_test_fixture_create(); + ssl_tsi_test_fixture* ssl_fixture = (ssl_tsi_test_fixture*)fixture; ssl_fixture->server_name_indication = "juju.test.google.fr"; tsi_test_do_handshake(fixture); tsi_test_fixture_destroy(fixture); } void ssl_tsi_test_do_handshake_with_bad_server_cert() { - tsi_test_fixture *fixture = ssl_tsi_test_fixture_create(); - ssl_tsi_test_fixture *ssl_fixture = (ssl_tsi_test_fixture *)fixture; + tsi_test_fixture* fixture = ssl_tsi_test_fixture_create(); + ssl_tsi_test_fixture* ssl_fixture = (ssl_tsi_test_fixture*)fixture; ssl_fixture->key_cert_lib->use_bad_server_cert = true; tsi_test_do_handshake(fixture); tsi_test_fixture_destroy(fixture); } void ssl_tsi_test_do_handshake_with_bad_client_cert() { - tsi_test_fixture *fixture = ssl_tsi_test_fixture_create(); - ssl_tsi_test_fixture *ssl_fixture = (ssl_tsi_test_fixture *)fixture; + tsi_test_fixture* fixture = ssl_tsi_test_fixture_create(); + ssl_tsi_test_fixture* ssl_fixture = (ssl_tsi_test_fixture*)fixture; ssl_fixture->key_cert_lib->use_bad_client_cert = true; ssl_fixture->force_client_auth = true; tsi_test_do_handshake(fixture); @@ -463,39 +461,39 @@ void ssl_tsi_test_do_handshake_with_bad_client_cert() { } void ssl_tsi_test_do_handshake_alpn_client_no_server() { - tsi_test_fixture *fixture = ssl_tsi_test_fixture_create(); - ssl_tsi_test_fixture *ssl_fixture = (ssl_tsi_test_fixture *)fixture; + tsi_test_fixture* fixture = ssl_tsi_test_fixture_create(); + ssl_tsi_test_fixture* ssl_fixture = (ssl_tsi_test_fixture*)fixture; ssl_fixture->alpn_lib->alpn_mode = ALPN_CLIENT_NO_SERVER; tsi_test_do_handshake(fixture); tsi_test_fixture_destroy(fixture); } void ssl_tsi_test_do_handshake_alpn_server_no_client() { - tsi_test_fixture *fixture = ssl_tsi_test_fixture_create(); - ssl_tsi_test_fixture *ssl_fixture = (ssl_tsi_test_fixture *)fixture; + tsi_test_fixture* fixture = ssl_tsi_test_fixture_create(); + ssl_tsi_test_fixture* ssl_fixture = (ssl_tsi_test_fixture*)fixture; ssl_fixture->alpn_lib->alpn_mode = ALPN_SERVER_NO_CLIENT; tsi_test_do_handshake(fixture); tsi_test_fixture_destroy(fixture); } void ssl_tsi_test_do_handshake_alpn_client_server_mismatch() { - tsi_test_fixture *fixture = ssl_tsi_test_fixture_create(); - ssl_tsi_test_fixture *ssl_fixture = (ssl_tsi_test_fixture *)fixture; + tsi_test_fixture* fixture = ssl_tsi_test_fixture_create(); + ssl_tsi_test_fixture* ssl_fixture = (ssl_tsi_test_fixture*)fixture; ssl_fixture->alpn_lib->alpn_mode = ALPN_CLIENT_SERVER_MISMATCH; tsi_test_do_handshake(fixture); tsi_test_fixture_destroy(fixture); } void ssl_tsi_test_do_handshake_alpn_client_server_ok() { - tsi_test_fixture *fixture = ssl_tsi_test_fixture_create(); - ssl_tsi_test_fixture *ssl_fixture = (ssl_tsi_test_fixture *)fixture; + tsi_test_fixture* fixture = ssl_tsi_test_fixture_create(); + ssl_tsi_test_fixture* ssl_fixture = (ssl_tsi_test_fixture*)fixture; ssl_fixture->alpn_lib->alpn_mode = ALPN_CLIENT_SERVER_OK; tsi_test_do_handshake(fixture); tsi_test_fixture_destroy(fixture); } void ssl_tsi_test_do_round_trip_for_all_configs() { - unsigned int *bit_array = + unsigned int* bit_array = gpr_zalloc(sizeof(unsigned int) * TSI_TEST_NUM_OF_ARGUMENTS); const unsigned int mask = 1U << (TSI_TEST_NUM_OF_ARGUMENTS - 1); for (unsigned int val = 0; val < TSI_TEST_NUM_OF_COMBINATIONS; val++) { @@ -504,8 +502,8 @@ void ssl_tsi_test_do_round_trip_for_all_configs() { bit_array[ind] = (v & mask) ? 1 : 0; v <<= 1; } - tsi_test_fixture *fixture = ssl_tsi_test_fixture_create(); - ssl_tsi_test_fixture *ssl_fixture = (ssl_tsi_test_fixture *)fixture; + tsi_test_fixture* fixture = ssl_tsi_test_fixture_create(); + ssl_tsi_test_fixture* ssl_fixture = (ssl_tsi_test_fixture*)fixture; tsi_test_frame_protector_config_destroy(ssl_fixture->base.config); ssl_fixture->base.config = tsi_test_frame_protector_config_create( bit_array[0], bit_array[1], bit_array[2], bit_array[3], bit_array[4], @@ -524,8 +522,8 @@ void ssl_tsi_test_do_round_trip_odd_buffer_size() { for (size_t ind3 = 0; ind3 < size; ind3++) { for (size_t ind4 = 0; ind4 < size; ind4++) { for (size_t ind5 = 0; ind5 < size; ind5++) { - tsi_test_fixture *fixture = ssl_tsi_test_fixture_create(); - ssl_tsi_test_fixture *ssl_fixture = (ssl_tsi_test_fixture *)fixture; + tsi_test_fixture* fixture = ssl_tsi_test_fixture_create(); + ssl_tsi_test_fixture* ssl_fixture = (ssl_tsi_test_fixture*)fixture; tsi_test_frame_protector_config_set_buffer_size( ssl_fixture->base.config, odd_sizes[ind1], odd_sizes[ind2], odd_sizes[ind3], odd_sizes[ind4], odd_sizes[ind5]); @@ -538,11 +536,11 @@ void ssl_tsi_test_do_round_trip_odd_buffer_size() { } } -static const tsi_ssl_handshaker_factory_vtable *original_vtable; +static const tsi_ssl_handshaker_factory_vtable* original_vtable; static bool handshaker_factory_destructor_called; static void ssl_tsi_test_handshaker_factory_destructor( - tsi_ssl_handshaker_factory *factory) { + tsi_ssl_handshaker_factory* factory) { GPR_ASSERT(factory != NULL); handshaker_factory_destructor_called = true; if (original_vtable != NULL && original_vtable->destroy != NULL) { @@ -555,20 +553,20 @@ static tsi_ssl_handshaker_factory_vtable test_handshaker_factory_vtable = { void test_tsi_ssl_client_handshaker_factory_refcounting() { int i; - const char *cert_chain = + const char* cert_chain = load_file(SSL_TSI_TEST_CREDENTIALS_DIR, "client.pem"); - tsi_ssl_client_handshaker_factory *client_handshaker_factory; + tsi_ssl_client_handshaker_factory* client_handshaker_factory; GPR_ASSERT(tsi_create_ssl_client_handshaker_factory( NULL, cert_chain, NULL, NULL, 0, &client_handshaker_factory) == TSI_OK); handshaker_factory_destructor_called = false; original_vtable = tsi_ssl_handshaker_factory_swap_vtable( - (tsi_ssl_handshaker_factory *)client_handshaker_factory, + (tsi_ssl_handshaker_factory*)client_handshaker_factory, &test_handshaker_factory_vtable); - tsi_handshaker *handshaker[3]; + tsi_handshaker* handshaker[3]; for (i = 0; i < 3; ++i) { GPR_ASSERT(tsi_ssl_client_handshaker_factory_create_handshaker( @@ -588,14 +586,14 @@ void test_tsi_ssl_client_handshaker_factory_refcounting() { tsi_handshaker_destroy(handshaker[2]); GPR_ASSERT(handshaker_factory_destructor_called); - gpr_free((void *)cert_chain); + gpr_free((void*)cert_chain); } void test_tsi_ssl_server_handshaker_factory_refcounting() { int i; - tsi_ssl_server_handshaker_factory *server_handshaker_factory; - tsi_handshaker *handshaker[3]; - const char *cert_chain = + tsi_ssl_server_handshaker_factory* server_handshaker_factory; + tsi_handshaker* handshaker[3]; + const char* cert_chain = load_file(SSL_TSI_TEST_CREDENTIALS_DIR, "server0.pem"); tsi_ssl_pem_key_cert_pair cert_pair; @@ -609,7 +607,7 @@ void test_tsi_ssl_server_handshaker_factory_refcounting() { handshaker_factory_destructor_called = false; original_vtable = tsi_ssl_handshaker_factory_swap_vtable( - (tsi_ssl_handshaker_factory *)server_handshaker_factory, + (tsi_ssl_handshaker_factory*)server_handshaker_factory, &test_handshaker_factory_vtable); for (i = 0; i < 3; ++i) { @@ -635,9 +633,9 @@ void test_tsi_ssl_server_handshaker_factory_refcounting() { /* Attempting to create a handshaker factory with invalid parameters should fail * but not crash. */ void test_tsi_ssl_client_handshaker_factory_bad_params() { - const char *cert_chain = "This is not a valid PEM file."; + const char* cert_chain = "This is not a valid PEM file."; - tsi_ssl_client_handshaker_factory *client_handshaker_factory; + tsi_ssl_client_handshaker_factory* client_handshaker_factory; GPR_ASSERT(tsi_create_ssl_client_handshaker_factory( NULL, cert_chain, NULL, NULL, 0, &client_handshaker_factory) == TSI_INVALID_ARGUMENT); @@ -650,7 +648,7 @@ void ssl_tsi_test_handshaker_factory_internals() { test_tsi_ssl_client_handshaker_factory_bad_params(); } -int main(int argc, char **argv) { +int main(int argc, char** argv) { grpc_test_init(argc, argv); grpc_init(); ssl_tsi_test_do_handshake_tiny_handshake_buffer(); diff --git a/test/core/tsi/transport_security_test.c b/test/core/tsi/transport_security_test.c index 27932a8169..f99afd8101 100644 --- a/test/core/tsi/transport_security_test.c +++ b/test/core/tsi/transport_security_test.c @@ -37,17 +37,17 @@ typedef struct { int expected; /* Host name to match. */ - const char *host_name; + const char* host_name; /* Common name (CN). */ - const char *common_name; + const char* common_name; /* Comma separated list of certificate names to match against. Any occurrence of '#' will be replaced with a null character before processing. */ - const char *dns_names; + const char* dns_names; /* Comma separated list of IP SANs to match aggainst */ - const char *ip_names; + const char* ip_names; } cert_name_test_entry; /* Largely inspired from: @@ -189,26 +189,26 @@ const cert_name_test_entry cert_name_test_entries[] = { }; typedef struct name_list { - const char *name; - struct name_list *next; + const char* name; + struct name_list* next; } name_list; typedef struct { size_t name_count; - char *buffer; - name_list *names; + char* buffer; + name_list* names; } parsed_names; -name_list *name_list_add(const char *n) { - name_list *result = gpr_malloc(sizeof(name_list)); +name_list* name_list_add(const char* n) { + name_list* result = gpr_malloc(sizeof(name_list)); result->name = n; result->next = NULL; return result; } -static parsed_names parse_names(const char *names_str) { +static parsed_names parse_names(const char* names_str) { parsed_names result; - name_list *current_nl; + name_list* current_nl; size_t i; memset(&result, 0, sizeof(parsed_names)); if (names_str == 0) return result; @@ -228,18 +228,18 @@ static parsed_names parse_names(const char *names_str) { return result; } -static void destruct_parsed_names(parsed_names *pdn) { - name_list *nl = pdn->names; +static void destruct_parsed_names(parsed_names* pdn) { + name_list* nl = pdn->names; if (pdn->buffer != NULL) gpr_free(pdn->buffer); while (nl != NULL) { - name_list *to_be_free = nl; + name_list* to_be_free = nl; nl = nl->next; gpr_free(to_be_free); } } -static char *processed_name(const char *name) { - char *result = gpr_strdup(name); +static char* processed_name(const char* name) { + char* result = gpr_strdup(name); size_t i; for (i = 0; i < strlen(result); i++) { if (result[i] == '#') { @@ -250,10 +250,10 @@ static char *processed_name(const char *name) { } static tsi_peer peer_from_cert_name_test_entry( - const cert_name_test_entry *entry) { + const cert_name_test_entry* entry) { size_t i; tsi_peer peer; - name_list *nl; + name_list* nl; parsed_names dns_entries = parse_names(entry->dns_names); parsed_names ip_entries = parse_names(entry->ip_names); nl = dns_entries.names; @@ -265,7 +265,7 @@ static tsi_peer peer_from_cert_name_test_entry( &peer.properties[0]) == TSI_OK); i = 1; while (nl != NULL) { - char *processed = processed_name(nl->name); + char* processed = processed_name(nl->name); GPR_ASSERT(tsi_construct_string_peer_property( TSI_X509_SUBJECT_ALTERNATIVE_NAME_PEER_PROPERTY, processed, strlen(nl->name), &peer.properties[i++]) == TSI_OK); @@ -275,7 +275,7 @@ static tsi_peer peer_from_cert_name_test_entry( nl = ip_entries.names; while (nl != NULL) { - char *processed = processed_name(nl->name); + char* processed = processed_name(nl->name); GPR_ASSERT(tsi_construct_string_peer_property( TSI_X509_SUBJECT_ALTERNATIVE_NAME_PEER_PROPERTY, processed, strlen(nl->name), &peer.properties[i++]) == TSI_OK); @@ -287,8 +287,8 @@ static tsi_peer peer_from_cert_name_test_entry( return peer; } -char *cert_name_test_entry_to_string(const cert_name_test_entry *entry) { - char *s; +char* cert_name_test_entry_to_string(const cert_name_test_entry* entry) { + char* s; gpr_asprintf(&s, "{ success = %s, host_name = %s, common_name = %s, dns_names = " "%s, ip_names = %s}", @@ -302,11 +302,11 @@ char *cert_name_test_entry_to_string(const cert_name_test_entry *entry) { static void test_peer_matches_name(void) { size_t i = 0; for (i = 0; i < GPR_ARRAY_SIZE(cert_name_test_entries); i++) { - const cert_name_test_entry *entry = &cert_name_test_entries[i]; + const cert_name_test_entry* entry = &cert_name_test_entries[i]; tsi_peer peer = peer_from_cert_name_test_entry(entry); int result = tsi_ssl_peer_matches_name(&peer, entry->host_name); if (result != entry->expected) { - char *entry_str = cert_name_test_entry_to_string(entry); + char* entry_str = cert_name_test_entry_to_string(entry); gpr_log(GPR_ERROR, "%s", entry_str); gpr_free(entry_str); GPR_ASSERT(0); /* Unexpected result. */ @@ -317,7 +317,7 @@ static void test_peer_matches_name(void) { typedef struct { tsi_result res; - const char *str; + const char* str; } tsi_result_string_pair; static void test_result_strings(void) { @@ -366,16 +366,16 @@ static void test_handshaker_invalid_args(void) { } static void test_handshaker_invalid_state(void) { - tsi_handshaker *h = tsi_create_fake_handshaker(0); + tsi_handshaker* h = tsi_create_fake_handshaker(0); tsi_peer peer; - tsi_frame_protector *p; + tsi_frame_protector* p; GPR_ASSERT(tsi_handshaker_extract_peer(h, &peer) == TSI_FAILED_PRECONDITION); GPR_ASSERT(tsi_handshaker_create_frame_protector(h, NULL, &p) == TSI_FAILED_PRECONDITION); tsi_handshaker_destroy(h); } -int main(int argc, char **argv) { +int main(int argc, char** argv) { grpc_test_init(argc, argv); test_peer_matches_name(); test_result_strings(); diff --git a/test/core/tsi/transport_security_test_lib.c b/test/core/tsi/transport_security_test_lib.c index 1f32eab21c..090f0cf79e 100644 --- a/test/core/tsi/transport_security_test_lib.c +++ b/test/core/tsi/transport_security_test_lib.c @@ -27,14 +27,14 @@ #include "src/core/lib/security/transport/tsi_error.h" #include "test/core/tsi/transport_security_test_lib.h" -static void notification_signal(tsi_test_fixture *fixture) { +static void notification_signal(tsi_test_fixture* fixture) { gpr_mu_lock(&fixture->mu); fixture->notified = true; gpr_cv_signal(&fixture->cv); gpr_mu_unlock(&fixture->mu); } -static void notification_wait(tsi_test_fixture *fixture) { +static void notification_wait(tsi_test_fixture* fixture) { gpr_mu_lock(&fixture->mu); while (!fixture->notified) { gpr_cv_wait(&fixture->cv, &fixture->mu, gpr_inf_future(GPR_CLOCK_REALTIME)); @@ -44,20 +44,20 @@ static void notification_wait(tsi_test_fixture *fixture) { } typedef struct handshaker_args { - tsi_test_fixture *fixture; - unsigned char *handshake_buffer; + tsi_test_fixture* fixture; + unsigned char* handshake_buffer; size_t handshake_buffer_size; bool is_client; bool transferred_data; bool appended_unused_bytes; - grpc_error *error; + grpc_error* error; } handshaker_args; -static handshaker_args *handshaker_args_create(tsi_test_fixture *fixture, +static handshaker_args* handshaker_args_create(tsi_test_fixture* fixture, bool is_client) { GPR_ASSERT(fixture != NULL); GPR_ASSERT(fixture->config != NULL); - handshaker_args *args = gpr_zalloc(sizeof(*args)); + handshaker_args* args = gpr_zalloc(sizeof(*args)); args->fixture = fixture; args->handshake_buffer_size = fixture->handshake_buffer_size; args->handshake_buffer = gpr_zalloc(args->handshake_buffer_size); @@ -66,29 +66,29 @@ static handshaker_args *handshaker_args_create(tsi_test_fixture *fixture, return args; } -static void handshaker_args_destroy(handshaker_args *args) { +static void handshaker_args_destroy(handshaker_args* args) { gpr_free(args->handshake_buffer); GRPC_ERROR_UNREF(args->error); gpr_free(args); } -static void do_handshaker_next(handshaker_args *args); +static void do_handshaker_next(handshaker_args* args); -static void setup_handshakers(tsi_test_fixture *fixture) { +static void setup_handshakers(tsi_test_fixture* fixture) { GPR_ASSERT(fixture != NULL); GPR_ASSERT(fixture->vtable != NULL); GPR_ASSERT(fixture->vtable->setup_handshakers != NULL); fixture->vtable->setup_handshakers(fixture); } -static void check_unused_bytes(tsi_test_fixture *fixture) { - tsi_handshaker_result *result_with_unused_bytes = +static void check_unused_bytes(tsi_test_fixture* fixture) { + tsi_handshaker_result* result_with_unused_bytes = fixture->has_client_finished_first ? fixture->server_result : fixture->client_result; - tsi_handshaker_result *result_without_unused_bytes = + tsi_handshaker_result* result_without_unused_bytes = fixture->has_client_finished_first ? fixture->client_result : fixture->server_result; - const unsigned char *bytes = NULL; + const unsigned char* bytes = NULL; size_t bytes_size = 0; GPR_ASSERT(tsi_handshaker_result_get_unused_bytes( result_with_unused_bytes, &bytes, &bytes_size) == TSI_OK); @@ -100,7 +100,7 @@ static void check_unused_bytes(tsi_test_fixture *fixture) { GPR_ASSERT(bytes == NULL); } -static void check_handshake_results(tsi_test_fixture *fixture) { +static void check_handshake_results(tsi_test_fixture* fixture) { GPR_ASSERT(fixture != NULL); GPR_ASSERT(fixture->vtable != NULL); GPR_ASSERT(fixture->vtable->check_handshaker_peers != NULL); @@ -118,15 +118,15 @@ static void check_handshake_results(tsi_test_fixture *fixture) { } } -static void send_bytes_to_peer(tsi_test_fixture *fixture, - const unsigned char *buf, size_t buf_size, +static void send_bytes_to_peer(tsi_test_fixture* fixture, + const unsigned char* buf, size_t buf_size, bool is_client) { GPR_ASSERT(fixture != NULL); GPR_ASSERT(buf != NULL); - uint8_t *channel = + uint8_t* channel = is_client ? fixture->server_channel : fixture->client_channel; GPR_ASSERT(channel != NULL); - size_t *bytes_written = is_client ? &fixture->bytes_written_to_server_channel + size_t* bytes_written = is_client ? &fixture->bytes_written_to_server_channel : &fixture->bytes_written_to_client_channel; GPR_ASSERT(bytes_written != NULL); GPR_ASSERT(*bytes_written + buf_size <= TSI_TEST_DEFAULT_CHANNEL_SIZE); @@ -135,13 +135,13 @@ static void send_bytes_to_peer(tsi_test_fixture *fixture, *bytes_written += buf_size; } -static void maybe_append_unused_bytes(handshaker_args *args) { +static void maybe_append_unused_bytes(handshaker_args* args) { GPR_ASSERT(args != NULL); GPR_ASSERT(args->fixture != NULL); - tsi_test_fixture *fixture = args->fixture; + tsi_test_fixture* fixture = args->fixture; if (fixture->test_unused_bytes && !args->appended_unused_bytes) { args->appended_unused_bytes = true; - send_bytes_to_peer(fixture, (const unsigned char *)TSI_TEST_UNUSED_BYTES, + send_bytes_to_peer(fixture, (const unsigned char*)TSI_TEST_UNUSED_BYTES, strlen(TSI_TEST_UNUSED_BYTES), args->is_client); if (fixture->client_result != NULL && fixture->server_result == NULL) { fixture->has_client_finished_first = true; @@ -149,18 +149,18 @@ static void maybe_append_unused_bytes(handshaker_args *args) { } } -static void receive_bytes_from_peer(tsi_test_fixture *fixture, - unsigned char **buf, size_t *buf_size, +static void receive_bytes_from_peer(tsi_test_fixture* fixture, + unsigned char** buf, size_t* buf_size, bool is_client) { GPR_ASSERT(fixture != NULL); GPR_ASSERT(*buf != NULL); GPR_ASSERT(buf_size != NULL); - uint8_t *channel = + uint8_t* channel = is_client ? fixture->client_channel : fixture->server_channel; GPR_ASSERT(channel != NULL); - size_t *bytes_read = is_client ? &fixture->bytes_read_from_client_channel + size_t* bytes_read = is_client ? &fixture->bytes_read_from_client_channel : &fixture->bytes_read_from_server_channel; - size_t *bytes_written = is_client ? &fixture->bytes_written_to_client_channel + size_t* bytes_written = is_client ? &fixture->bytes_written_to_client_channel : &fixture->bytes_written_to_server_channel; GPR_ASSERT(bytes_read != NULL); GPR_ASSERT(bytes_written != NULL); @@ -173,21 +173,21 @@ static void receive_bytes_from_peer(tsi_test_fixture *fixture, *bytes_read += to_read; } -static void send_message_to_peer(tsi_test_fixture *fixture, - tsi_frame_protector *protector, +static void send_message_to_peer(tsi_test_fixture* fixture, + tsi_frame_protector* protector, bool is_client) { /* Initialization. */ GPR_ASSERT(fixture != NULL); GPR_ASSERT(fixture->config != NULL); GPR_ASSERT(protector != NULL); - tsi_test_frame_protector_config *config = fixture->config; - unsigned char *protected_buffer = gpr_zalloc(config->protected_buffer_size); + tsi_test_frame_protector_config* config = fixture->config; + unsigned char* protected_buffer = gpr_zalloc(config->protected_buffer_size); size_t message_size = is_client ? config->client_message_size : config->server_message_size; - uint8_t *message = + uint8_t* message = is_client ? config->client_message : config->server_message; GPR_ASSERT(message != NULL); - const unsigned char *message_bytes = (const unsigned char *)message; + const unsigned char* message_bytes = (const unsigned char*)message; tsi_result result = TSI_OK; /* Do protect and send protected data to peer. */ while (message_size > 0 && result == TSI_OK) { @@ -222,24 +222,24 @@ static void send_message_to_peer(tsi_test_fixture *fixture, gpr_free(protected_buffer); } -static void receive_message_from_peer(tsi_test_fixture *fixture, - tsi_frame_protector *protector, - unsigned char *message, - size_t *bytes_received, bool is_client) { +static void receive_message_from_peer(tsi_test_fixture* fixture, + tsi_frame_protector* protector, + unsigned char* message, + size_t* bytes_received, bool is_client) { /* Initialization. */ GPR_ASSERT(fixture != NULL); GPR_ASSERT(protector != NULL); GPR_ASSERT(message != NULL); GPR_ASSERT(bytes_received != NULL); GPR_ASSERT(fixture->config != NULL); - tsi_test_frame_protector_config *config = fixture->config; + tsi_test_frame_protector_config* config = fixture->config; size_t read_offset = 0; size_t message_offset = 0; size_t read_from_peer_size = 0; tsi_result result = TSI_OK; bool done = false; - unsigned char *read_buffer = gpr_zalloc(config->read_buffer_allocated_size); - unsigned char *message_buffer = + unsigned char* read_buffer = gpr_zalloc(config->read_buffer_allocated_size); + unsigned char* message_buffer = gpr_zalloc(config->message_buffer_allocated_size); /* Do unprotect on data received from peer. */ while (!done && result == TSI_OK) { @@ -278,15 +278,15 @@ static void receive_message_from_peer(tsi_test_fixture *fixture, gpr_free(message_buffer); } -grpc_error *on_handshake_next_done(tsi_result result, void *user_data, - const unsigned char *bytes_to_send, +grpc_error* on_handshake_next_done(tsi_result result, void* user_data, + const unsigned char* bytes_to_send, size_t bytes_to_send_size, - tsi_handshaker_result *handshaker_result) { - handshaker_args *args = (handshaker_args *)user_data; + tsi_handshaker_result* handshaker_result) { + handshaker_args* args = (handshaker_args*)user_data; GPR_ASSERT(args != NULL); GPR_ASSERT(args->fixture != NULL); - tsi_test_fixture *fixture = args->fixture; - grpc_error *error = GRPC_ERROR_NONE; + tsi_test_fixture* fixture = args->fixture; + grpc_error* error = GRPC_ERROR_NONE; /* Read more data if we need to. */ if (result == TSI_INCOMPLETE_DATA) { GPR_ASSERT(bytes_to_send_size == 0); @@ -300,7 +300,7 @@ grpc_error *on_handshake_next_done(tsi_result result, void *user_data, } /* Update handshaker result. */ if (handshaker_result != NULL) { - tsi_handshaker_result **result_to_write = + tsi_handshaker_result** result_to_write = args->is_client ? &fixture->client_result : &fixture->server_result; GPR_ASSERT(*result_to_write == NULL); *result_to_write = handshaker_result; @@ -319,17 +319,17 @@ grpc_error *on_handshake_next_done(tsi_result result, void *user_data, } static void on_handshake_next_done_wrapper( - tsi_result result, void *user_data, const unsigned char *bytes_to_send, - size_t bytes_to_send_size, tsi_handshaker_result *handshaker_result) { - handshaker_args *args = (handshaker_args *)user_data; + tsi_result result, void* user_data, const unsigned char* bytes_to_send, + size_t bytes_to_send_size, tsi_handshaker_result* handshaker_result) { + handshaker_args* args = (handshaker_args*)user_data; args->error = on_handshake_next_done(result, user_data, bytes_to_send, bytes_to_send_size, handshaker_result); } -static bool is_handshake_finished_properly(handshaker_args *args) { +static bool is_handshake_finished_properly(handshaker_args* args) { GPR_ASSERT(args != NULL); GPR_ASSERT(args->fixture != NULL); - tsi_test_fixture *fixture = args->fixture; + tsi_test_fixture* fixture = args->fixture; if ((args->is_client && fixture->client_result != NULL) || (!args->is_client && fixture->server_result != NULL)) { return true; @@ -337,18 +337,18 @@ static bool is_handshake_finished_properly(handshaker_args *args) { return false; } -static void do_handshaker_next(handshaker_args *args) { +static void do_handshaker_next(handshaker_args* args) { /* Initialization. */ GPR_ASSERT(args != NULL); GPR_ASSERT(args->fixture != NULL); - tsi_test_fixture *fixture = args->fixture; - tsi_handshaker *handshaker = + tsi_test_fixture* fixture = args->fixture; + tsi_handshaker* handshaker = args->is_client ? fixture->client_handshaker : fixture->server_handshaker; if (is_handshake_finished_properly(args)) { return; } - tsi_handshaker_result *handshaker_result = NULL; - unsigned char *bytes_to_send = NULL; + tsi_handshaker_result* handshaker_result = NULL; + unsigned char* bytes_to_send = NULL; size_t bytes_to_send_size = 0; tsi_result result = TSI_OK; /* Receive data from peer, if available. */ @@ -361,7 +361,7 @@ static void do_handshaker_next(handshaker_args *args) { } /* Peform handshaker next. */ result = tsi_handshaker_next(handshaker, args->handshake_buffer, buf_size, - (const unsigned char **)&bytes_to_send, + (const unsigned char**)&bytes_to_send, &bytes_to_send_size, &handshaker_result, &on_handshake_next_done_wrapper, args); if (result != TSI_ASYNC) { @@ -375,12 +375,12 @@ static void do_handshaker_next(handshaker_args *args) { notification_wait(fixture); } -void tsi_test_do_handshake(tsi_test_fixture *fixture) { +void tsi_test_do_handshake(tsi_test_fixture* fixture) { /* Initializaiton. */ setup_handshakers(fixture); - handshaker_args *client_args = + handshaker_args* client_args = handshaker_args_create(fixture, true /* is_client */); - handshaker_args *server_args = + handshaker_args* server_args = handshaker_args_create(fixture, false /* is_client */); /* Do handshake. */ do { @@ -403,13 +403,13 @@ void tsi_test_do_handshake(tsi_test_fixture *fixture) { handshaker_args_destroy(server_args); } -void tsi_test_do_round_trip(tsi_test_fixture *fixture) { +void tsi_test_do_round_trip(tsi_test_fixture* fixture) { /* Initialization. */ GPR_ASSERT(fixture != NULL); GPR_ASSERT(fixture->config != NULL); - tsi_test_frame_protector_config *config = fixture->config; - tsi_frame_protector *client_frame_protector = NULL; - tsi_frame_protector *server_frame_protector = NULL; + tsi_test_frame_protector_config* config = fixture->config; + tsi_frame_protector* client_frame_protector = NULL; + tsi_frame_protector* server_frame_protector = NULL; /* Perform handshake. */ tsi_test_do_handshake(fixture); /* Create frame protectors.*/ @@ -431,7 +431,7 @@ void tsi_test_do_round_trip(tsi_test_fixture *fixture) { &server_frame_protector) == TSI_OK); /* Client sends a message to server. */ send_message_to_peer(fixture, client_frame_protector, true /* is_client */); - unsigned char *server_received_message = + unsigned char* server_received_message = gpr_zalloc(TSI_TEST_DEFAULT_CHANNEL_SIZE); size_t server_received_message_size = 0; receive_message_from_peer( @@ -442,7 +442,7 @@ void tsi_test_do_round_trip(tsi_test_fixture *fixture) { server_received_message_size) == 0); /* Server sends a message to client. */ send_message_to_peer(fixture, server_frame_protector, false /* is_client */); - unsigned char *client_received_message = + unsigned char* client_received_message = gpr_zalloc(TSI_TEST_DEFAULT_CHANNEL_SIZE); size_t client_received_message_size = 0; receive_message_from_peer( @@ -458,17 +458,17 @@ void tsi_test_do_round_trip(tsi_test_fixture *fixture) { gpr_free(client_received_message); } -static unsigned char *generate_random_message(size_t size) { +static unsigned char* generate_random_message(size_t size) { size_t i; unsigned char chars[] = "abcdefghijklmnopqrstuvwxyz1234567890"; - unsigned char *output = gpr_zalloc(sizeof(unsigned char) * size); + unsigned char* output = gpr_zalloc(sizeof(unsigned char) * size); for (i = 0; i < size - 1; ++i) { output[i] = chars[rand() % (int)(sizeof(chars) - 1)]; } return output; } -tsi_test_frame_protector_config *tsi_test_frame_protector_config_create( +tsi_test_frame_protector_config* tsi_test_frame_protector_config_create( bool use_default_read_buffer_allocated_size, bool use_default_message_buffer_allocated_size, bool use_default_protected_buffer_size, bool use_default_client_message, @@ -476,7 +476,7 @@ tsi_test_frame_protector_config *tsi_test_frame_protector_config_create( bool use_default_client_max_output_protected_frame_size, bool use_default_server_max_output_protected_frame_size, bool use_default_handshake_buffer_size) { - tsi_test_frame_protector_config *config = gpr_zalloc(sizeof(*config)); + tsi_test_frame_protector_config* config = gpr_zalloc(sizeof(*config)); /* Set the value for read_buffer_allocated_size. */ config->read_buffer_allocated_size = use_default_read_buffer_allocated_size @@ -525,7 +525,7 @@ tsi_test_frame_protector_config *tsi_test_frame_protector_config_create( } void tsi_test_frame_protector_config_set_buffer_size( - tsi_test_frame_protector_config *config, size_t read_buffer_allocated_size, + tsi_test_frame_protector_config* config, size_t read_buffer_allocated_size, size_t message_buffer_allocated_size, size_t protected_buffer_size, size_t client_max_output_protected_frame_size, size_t server_max_output_protected_frame_size) { @@ -540,14 +540,14 @@ void tsi_test_frame_protector_config_set_buffer_size( } void tsi_test_frame_protector_config_destroy( - tsi_test_frame_protector_config *config) { + tsi_test_frame_protector_config* config) { GPR_ASSERT(config != NULL); gpr_free(config->client_message); gpr_free(config->server_message); gpr_free(config); } -void tsi_test_fixture_init(tsi_test_fixture *fixture) { +void tsi_test_fixture_init(tsi_test_fixture* fixture) { fixture->config = tsi_test_frame_protector_config_create( true, true, true, true, true, true, true, true); fixture->handshake_buffer_size = TSI_TEST_DEFAULT_BUFFER_SIZE; @@ -564,7 +564,7 @@ void tsi_test_fixture_init(tsi_test_fixture *fixture) { fixture->notified = false; } -void tsi_test_fixture_destroy(tsi_test_fixture *fixture) { +void tsi_test_fixture_destroy(tsi_test_fixture* fixture) { GPR_ASSERT(fixture != NULL); tsi_test_frame_protector_config_destroy(fixture->config); tsi_handshaker_destroy(fixture->client_handshaker); diff --git a/test/core/tsi/transport_security_test_lib.h b/test/core/tsi/transport_security_test_lib.h index 74f4378bc1..d067b6d3dd 100644 --- a/test/core/tsi/transport_security_test_lib.h +++ b/test/core/tsi/transport_security_test_lib.h @@ -59,29 +59,29 @@ typedef struct tsi_test_frame_protector_config tsi_test_frame_protector_config; /* V-table for tsi_test_fixture operations that are implemented differently in different TSI implementations. */ typedef struct tsi_test_fixture_vtable { - void (*setup_handshakers)(tsi_test_fixture *fixture); - void (*check_handshaker_peers)(tsi_test_fixture *fixture); - void (*destruct)(tsi_test_fixture *fixture); + void (*setup_handshakers)(tsi_test_fixture* fixture); + void (*check_handshaker_peers)(tsi_test_fixture* fixture); + void (*destruct)(tsi_test_fixture* fixture); } tsi_test_fixture_vtable; struct tsi_test_fixture { - const tsi_test_fixture_vtable *vtable; + const tsi_test_fixture_vtable* vtable; /* client/server TSI handshaker used to perform TSI handshakes, and will get instantiated during the call to setup_handshakers. */ - tsi_handshaker *client_handshaker; - tsi_handshaker *server_handshaker; + tsi_handshaker* client_handshaker; + tsi_handshaker* server_handshaker; /* client/server TSI handshaker results used to store the result of TSI handshake. If the handshake fails, the result will store NULL upon finishing the handshake. */ - tsi_handshaker_result *client_result; - tsi_handshaker_result *server_result; + tsi_handshaker_result* client_result; + tsi_handshaker_result* server_result; /* size of buffer used to store data received from the peer. */ size_t handshake_buffer_size; /* simulated channels between client and server. If the server (client) wants to send data to the client (server), he will write data to client_channel (server_channel), which will be read by client (server). */ - uint8_t *client_channel; - uint8_t *server_channel; + uint8_t* client_channel; + uint8_t* server_channel; /* size of data written to the client/server channel. */ size_t bytes_written_to_client_channel; size_t bytes_written_to_server_channel; @@ -89,7 +89,7 @@ struct tsi_test_fixture { size_t bytes_read_from_client_channel; size_t bytes_read_from_server_channel; /* tsi_test_frame_protector_config instance */ - tsi_test_frame_protector_config *config; + tsi_test_frame_protector_config* config; /* a flag indicating if client has finished TSI handshake first (i.e., before server). The flag should be referred if and only if TSI handshake finishes @@ -121,8 +121,8 @@ struct tsi_test_frame_protector_config { size_t client_max_output_protected_frame_size; size_t server_max_output_protected_frame_size; /* pointer that points to client/server message to be protected. */ - uint8_t *client_message; - uint8_t *server_message; + uint8_t* client_message; + uint8_t* server_message; /* size of client/server message. */ size_t client_message_size; size_t server_message_size; @@ -133,7 +133,7 @@ struct tsi_test_frame_protector_config { corresponding parameter with a default value or not. If it's false, it will be set with a specific value which is usually much smaller than the default. Both values are defined with #define directive. */ -tsi_test_frame_protector_config *tsi_test_frame_protector_config_create( +tsi_test_frame_protector_config* tsi_test_frame_protector_config_create( bool use_default_read_buffer_allocated_size, bool use_default_message_buffer_allocated_size, bool use_default_protected_buffer_size, bool use_default_client_message, @@ -145,35 +145,35 @@ tsi_test_frame_protector_config *tsi_test_frame_protector_config_create( /* This method sets different buffer and frame sizes of a tsi_test_frame_protector_config instance with user provided values. */ void tsi_test_frame_protector_config_set_buffer_size( - tsi_test_frame_protector_config *config, size_t read_buffer_allocated_size, + tsi_test_frame_protector_config* config, size_t read_buffer_allocated_size, size_t message_buffer_allocated_size, size_t protected_buffer_size, size_t client_max_output_protected_frame_size, size_t server_max_output_protected_frame_size); /* This method destroys a tsi_test_frame_protector_config instance. */ void tsi_test_frame_protector_config_destroy( - tsi_test_frame_protector_config *config); + tsi_test_frame_protector_config* config); /* This method initializes members of tsi_test_fixture instance. Note that the struct instance should be allocated before making this call. */ -void tsi_test_fixture_init(tsi_test_fixture *fixture); +void tsi_test_fixture_init(tsi_test_fixture* fixture); /* This method destroys a tsi_test_fixture instance. Note that the fixture intance must be dynamically allocated and will be freed by this function. */ -void tsi_test_fixture_destroy(tsi_test_fixture *fixture); +void tsi_test_fixture_destroy(tsi_test_fixture* fixture); /* This method performs a full TSI handshake between a client and a server. Note that the test library will implement the new TSI handshaker API to perform handshakes. */ -void tsi_test_do_handshake(tsi_test_fixture *fixture); +void tsi_test_do_handshake(tsi_test_fixture* fixture); /* This method performs a round trip test between the client and the server. That is, the client sends a protected message to a server who receives the message, and unprotects it. The same operation is triggered again with the client and server switching its role. */ -void tsi_test_do_round_trip(tsi_test_fixture *fixture); +void tsi_test_do_round_trip(tsi_test_fixture* fixture); #ifdef __cplusplus } -- cgit v1.2.3