diff options
author | 2017-11-09 17:46:29 -0800 | |
---|---|---|
committer | 2017-11-09 17:46:29 -0800 | |
commit | 4e9265c828f0b559b5fdba04913fed46bf771399 (patch) | |
tree | 4a379fc2bdc037753cf8d81f8b86327e4bc50a42 /test/core/bad_ssl | |
parent | 0ee7574732a06e8cace4e099a678f4bd5dbff679 (diff) | |
parent | d9da7387b8057f3bd99a417a5ee905377bce9296 (diff) |
Merge with master
Diffstat (limited to 'test/core/bad_ssl')
-rw-r--r-- | test/core/bad_ssl/bad_ssl_test.cc (renamed from test/core/bad_ssl/bad_ssl_test.c) | 41 | ||||
-rwxr-xr-x | test/core/bad_ssl/gen_build_yaml.py | 6 | ||||
-rwxr-xr-x | test/core/bad_ssl/generate_tests.bzl | 4 | ||||
-rw-r--r-- | test/core/bad_ssl/server_common.cc (renamed from test/core/bad_ssl/server_common.c) | 23 | ||||
-rw-r--r-- | test/core/bad_ssl/server_common.h | 4 | ||||
-rw-r--r-- | test/core/bad_ssl/servers/alpn.cc (renamed from test/core/bad_ssl/servers/alpn.c) | 14 | ||||
-rw-r--r-- | test/core/bad_ssl/servers/cert.cc (renamed from test/core/bad_ssl/servers/cert.c) | 12 |
7 files changed, 53 insertions, 51 deletions
diff --git a/test/core/bad_ssl/bad_ssl_test.c b/test/core/bad_ssl/bad_ssl_test.cc index 793627bcdc..3cfa2a4a2b 100644 --- a/test/core/bad_ssl/bad_ssl_test.c +++ b/test/core/bad_ssl/bad_ssl_test.cc @@ -32,13 +32,13 @@ #include "test/core/util/port.h" #include "test/core/util/test_config.h" -static void *tag(intptr_t t) { return (void *)t; } +static void* tag(intptr_t t) { return (void*)t; } -static void run_test(const char *target, size_t nops) { - grpc_channel_credentials *ssl_creds = +static void run_test(const char* target, size_t nops) { + grpc_channel_credentials* ssl_creds = grpc_ssl_credentials_create(NULL, NULL, NULL); - grpc_channel *channel; - grpc_call *c; + grpc_channel* channel; + grpc_call* c; grpc_metadata_array initial_metadata_recv; grpc_metadata_array trailing_metadata_recv; @@ -46,15 +46,16 @@ static void run_test(const char *target, size_t nops) { grpc_status_code status; grpc_call_error error; gpr_timespec deadline = grpc_timeout_seconds_to_deadline(5); - grpc_completion_queue *cq = grpc_completion_queue_create_for_next(NULL); - cq_verifier *cqv = cq_verifier_create(cq); + grpc_completion_queue* cq = grpc_completion_queue_create_for_next(NULL); + cq_verifier* cqv = cq_verifier_create(cq); grpc_op ops[6]; - grpc_op *op; + grpc_op* op; - grpc_arg ssl_name_override = {GRPC_ARG_STRING, - GRPC_SSL_TARGET_NAME_OVERRIDE_ARG, - {"foo.test.google.fr"}}; + grpc_arg ssl_name_override = { + GRPC_ARG_STRING, + const_cast<char*>(GRPC_SSL_TARGET_NAME_OVERRIDE_ARG), + {const_cast<char*>("foo.test.google.fr")}}; grpc_channel_args args; args.num_args = 1; @@ -111,18 +112,18 @@ static void run_test(const char *target, size_t nops) { grpc_channel_credentials_release(ssl_creds); } -int main(int argc, char **argv) { - char *me = argv[0]; - char *lslash = strrchr(me, '/'); - char *lunder = strrchr(me, '_'); - char *tmp; +int main(int argc, char** argv) { + char* me = argv[0]; + char* lslash = strrchr(me, '/'); + char* lunder = strrchr(me, '_'); + char* tmp; char root[1024]; char test[64]; int port = grpc_pick_unused_port_or_die(); - char *args[10]; + char* args[10]; int status; size_t i; - gpr_subprocess *svr; + gpr_subprocess* svr; /* figure out where we are */ if (lslash) { memcpy(root, me, (size_t)(lslash - me)); @@ -141,9 +142,9 @@ int main(int argc, char **argv) { /* start the server */ gpr_asprintf(&args[0], "%s/bad_ssl_%s_server%s", root, test, gpr_subprocess_binary_extension()); - args[1] = "--bind"; + args[1] = const_cast<char*>("--bind"); gpr_join_host_port(&args[2], "::", port); - svr = gpr_subprocess_create(4, (const char **)args); + svr = gpr_subprocess_create(4, (const char**)args); gpr_free(args[0]); for (i = 3; i <= 4; i++) { diff --git a/test/core/bad_ssl/gen_build_yaml.py b/test/core/bad_ssl/gen_build_yaml.py index 30fdb5ea02..6b78e9c7aa 100755 --- a/test/core/bad_ssl/gen_build_yaml.py +++ b/test/core/bad_ssl/gen_build_yaml.py @@ -38,7 +38,7 @@ def main(): 'name': 'bad_ssl_test_server', 'build': 'private', 'language': 'c', - 'src': ['test/core/bad_ssl/server_common.c'], + 'src': ['test/core/bad_ssl/server_common.cc'], 'headers': ['test/core/bad_ssl/server_common.h'], 'vs_proj_dir': 'test', 'platforms': ['linux', 'posix', 'mac'], @@ -56,7 +56,7 @@ def main(): 'build': 'test', 'language': 'c', 'run': False, - 'src': ['test/core/bad_ssl/servers/%s.c' % t], + 'src': ['test/core/bad_ssl/servers/%s.cc' % t], 'vs_proj_dir': 'test/bad_ssl', 'platforms': ['linux', 'posix', 'mac'], 'deps': [ @@ -73,7 +73,7 @@ def main(): 'cpu_cost': BAD_CLIENT_TESTS[t].cpu_cost, 'build': 'test', 'language': 'c', - 'src': ['test/core/bad_ssl/bad_ssl_test.c'], + 'src': ['test/core/bad_ssl/bad_ssl_test.cc'], 'vs_proj_dir': 'test', 'platforms': ['linux', 'posix', 'mac'], 'deps': [ diff --git a/test/core/bad_ssl/generate_tests.bzl b/test/core/bad_ssl/generate_tests.bzl index b61fabc051..b7cb8f86e6 100755 --- a/test/core/bad_ssl/generate_tests.bzl +++ b/test/core/bad_ssl/generate_tests.bzl @@ -24,14 +24,14 @@ BAD_SSL_TESTS = ['cert', 'alpn'] def grpc_bad_ssl_tests(): native.cc_library( name = 'bad_ssl_test_server', - srcs = ['server_common.c'], + srcs = ['server_common.cc'], hdrs = ['server_common.h'], deps = ['//test/core/util:grpc_test_util', '//:grpc', '//test/core/end2end:ssl_test_data'] ) for t in BAD_SSL_TESTS: native.cc_test( name = 'bad_ssl_%s_server' % t, - srcs = ['servers/%s.c' % t], + srcs = ['servers/%s.cc' % t], deps = [':bad_ssl_test_server'], ) diff --git a/test/core/bad_ssl/server_common.c b/test/core/bad_ssl/server_common.cc index 0588d43c38..0110ed5ad2 100644 --- a/test/core/bad_ssl/server_common.c +++ b/test/core/bad_ssl/server_common.cc @@ -32,9 +32,9 @@ static int got_sigint = 0; static void sigint_handler(int x) { got_sigint = 1; } -const char *bad_ssl_addr(int argc, char **argv) { - gpr_cmdline *cl; - char *addr = NULL; +const char* bad_ssl_addr(int argc, char** argv) { + gpr_cmdline* cl; + const char* addr = NULL; cl = gpr_cmdline_create("test server"); gpr_cmdline_add_string(cl, "bind", "Bind host:port", &addr); gpr_cmdline_parse(cl, argc, argv); @@ -43,17 +43,17 @@ const char *bad_ssl_addr(int argc, char **argv) { return addr; } -void bad_ssl_run(grpc_server *server) { +void bad_ssl_run(grpc_server* server) { int shutdown_started = 0; int shutdown_finished = 0; grpc_event ev; grpc_call_error error; - grpc_call *s = NULL; + grpc_call* s = NULL; grpc_call_details call_details; grpc_metadata_array request_metadata_recv; - grpc_completion_queue *cq = grpc_completion_queue_create_for_next(NULL); - grpc_completion_queue *shutdown_cq; + grpc_completion_queue* cq = grpc_completion_queue_create_for_next(NULL); + grpc_completion_queue* shutdown_cq; grpc_call_details_init(&call_details); grpc_metadata_array_init(&request_metadata_recv); @@ -62,7 +62,7 @@ void bad_ssl_run(grpc_server *server) { grpc_server_start(server); error = grpc_server_request_call(server, &s, &call_details, - &request_metadata_recv, cq, cq, (void *)1); + &request_metadata_recv, cq, cq, (void*)1); GPR_ASSERT(GRPC_CALL_OK == error); signal(SIGINT, sigint_handler); @@ -80,12 +80,13 @@ void bad_ssl_run(grpc_server *server) { shutdown_started = 1; } ev = grpc_completion_queue_next( - cq, gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), - gpr_time_from_micros(1000000, GPR_TIMESPAN)), + cq, + gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), + gpr_time_from_micros(1000000, GPR_TIMESPAN)), NULL); switch (ev.type) { case GRPC_OP_COMPLETE: - GPR_ASSERT(ev.tag == (void *)1); + GPR_ASSERT(ev.tag == (void*)1); GPR_ASSERT(ev.success == 0); break; case GRPC_QUEUE_SHUTDOWN: diff --git a/test/core/bad_ssl/server_common.h b/test/core/bad_ssl/server_common.h index 35d51b1cb4..e1933b973e 100644 --- a/test/core/bad_ssl/server_common.h +++ b/test/core/bad_ssl/server_common.h @@ -21,7 +21,7 @@ #include <grpc/grpc.h> -const char *bad_ssl_addr(int argc, char **argv); -void bad_ssl_run(grpc_server *server); +const char* bad_ssl_addr(int argc, char** argv); +void bad_ssl_run(grpc_server* server); #endif /* GRPC_TEST_CORE_BAD_SSL_SERVER_H */ diff --git a/test/core/bad_ssl/servers/alpn.c b/test/core/bad_ssl/servers/alpn.cc index 3179054aff..a207516a72 100644 --- a/test/core/bad_ssl/servers/alpn.c +++ b/test/core/bad_ssl/servers/alpn.cc @@ -31,9 +31,9 @@ * a protocol that the connecting client does not support. It does this by * overriding the functions declared in alpn.c from the core library. */ -static const char *const fake_versions[] = {"not-h2"}; +static const char* const fake_versions[] = {"not-h2"}; -int grpc_chttp2_is_alpn_version_supported(const char *version, size_t size) { +int grpc_chttp2_is_alpn_version_supported(const char* version, size_t size) { size_t i; for (i = 0; i < GPR_ARRAY_SIZE(fake_versions); i++) { if (!strncmp(version, fake_versions[i], size)) return 1; @@ -45,17 +45,17 @@ size_t grpc_chttp2_num_alpn_versions(void) { return GPR_ARRAY_SIZE(fake_versions); } -const char *grpc_chttp2_get_alpn_version_index(size_t i) { +const char* grpc_chttp2_get_alpn_version_index(size_t i) { GPR_ASSERT(i < GPR_ARRAY_SIZE(fake_versions)); return fake_versions[i]; } -int main(int argc, char **argv) { - const char *addr = bad_ssl_addr(argc, argv); +int main(int argc, char** argv) { + const char* addr = bad_ssl_addr(argc, argv); grpc_ssl_pem_key_cert_pair pem_key_cert_pair = {test_server1_key, test_server1_cert}; - grpc_server_credentials *ssl_creds; - grpc_server *server; + grpc_server_credentials* ssl_creds; + grpc_server* server; grpc_init(); ssl_creds = diff --git a/test/core/bad_ssl/servers/cert.c b/test/core/bad_ssl/servers/cert.cc index a1f3048164..4a8ac93452 100644 --- a/test/core/bad_ssl/servers/cert.c +++ b/test/core/bad_ssl/servers/cert.cc @@ -31,11 +31,11 @@ /* This server will present an untrusted cert to the connecting client, * causing the SSL handshake to fail */ -int main(int argc, char **argv) { - const char *addr = bad_ssl_addr(argc, argv); +int main(int argc, char** argv) { + const char* addr = bad_ssl_addr(argc, argv); grpc_ssl_pem_key_cert_pair pem_key_cert_pair; - grpc_server_credentials *ssl_creds; - grpc_server *server; + grpc_server_credentials* ssl_creds; + grpc_server* server; grpc_slice cert_slice, key_slice; grpc_init(); @@ -46,8 +46,8 @@ int main(int argc, char **argv) { GPR_ASSERT(GRPC_LOG_IF_ERROR( "load_file", grpc_load_file("src/core/tsi/test_creds/badserver.key", 1, &key_slice))); - pem_key_cert_pair.private_key = (const char *)GRPC_SLICE_START_PTR(key_slice); - pem_key_cert_pair.cert_chain = (const char *)GRPC_SLICE_START_PTR(cert_slice); + pem_key_cert_pair.private_key = (const char*)GRPC_SLICE_START_PTR(key_slice); + pem_key_cert_pair.cert_chain = (const char*)GRPC_SLICE_START_PTR(cert_slice); ssl_creds = grpc_ssl_server_credentials_create(NULL, &pem_key_cert_pair, 1, 0, NULL); |