From abd20f3c69b3f2e32cf46bc82f26632c2413fdad Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Sun, 13 Dec 2015 11:48:59 -0800 Subject: Add tests for failed SSL connections: bad cert, and bad alpn config --- test/core/bad_ssl/bad_ssl_test.c | 170 ++++++++++++++++++++++++++++++++++++ test/core/bad_ssl/gen_build_yaml.py | 100 +++++++++++++++++++++ test/core/bad_ssl/server.c | 92 +++++++++++++++++++ test/core/bad_ssl/server.h | 42 +++++++++ test/core/bad_ssl/servers/alpn.c | 81 +++++++++++++++++ test/core/bad_ssl/servers/cert.c | 76 ++++++++++++++++ 6 files changed, 561 insertions(+) create mode 100644 test/core/bad_ssl/bad_ssl_test.c create mode 100755 test/core/bad_ssl/gen_build_yaml.py create mode 100644 test/core/bad_ssl/server.c create mode 100644 test/core/bad_ssl/server.h create mode 100644 test/core/bad_ssl/servers/alpn.c create mode 100644 test/core/bad_ssl/servers/cert.c (limited to 'test/core') diff --git a/test/core/bad_ssl/bad_ssl_test.c b/test/core/bad_ssl/bad_ssl_test.c new file mode 100644 index 0000000000..3429b35ce9 --- /dev/null +++ b/test/core/bad_ssl/bad_ssl_test.c @@ -0,0 +1,170 @@ +/* + * + * Copyright 2015, Google Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include "src/core/support/string.h" +#include "test/core/util/port.h" +#include "test/core/end2end/cq_verifier.h" +#include "test/core/util/test_config.h" + +static void *tag(gpr_intptr t) { return (void *)t; } + +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_metadata_array initial_metadata_recv; + grpc_metadata_array trailing_metadata_recv; + char *details = NULL; + size_t details_capacity = 0; + 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(NULL); + cq_verifier *cqv = cq_verifier_create(cq); + + grpc_op ops[6]; + grpc_op *op; + + grpc_arg ssl_name_override = {GRPC_ARG_STRING, + GRPC_SSL_TARGET_NAME_OVERRIDE_ARG, + {"foo.test.google.fr"}}; + grpc_channel_args args; + + args.num_args = 1; + args.args = &ssl_name_override; + + grpc_metadata_array_init(&initial_metadata_recv); + grpc_metadata_array_init(&trailing_metadata_recv); + + channel = grpc_secure_channel_create(ssl_creds, target, &args, NULL); + c = grpc_channel_create_call(channel, NULL, GRPC_PROPAGATE_DEFAULTS, cq, + "/foo", "foo.test.google.fr:1234", deadline, + NULL); + + op = ops; + op->op = GRPC_OP_SEND_INITIAL_METADATA; + op->data.send_initial_metadata.count = 0; + op->flags = 0; + op->reserved = NULL; + op++; + op->op = GRPC_OP_RECV_STATUS_ON_CLIENT; + op->data.recv_status_on_client.trailing_metadata = &trailing_metadata_recv; + op->data.recv_status_on_client.status = &status; + op->data.recv_status_on_client.status_details = &details; + op->data.recv_status_on_client.status_details_capacity = &details_capacity; + op->flags = 0; + op->reserved = NULL; + op++; + op->op = GRPC_OP_RECV_INITIAL_METADATA; + op->data.recv_initial_metadata = &initial_metadata_recv; + op->flags = 0; + op->reserved = NULL; + op++; + op->op = GRPC_OP_SEND_CLOSE_FROM_CLIENT; + op->flags = 0; + op->reserved = NULL; + op++; + error = grpc_call_start_batch(c, ops, nops, tag(1), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); + + cq_expect_completion(cqv, tag(1), 1); + cq_verify(cqv); + + GPR_ASSERT(status != GRPC_STATUS_OK); + + grpc_call_destroy(c); + gpr_free(details); + grpc_metadata_array_destroy(&initial_metadata_recv); + grpc_metadata_array_destroy(&trailing_metadata_recv); + + grpc_channel_destroy(channel); + grpc_completion_queue_destroy(cq); + cq_verifier_destroy(cqv); +} + +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]; + int status; + size_t i; + gpr_subprocess *svr; + /* figure out where we are */ + if (lslash) { + memcpy(root, me, (size_t)(lslash - me)); + root[lslash - me] = 0; + } else { + strcpy(root, "."); + } + /* figure out our test name */ + tmp = lunder - 1; + while (*tmp != '_') tmp--; + tmp++; + memcpy(test, tmp, lunder - tmp); + /* start the server */ + gpr_asprintf(&args[0], "%s/bad_ssl_%s_server%s", root, test, + gpr_subprocess_binary_extension()); + args[1] = "--bind"; + gpr_join_host_port(&args[2], "::", port); + svr = gpr_subprocess_create(4, (const char **)args); + gpr_free(args[0]); + + for (i = 3; i <= 4; i++) { + grpc_init(); + run_test(args[2], i); + grpc_shutdown(); + } + gpr_free(args[2]); + + gpr_subprocess_interrupt(svr); + status = gpr_subprocess_join(svr); + gpr_subprocess_destroy(svr); + return status; +} diff --git a/test/core/bad_ssl/gen_build_yaml.py b/test/core/bad_ssl/gen_build_yaml.py new file mode 100755 index 0000000000..91df788545 --- /dev/null +++ b/test/core/bad_ssl/gen_build_yaml.py @@ -0,0 +1,100 @@ +#!/usr/bin/env python2.7 +# Copyright 2015, Google Inc. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following disclaimer +# in the documentation and/or other materials provided with the +# distribution. +# * Neither the name of Google Inc. nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +"""Generates the appropriate build.json data for all the end2end tests.""" + + +import collections +import yaml + +TestOptions = collections.namedtuple('TestOptions', 'flaky') +default_test_options = TestOptions(False) + +# maps test names to options +BAD_CLIENT_TESTS = { + 'cert': default_test_options, + 'alpn': default_test_options, +} + +def main(): + json = { + '#': 'generated with test/bad_ssl/gen_build_json.py', + 'libs': [ + { + 'name': 'bad_ssl_test_server', + 'build': 'private', + 'language': 'c', + 'src': ['test/core/bad_ssl/server.c'], + 'headers': ['test/core/bad_ssl/server.h'], + 'vs_proj_dir': 'test', + 'deps': [ + 'grpc_test_util', + 'grpc', + 'gpr_test_util', + 'gpr' + ] + } + ], + 'targets': [ + { + 'name': 'bad_ssl_%s_server' % t, + 'build': 'test', + 'language': 'c', + 'src': ['test/core/bad_ssl/servers/%s.c' % t], + 'vs_proj_dir': 'test', + 'deps': [ + 'bad_ssl_test_server', + 'grpc_test_util', + 'grpc', + 'gpr_test_util', + 'gpr' + ] + } + for t in sorted(BAD_CLIENT_TESTS.keys())] + [ + { + 'name': 'bad_ssl_%s_test' % t, + 'build': 'test', + 'language': 'c', + 'src': ['test/core/bad_ssl/bad_ssl_test.c'], + 'vs_proj_dir': 'test', + 'deps': [ + 'grpc_test_util', + 'grpc', + 'gpr_test_util', + 'gpr' + ] + } + for t in sorted(BAD_CLIENT_TESTS.keys())]} + print yaml.dump(json) + + +if __name__ == '__main__': + main() diff --git a/test/core/bad_ssl/server.c b/test/core/bad_ssl/server.c new file mode 100644 index 0000000000..378929712c --- /dev/null +++ b/test/core/bad_ssl/server.c @@ -0,0 +1,92 @@ +/* + * + * Copyright 2015, Google Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +#include +#include +#include + +#include "test/core/bad_ssl/server.h" +#include "test/core/util/test_config.h" + +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; + cl = gpr_cmdline_create("test server"); + gpr_cmdline_add_string(cl, "bind", "Bind host:port", &addr); + gpr_cmdline_parse(cl, argc, argv); + gpr_cmdline_destroy(cl); + GPR_ASSERT(addr); + return addr; +} + +void bad_ssl_run(grpc_server *server) { + int shutdown_started = 0; + int shutdown_finished = 0; + grpc_event ev; + + grpc_completion_queue *cq = grpc_completion_queue_create(NULL); + grpc_server_register_completion_queue(server, cq, NULL); + grpc_server_start(server); + + signal(SIGINT, sigint_handler); + while (!shutdown_finished) { + if (got_sigint && !shutdown_started) { + gpr_log(GPR_INFO, "Shutting down due to SIGINT"); + grpc_server_shutdown_and_notify(server, cq, NULL); + GPR_ASSERT(grpc_completion_queue_pluck( + cq, NULL, GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) + .type == GRPC_OP_COMPLETE); + grpc_completion_queue_shutdown(cq); + shutdown_started = 1; + } + ev = grpc_completion_queue_next( + 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_UNREACHABLE_CODE(gpr_log(GPR_DEBUG, "GRPC_OP_COMPLETE")); + break; + case GRPC_QUEUE_SHUTDOWN: + GPR_ASSERT(shutdown_started); + shutdown_finished = 1; + break; + case GRPC_QUEUE_TIMEOUT: + break; + } + } +} diff --git a/test/core/bad_ssl/server.h b/test/core/bad_ssl/server.h new file mode 100644 index 0000000000..8ec7755503 --- /dev/null +++ b/test/core/bad_ssl/server.h @@ -0,0 +1,42 @@ +/* + * + * Copyright 2015, Google Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +#ifndef GRPC_TEST_CORE_BAD_SSL_SERVER_H +#define GRPC_TEST_CORE_BAD_SSL_SERVER_H + +#include + +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.c new file mode 100644 index 0000000000..29cddf9b9d --- /dev/null +++ b/test/core/bad_ssl/servers/alpn.c @@ -0,0 +1,81 @@ +/* + * + * Copyright 2015, Google Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +#include + +#include +#include +#include +#include + +#include "test/core/bad_ssl/server.h" +#include "test/core/end2end/data/ssl_test_data.h" + +static const char *const fake_versions[] = {"not-h2"}; + +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; + } + return 0; +} + +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) { + 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); + 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_init(); + ssl_creds = grpc_ssl_server_credentials_create( + NULL, &pem_key_cert_pair, 1, 0, NULL); + server = grpc_server_create(NULL, NULL); + GPR_ASSERT(grpc_server_add_secure_http2_port(server, addr, ssl_creds)); + grpc_server_credentials_release(ssl_creds); + + bad_ssl_run(server); + grpc_shutdown(); + + return 0; +} diff --git a/test/core/bad_ssl/servers/cert.c b/test/core/bad_ssl/servers/cert.c new file mode 100644 index 0000000000..d115592fbe --- /dev/null +++ b/test/core/bad_ssl/servers/cert.c @@ -0,0 +1,76 @@ +/* + * + * Copyright 2015, Google Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +#include + +#include +#include +#include +#include + +#include "src/core/support/file.h" + +#include "test/core/bad_ssl/server.h" +#include "test/core/end2end/data/ssl_test_data.h" + +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; + gpr_slice cert_slice, key_slice; + int ok; + + grpc_init(); + + cert_slice = gpr_load_file("src/core/tsi/test_creds/badserver.pem", 1, &ok); + GPR_ASSERT(ok); + key_slice = gpr_load_file("src/core/tsi/test_creds/badserver.key", 1, &ok); + GPR_ASSERT(ok); + pem_key_cert_pair.private_key = (const char *)GPR_SLICE_START_PTR(key_slice); + pem_key_cert_pair.cert_chain = (const char *)GPR_SLICE_START_PTR(cert_slice); + + ssl_creds = grpc_ssl_server_credentials_create( + NULL, &pem_key_cert_pair, 1, 0, NULL); + server = grpc_server_create(NULL, NULL); + GPR_ASSERT(grpc_server_add_secure_http2_port(server, addr, ssl_creds)); + grpc_server_credentials_release(ssl_creds); + + gpr_slice_unref(cert_slice); + gpr_slice_unref(key_slice); + + bad_ssl_run(server); + grpc_shutdown(); + + return 0; +} -- cgit v1.2.3 From 56369b4ac52f8c52b7f2e5e9d22e39e5a90fdaec Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Sun, 13 Dec 2015 19:27:03 -0800 Subject: Add cast --- test/core/bad_ssl/bad_ssl_test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/core') diff --git a/test/core/bad_ssl/bad_ssl_test.c b/test/core/bad_ssl/bad_ssl_test.c index 3429b35ce9..f33f7e0ae3 100644 --- a/test/core/bad_ssl/bad_ssl_test.c +++ b/test/core/bad_ssl/bad_ssl_test.c @@ -147,7 +147,7 @@ int main(int argc, char **argv) { tmp = lunder - 1; while (*tmp != '_') tmp--; tmp++; - memcpy(test, tmp, lunder - tmp); + memcpy(test, tmp, (size_t)(lunder - tmp)); /* start the server */ gpr_asprintf(&args[0], "%s/bad_ssl_%s_server%s", root, test, gpr_subprocess_binary_extension()); -- cgit v1.2.3 From 7bbedf20ea80a2f45ba98f4de039f24b79d584c0 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Sun, 13 Dec 2015 20:02:31 -0800 Subject: Dont run the servers as tests --- Makefile | 4 ---- test/core/bad_ssl/gen_build_yaml.py | 1 + tools/run_tests/tests.json | 36 ------------------------------------ 3 files changed, 1 insertion(+), 40 deletions(-) (limited to 'test/core') diff --git a/Makefile b/Makefile index 0a4b7af94d..02f1637d1d 100644 --- a/Makefile +++ b/Makefile @@ -5544,10 +5544,6 @@ test_c: buildtests_c $(Q) $(BINDIR)/$(CONFIG)/simple_request_bad_client_test || ( echo test simple_request_bad_client_test failed ; exit 1 ) $(E) "[RUN] Testing unknown_frame_bad_client_test" $(Q) $(BINDIR)/$(CONFIG)/unknown_frame_bad_client_test || ( echo test unknown_frame_bad_client_test failed ; exit 1 ) - $(E) "[RUN] Testing bad_ssl_alpn_server" - $(Q) $(BINDIR)/$(CONFIG)/bad_ssl_alpn_server || ( echo test bad_ssl_alpn_server failed ; exit 1 ) - $(E) "[RUN] Testing bad_ssl_cert_server" - $(Q) $(BINDIR)/$(CONFIG)/bad_ssl_cert_server || ( echo test bad_ssl_cert_server failed ; exit 1 ) $(E) "[RUN] Testing bad_ssl_alpn_test" $(Q) $(BINDIR)/$(CONFIG)/bad_ssl_alpn_test || ( echo test bad_ssl_alpn_test failed ; exit 1 ) $(E) "[RUN] Testing bad_ssl_cert_test" diff --git a/test/core/bad_ssl/gen_build_yaml.py b/test/core/bad_ssl/gen_build_yaml.py index 91df788545..fef448d7b6 100755 --- a/test/core/bad_ssl/gen_build_yaml.py +++ b/test/core/bad_ssl/gen_build_yaml.py @@ -68,6 +68,7 @@ def main(): 'name': 'bad_ssl_%s_server' % t, 'build': 'test', 'language': 'c', + 'run': False, 'src': ['test/core/bad_ssl/servers/%s.c' % t], 'vs_proj_dir': 'test', 'deps': [ diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json index 4a52f88f65..0f89fb79b6 100644 --- a/tools/run_tests/tests.json +++ b/tools/run_tests/tests.json @@ -18428,42 +18428,6 @@ "windows" ] }, - { - "ci_platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "exclude_configs": [], - "flaky": false, - "language": "c", - "name": "bad_ssl_alpn_server", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ] - }, - { - "ci_platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "exclude_configs": [], - "flaky": false, - "language": "c", - "name": "bad_ssl_cert_server", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ] - }, { "ci_platforms": [ "linux", -- cgit v1.2.3 From ff767730e18866811bdc54919da0028b3fc5febe Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Sun, 13 Dec 2015 21:52:33 -0800 Subject: Fix leak --- test/core/bad_ssl/bad_ssl_test.c | 1 + 1 file changed, 1 insertion(+) (limited to 'test/core') diff --git a/test/core/bad_ssl/bad_ssl_test.c b/test/core/bad_ssl/bad_ssl_test.c index f33f7e0ae3..08ab482c58 100644 --- a/test/core/bad_ssl/bad_ssl_test.c +++ b/test/core/bad_ssl/bad_ssl_test.c @@ -122,6 +122,7 @@ static void run_test(const char *target, size_t nops) { grpc_channel_destroy(channel); grpc_completion_queue_destroy(cq); cq_verifier_destroy(cqv); + grpc_channel_credentials_release(ssl_creds); } int main(int argc, char **argv) { -- cgit v1.2.3 From 5e9add5219c8d6bb2cfcbf19196317c41cb12531 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Sun, 13 Dec 2015 21:56:46 -0800 Subject: Dont run on Windows just yet --- test/core/bad_ssl/gen_build_yaml.py | 3 + tools/run_tests/tests.json | 12 +- vsprojects/buildtests_c.sln | 137 --------------- .../bad_ssl_alpn_server.vcxproj | 190 --------------------- .../bad_ssl_alpn_server.vcxproj.filters | 24 --- .../bad_ssl_alpn_test/bad_ssl_alpn_test.vcxproj | 187 -------------------- .../bad_ssl_alpn_test.vcxproj.filters | 21 --- .../bad_ssl_cert_server.vcxproj | 190 --------------------- .../bad_ssl_cert_server.vcxproj.filters | 24 --- .../bad_ssl_cert_test/bad_ssl_cert_test.vcxproj | 187 -------------------- .../bad_ssl_cert_test.vcxproj.filters | 21 --- .../bad_ssl_test_server.vcxproj | 169 ------------------ .../bad_ssl_test_server.vcxproj.filters | 26 --- 13 files changed, 7 insertions(+), 1184 deletions(-) delete mode 100644 vsprojects/vcxproj/test/bad_ssl_alpn_server/bad_ssl_alpn_server.vcxproj delete mode 100644 vsprojects/vcxproj/test/bad_ssl_alpn_server/bad_ssl_alpn_server.vcxproj.filters delete mode 100644 vsprojects/vcxproj/test/bad_ssl_alpn_test/bad_ssl_alpn_test.vcxproj delete mode 100644 vsprojects/vcxproj/test/bad_ssl_alpn_test/bad_ssl_alpn_test.vcxproj.filters delete mode 100644 vsprojects/vcxproj/test/bad_ssl_cert_server/bad_ssl_cert_server.vcxproj delete mode 100644 vsprojects/vcxproj/test/bad_ssl_cert_server/bad_ssl_cert_server.vcxproj.filters delete mode 100644 vsprojects/vcxproj/test/bad_ssl_cert_test/bad_ssl_cert_test.vcxproj delete mode 100644 vsprojects/vcxproj/test/bad_ssl_cert_test/bad_ssl_cert_test.vcxproj.filters delete mode 100644 vsprojects/vcxproj/test/bad_ssl_test_server/bad_ssl_test_server.vcxproj delete mode 100644 vsprojects/vcxproj/test/bad_ssl_test_server/bad_ssl_test_server.vcxproj.filters (limited to 'test/core') diff --git a/test/core/bad_ssl/gen_build_yaml.py b/test/core/bad_ssl/gen_build_yaml.py index fef448d7b6..d12722439e 100755 --- a/test/core/bad_ssl/gen_build_yaml.py +++ b/test/core/bad_ssl/gen_build_yaml.py @@ -55,6 +55,7 @@ def main(): 'src': ['test/core/bad_ssl/server.c'], 'headers': ['test/core/bad_ssl/server.h'], 'vs_proj_dir': 'test', + 'platforms': ['linux', 'posix', 'mac'], 'deps': [ 'grpc_test_util', 'grpc', @@ -71,6 +72,7 @@ def main(): 'run': False, 'src': ['test/core/bad_ssl/servers/%s.c' % t], 'vs_proj_dir': 'test', + 'platforms': ['linux', 'posix', 'mac'], 'deps': [ 'bad_ssl_test_server', 'grpc_test_util', @@ -86,6 +88,7 @@ def main(): 'language': 'c', 'src': ['test/core/bad_ssl/bad_ssl_test.c'], 'vs_proj_dir': 'test', + 'platforms': ['linux', 'posix', 'mac'], 'deps': [ 'grpc_test_util', 'grpc', diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json index 0f89fb79b6..5f75accbee 100644 --- a/tools/run_tests/tests.json +++ b/tools/run_tests/tests.json @@ -18432,8 +18432,7 @@ "ci_platforms": [ "linux", "mac", - "posix", - "windows" + "posix" ], "exclude_configs": [], "flaky": false, @@ -18442,16 +18441,14 @@ "platforms": [ "linux", "mac", - "posix", - "windows" + "posix" ] }, { "ci_platforms": [ "linux", "mac", - "posix", - "windows" + "posix" ], "exclude_configs": [], "flaky": false, @@ -18460,8 +18457,7 @@ "platforms": [ "linux", "mac", - "posix", - "windows" + "posix" ] } ] diff --git a/vsprojects/buildtests_c.sln b/vsprojects/buildtests_c.sln index 472fc3393a..5e5302a569 100644 --- a/vsprojects/buildtests_c.sln +++ b/vsprojects/buildtests_c.sln @@ -1158,17 +1158,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bad_client_test", "vcxproj\ {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} = {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bad_ssl_test_server", "vcxproj\test\bad_ssl_test_server\bad_ssl_test_server.vcxproj", "{130500EB-4D99-8612-2E09-0E8C4822A5CA}" - ProjectSection(myProperties) = preProject - lib = "True" - EndProjectSection - ProjectSection(ProjectDependencies) = postProject - {17BCAFC0-5FDC-4C94-AEB9-95F3E220614B} = {17BCAFC0-5FDC-4C94-AEB9-95F3E220614B} - {29D16885-7228-4C31-81ED-5F9187C7F2A9} = {29D16885-7228-4C31-81ED-5F9187C7F2A9} - {EAB0A629-17A9-44DB-B5FF-E91A721FE037} = {EAB0A629-17A9-44DB-B5FF-E91A721FE037} - {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} = {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "algorithm_test", "vcxproj\test\algorithm_test\algorithm_test.vcxproj", "{216FDCB2-9D93-0D86-F0F1-12E16312A191}" ProjectSection(myProperties) = preProject lib = "False" @@ -10938,52 +10927,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unknown_frame_bad_client_te {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} = {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bad_ssl_alpn_server", "vcxproj\test\bad_ssl_alpn_server\bad_ssl_alpn_server.vcxproj", "{4A564483-1758-BF26-4313-165DA57247E1}" - ProjectSection(myProperties) = preProject - lib = "False" - EndProjectSection - ProjectSection(ProjectDependencies) = postProject - {130500EB-4D99-8612-2E09-0E8C4822A5CA} = {130500EB-4D99-8612-2E09-0E8C4822A5CA} - {17BCAFC0-5FDC-4C94-AEB9-95F3E220614B} = {17BCAFC0-5FDC-4C94-AEB9-95F3E220614B} - {29D16885-7228-4C31-81ED-5F9187C7F2A9} = {29D16885-7228-4C31-81ED-5F9187C7F2A9} - {EAB0A629-17A9-44DB-B5FF-E91A721FE037} = {EAB0A629-17A9-44DB-B5FF-E91A721FE037} - {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} = {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bad_ssl_cert_server", "vcxproj\test\bad_ssl_cert_server\bad_ssl_cert_server.vcxproj", "{B714D4BC-3986-69FA-02C8-772C04AD3CD4}" - ProjectSection(myProperties) = preProject - lib = "False" - EndProjectSection - ProjectSection(ProjectDependencies) = postProject - {130500EB-4D99-8612-2E09-0E8C4822A5CA} = {130500EB-4D99-8612-2E09-0E8C4822A5CA} - {17BCAFC0-5FDC-4C94-AEB9-95F3E220614B} = {17BCAFC0-5FDC-4C94-AEB9-95F3E220614B} - {29D16885-7228-4C31-81ED-5F9187C7F2A9} = {29D16885-7228-4C31-81ED-5F9187C7F2A9} - {EAB0A629-17A9-44DB-B5FF-E91A721FE037} = {EAB0A629-17A9-44DB-B5FF-E91A721FE037} - {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} = {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bad_ssl_alpn_test", "vcxproj\test\bad_ssl_alpn_test\bad_ssl_alpn_test.vcxproj", "{FC99C9DC-F81B-8813-FBE4-1A5EC9F7990A}" - ProjectSection(myProperties) = preProject - lib = "False" - EndProjectSection - ProjectSection(ProjectDependencies) = postProject - {17BCAFC0-5FDC-4C94-AEB9-95F3E220614B} = {17BCAFC0-5FDC-4C94-AEB9-95F3E220614B} - {29D16885-7228-4C31-81ED-5F9187C7F2A9} = {29D16885-7228-4C31-81ED-5F9187C7F2A9} - {EAB0A629-17A9-44DB-B5FF-E91A721FE037} = {EAB0A629-17A9-44DB-B5FF-E91A721FE037} - {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} = {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bad_ssl_cert_test", "vcxproj\test\bad_ssl_cert_test\bad_ssl_cert_test.vcxproj", "{91BF44F8-3962-72E9-AD55-F59027BE28D5}" - ProjectSection(myProperties) = preProject - lib = "False" - EndProjectSection - ProjectSection(ProjectDependencies) = postProject - {17BCAFC0-5FDC-4C94-AEB9-95F3E220614B} = {17BCAFC0-5FDC-4C94-AEB9-95F3E220614B} - {29D16885-7228-4C31-81ED-5F9187C7F2A9} = {29D16885-7228-4C31-81ED-5F9187C7F2A9} - {EAB0A629-17A9-44DB-B5FF-E91A721FE037} = {EAB0A629-17A9-44DB-B5FF-E91A721FE037} - {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} = {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} - EndProjectSection -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -12644,22 +12587,6 @@ Global {BA67B418-B699-E41A-9CC4-0279C49481A5}.Release-DLL|Win32.Build.0 = Release|Win32 {BA67B418-B699-E41A-9CC4-0279C49481A5}.Release-DLL|x64.ActiveCfg = Release|x64 {BA67B418-B699-E41A-9CC4-0279C49481A5}.Release-DLL|x64.Build.0 = Release|x64 - {130500EB-4D99-8612-2E09-0E8C4822A5CA}.Debug|Win32.ActiveCfg = Debug|Win32 - {130500EB-4D99-8612-2E09-0E8C4822A5CA}.Debug|x64.ActiveCfg = Debug|x64 - {130500EB-4D99-8612-2E09-0E8C4822A5CA}.Release|Win32.ActiveCfg = Release|Win32 - {130500EB-4D99-8612-2E09-0E8C4822A5CA}.Release|x64.ActiveCfg = Release|x64 - {130500EB-4D99-8612-2E09-0E8C4822A5CA}.Debug|Win32.Build.0 = Debug|Win32 - {130500EB-4D99-8612-2E09-0E8C4822A5CA}.Debug|x64.Build.0 = Debug|x64 - {130500EB-4D99-8612-2E09-0E8C4822A5CA}.Release|Win32.Build.0 = Release|Win32 - {130500EB-4D99-8612-2E09-0E8C4822A5CA}.Release|x64.Build.0 = Release|x64 - {130500EB-4D99-8612-2E09-0E8C4822A5CA}.Debug-DLL|Win32.ActiveCfg = Debug|Win32 - {130500EB-4D99-8612-2E09-0E8C4822A5CA}.Debug-DLL|Win32.Build.0 = Debug|Win32 - {130500EB-4D99-8612-2E09-0E8C4822A5CA}.Debug-DLL|x64.ActiveCfg = Debug|x64 - {130500EB-4D99-8612-2E09-0E8C4822A5CA}.Debug-DLL|x64.Build.0 = Debug|x64 - {130500EB-4D99-8612-2E09-0E8C4822A5CA}.Release-DLL|Win32.ActiveCfg = Release|Win32 - {130500EB-4D99-8612-2E09-0E8C4822A5CA}.Release-DLL|Win32.Build.0 = Release|Win32 - {130500EB-4D99-8612-2E09-0E8C4822A5CA}.Release-DLL|x64.ActiveCfg = Release|x64 - {130500EB-4D99-8612-2E09-0E8C4822A5CA}.Release-DLL|x64.Build.0 = Release|x64 {216FDCB2-9D93-0D86-F0F1-12E16312A191}.Debug|Win32.ActiveCfg = Debug|Win32 {216FDCB2-9D93-0D86-F0F1-12E16312A191}.Debug|x64.ActiveCfg = Debug|x64 {216FDCB2-9D93-0D86-F0F1-12E16312A191}.Release|Win32.ActiveCfg = Release|Win32 @@ -24452,70 +24379,6 @@ Global {9E0A2239-20D5-DB2D-CA0D-69F24E3416E7}.Release-DLL|Win32.Build.0 = Release|Win32 {9E0A2239-20D5-DB2D-CA0D-69F24E3416E7}.Release-DLL|x64.ActiveCfg = Release|x64 {9E0A2239-20D5-DB2D-CA0D-69F24E3416E7}.Release-DLL|x64.Build.0 = Release|x64 - {4A564483-1758-BF26-4313-165DA57247E1}.Debug|Win32.ActiveCfg = Debug|Win32 - {4A564483-1758-BF26-4313-165DA57247E1}.Debug|x64.ActiveCfg = Debug|x64 - {4A564483-1758-BF26-4313-165DA57247E1}.Release|Win32.ActiveCfg = Release|Win32 - {4A564483-1758-BF26-4313-165DA57247E1}.Release|x64.ActiveCfg = Release|x64 - {4A564483-1758-BF26-4313-165DA57247E1}.Debug|Win32.Build.0 = Debug|Win32 - {4A564483-1758-BF26-4313-165DA57247E1}.Debug|x64.Build.0 = Debug|x64 - {4A564483-1758-BF26-4313-165DA57247E1}.Release|Win32.Build.0 = Release|Win32 - {4A564483-1758-BF26-4313-165DA57247E1}.Release|x64.Build.0 = Release|x64 - {4A564483-1758-BF26-4313-165DA57247E1}.Debug-DLL|Win32.ActiveCfg = Debug|Win32 - {4A564483-1758-BF26-4313-165DA57247E1}.Debug-DLL|Win32.Build.0 = Debug|Win32 - {4A564483-1758-BF26-4313-165DA57247E1}.Debug-DLL|x64.ActiveCfg = Debug|x64 - {4A564483-1758-BF26-4313-165DA57247E1}.Debug-DLL|x64.Build.0 = Debug|x64 - {4A564483-1758-BF26-4313-165DA57247E1}.Release-DLL|Win32.ActiveCfg = Release|Win32 - {4A564483-1758-BF26-4313-165DA57247E1}.Release-DLL|Win32.Build.0 = Release|Win32 - {4A564483-1758-BF26-4313-165DA57247E1}.Release-DLL|x64.ActiveCfg = Release|x64 - {4A564483-1758-BF26-4313-165DA57247E1}.Release-DLL|x64.Build.0 = Release|x64 - {B714D4BC-3986-69FA-02C8-772C04AD3CD4}.Debug|Win32.ActiveCfg = Debug|Win32 - {B714D4BC-3986-69FA-02C8-772C04AD3CD4}.Debug|x64.ActiveCfg = Debug|x64 - {B714D4BC-3986-69FA-02C8-772C04AD3CD4}.Release|Win32.ActiveCfg = Release|Win32 - {B714D4BC-3986-69FA-02C8-772C04AD3CD4}.Release|x64.ActiveCfg = Release|x64 - {B714D4BC-3986-69FA-02C8-772C04AD3CD4}.Debug|Win32.Build.0 = Debug|Win32 - {B714D4BC-3986-69FA-02C8-772C04AD3CD4}.Debug|x64.Build.0 = Debug|x64 - {B714D4BC-3986-69FA-02C8-772C04AD3CD4}.Release|Win32.Build.0 = Release|Win32 - {B714D4BC-3986-69FA-02C8-772C04AD3CD4}.Release|x64.Build.0 = Release|x64 - {B714D4BC-3986-69FA-02C8-772C04AD3CD4}.Debug-DLL|Win32.ActiveCfg = Debug|Win32 - {B714D4BC-3986-69FA-02C8-772C04AD3CD4}.Debug-DLL|Win32.Build.0 = Debug|Win32 - {B714D4BC-3986-69FA-02C8-772C04AD3CD4}.Debug-DLL|x64.ActiveCfg = Debug|x64 - {B714D4BC-3986-69FA-02C8-772C04AD3CD4}.Debug-DLL|x64.Build.0 = Debug|x64 - {B714D4BC-3986-69FA-02C8-772C04AD3CD4}.Release-DLL|Win32.ActiveCfg = Release|Win32 - {B714D4BC-3986-69FA-02C8-772C04AD3CD4}.Release-DLL|Win32.Build.0 = Release|Win32 - {B714D4BC-3986-69FA-02C8-772C04AD3CD4}.Release-DLL|x64.ActiveCfg = Release|x64 - {B714D4BC-3986-69FA-02C8-772C04AD3CD4}.Release-DLL|x64.Build.0 = Release|x64 - {FC99C9DC-F81B-8813-FBE4-1A5EC9F7990A}.Debug|Win32.ActiveCfg = Debug|Win32 - {FC99C9DC-F81B-8813-FBE4-1A5EC9F7990A}.Debug|x64.ActiveCfg = Debug|x64 - {FC99C9DC-F81B-8813-FBE4-1A5EC9F7990A}.Release|Win32.ActiveCfg = Release|Win32 - {FC99C9DC-F81B-8813-FBE4-1A5EC9F7990A}.Release|x64.ActiveCfg = Release|x64 - {FC99C9DC-F81B-8813-FBE4-1A5EC9F7990A}.Debug|Win32.Build.0 = Debug|Win32 - {FC99C9DC-F81B-8813-FBE4-1A5EC9F7990A}.Debug|x64.Build.0 = Debug|x64 - {FC99C9DC-F81B-8813-FBE4-1A5EC9F7990A}.Release|Win32.Build.0 = Release|Win32 - {FC99C9DC-F81B-8813-FBE4-1A5EC9F7990A}.Release|x64.Build.0 = Release|x64 - {FC99C9DC-F81B-8813-FBE4-1A5EC9F7990A}.Debug-DLL|Win32.ActiveCfg = Debug|Win32 - {FC99C9DC-F81B-8813-FBE4-1A5EC9F7990A}.Debug-DLL|Win32.Build.0 = Debug|Win32 - {FC99C9DC-F81B-8813-FBE4-1A5EC9F7990A}.Debug-DLL|x64.ActiveCfg = Debug|x64 - {FC99C9DC-F81B-8813-FBE4-1A5EC9F7990A}.Debug-DLL|x64.Build.0 = Debug|x64 - {FC99C9DC-F81B-8813-FBE4-1A5EC9F7990A}.Release-DLL|Win32.ActiveCfg = Release|Win32 - {FC99C9DC-F81B-8813-FBE4-1A5EC9F7990A}.Release-DLL|Win32.Build.0 = Release|Win32 - {FC99C9DC-F81B-8813-FBE4-1A5EC9F7990A}.Release-DLL|x64.ActiveCfg = Release|x64 - {FC99C9DC-F81B-8813-FBE4-1A5EC9F7990A}.Release-DLL|x64.Build.0 = Release|x64 - {91BF44F8-3962-72E9-AD55-F59027BE28D5}.Debug|Win32.ActiveCfg = Debug|Win32 - {91BF44F8-3962-72E9-AD55-F59027BE28D5}.Debug|x64.ActiveCfg = Debug|x64 - {91BF44F8-3962-72E9-AD55-F59027BE28D5}.Release|Win32.ActiveCfg = Release|Win32 - {91BF44F8-3962-72E9-AD55-F59027BE28D5}.Release|x64.ActiveCfg = Release|x64 - {91BF44F8-3962-72E9-AD55-F59027BE28D5}.Debug|Win32.Build.0 = Debug|Win32 - {91BF44F8-3962-72E9-AD55-F59027BE28D5}.Debug|x64.Build.0 = Debug|x64 - {91BF44F8-3962-72E9-AD55-F59027BE28D5}.Release|Win32.Build.0 = Release|Win32 - {91BF44F8-3962-72E9-AD55-F59027BE28D5}.Release|x64.Build.0 = Release|x64 - {91BF44F8-3962-72E9-AD55-F59027BE28D5}.Debug-DLL|Win32.ActiveCfg = Debug|Win32 - {91BF44F8-3962-72E9-AD55-F59027BE28D5}.Debug-DLL|Win32.Build.0 = Debug|Win32 - {91BF44F8-3962-72E9-AD55-F59027BE28D5}.Debug-DLL|x64.ActiveCfg = Debug|x64 - {91BF44F8-3962-72E9-AD55-F59027BE28D5}.Debug-DLL|x64.Build.0 = Debug|x64 - {91BF44F8-3962-72E9-AD55-F59027BE28D5}.Release-DLL|Win32.ActiveCfg = Release|Win32 - {91BF44F8-3962-72E9-AD55-F59027BE28D5}.Release-DLL|Win32.Build.0 = Release|Win32 - {91BF44F8-3962-72E9-AD55-F59027BE28D5}.Release-DLL|x64.ActiveCfg = Release|x64 - {91BF44F8-3962-72E9-AD55-F59027BE28D5}.Release-DLL|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/vsprojects/vcxproj/test/bad_ssl_alpn_server/bad_ssl_alpn_server.vcxproj b/vsprojects/vcxproj/test/bad_ssl_alpn_server/bad_ssl_alpn_server.vcxproj deleted file mode 100644 index 4bcab38d5d..0000000000 --- a/vsprojects/vcxproj/test/bad_ssl_alpn_server/bad_ssl_alpn_server.vcxproj +++ /dev/null @@ -1,190 +0,0 @@ - - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {4A564483-1758-BF26-4313-165DA57247E1} - - - - v100 - - - v110 - - - v120 - - - v140 - - - Application - true - Unicode - - - Application - false - true - Unicode - - - - - - - - - - - - - - bad_ssl_alpn_server - static - Debug - Debug - - - bad_ssl_alpn_server - static - Debug - Debug - - - - NotUsing - Level3 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - MultiThreadedDebug - true - None - - - Console - true - false - - - - - NotUsing - Level3 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - MultiThreadedDebug - true - None - - - Console - true - false - - - - - Level3 - NotUsing - MaxSpeed - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - MultiThreaded - true - None - - - Console - true - false - true - true - - - - - Level3 - NotUsing - MaxSpeed - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - MultiThreaded - true - None - - - Console - true - false - true - true - - - - - - - - - {130500EB-4D99-8612-2E09-0E8C4822A5CA} - - - {17BCAFC0-5FDC-4C94-AEB9-95F3E220614B} - - - {29D16885-7228-4C31-81ED-5F9187C7F2A9} - - - {EAB0A629-17A9-44DB-B5FF-E91A721FE037} - - - {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} - - - - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - diff --git a/vsprojects/vcxproj/test/bad_ssl_alpn_server/bad_ssl_alpn_server.vcxproj.filters b/vsprojects/vcxproj/test/bad_ssl_alpn_server/bad_ssl_alpn_server.vcxproj.filters deleted file mode 100644 index 8981f22518..0000000000 --- a/vsprojects/vcxproj/test/bad_ssl_alpn_server/bad_ssl_alpn_server.vcxproj.filters +++ /dev/null @@ -1,24 +0,0 @@ - - - - - test\core\bad_ssl\servers - - - - - - {46585720-9cbd-8186-fbe6-f86d12c635eb} - - - {69b48dc7-0e39-1f4a-a078-bb940c430af5} - - - {9a87a4d3-e721-5dc3-6758-c4e02043e949} - - - {9cbeb58d-02e2-fb46-3cb1-65e95d018b63} - - - - diff --git a/vsprojects/vcxproj/test/bad_ssl_alpn_test/bad_ssl_alpn_test.vcxproj b/vsprojects/vcxproj/test/bad_ssl_alpn_test/bad_ssl_alpn_test.vcxproj deleted file mode 100644 index 9f1fa11e59..0000000000 --- a/vsprojects/vcxproj/test/bad_ssl_alpn_test/bad_ssl_alpn_test.vcxproj +++ /dev/null @@ -1,187 +0,0 @@ - - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {FC99C9DC-F81B-8813-FBE4-1A5EC9F7990A} - - - - v100 - - - v110 - - - v120 - - - v140 - - - Application - true - Unicode - - - Application - false - true - Unicode - - - - - - - - - - - - - - bad_ssl_alpn_test - static - Debug - Debug - - - bad_ssl_alpn_test - static - Debug - Debug - - - - NotUsing - Level3 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - MultiThreadedDebug - true - None - - - Console - true - false - - - - - NotUsing - Level3 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - MultiThreadedDebug - true - None - - - Console - true - false - - - - - Level3 - NotUsing - MaxSpeed - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - MultiThreaded - true - None - - - Console - true - false - true - true - - - - - Level3 - NotUsing - MaxSpeed - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - MultiThreaded - true - None - - - Console - true - false - true - true - - - - - - - - - {17BCAFC0-5FDC-4C94-AEB9-95F3E220614B} - - - {29D16885-7228-4C31-81ED-5F9187C7F2A9} - - - {EAB0A629-17A9-44DB-B5FF-E91A721FE037} - - - {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} - - - - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - diff --git a/vsprojects/vcxproj/test/bad_ssl_alpn_test/bad_ssl_alpn_test.vcxproj.filters b/vsprojects/vcxproj/test/bad_ssl_alpn_test/bad_ssl_alpn_test.vcxproj.filters deleted file mode 100644 index 26fe9591de..0000000000 --- a/vsprojects/vcxproj/test/bad_ssl_alpn_test/bad_ssl_alpn_test.vcxproj.filters +++ /dev/null @@ -1,21 +0,0 @@ - - - - - test\core\bad_ssl - - - - - - {70dffa16-29db-dc67-e223-2624397b8cf1} - - - {03b6796a-eb90-28af-7e3f-00a4d60ee2e0} - - - {7037085d-8259-2b62-1bd5-ebd9cbc3740e} - - - - diff --git a/vsprojects/vcxproj/test/bad_ssl_cert_server/bad_ssl_cert_server.vcxproj b/vsprojects/vcxproj/test/bad_ssl_cert_server/bad_ssl_cert_server.vcxproj deleted file mode 100644 index 2f7ed45ecd..0000000000 --- a/vsprojects/vcxproj/test/bad_ssl_cert_server/bad_ssl_cert_server.vcxproj +++ /dev/null @@ -1,190 +0,0 @@ - - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {B714D4BC-3986-69FA-02C8-772C04AD3CD4} - - - - v100 - - - v110 - - - v120 - - - v140 - - - Application - true - Unicode - - - Application - false - true - Unicode - - - - - - - - - - - - - - bad_ssl_cert_server - static - Debug - Debug - - - bad_ssl_cert_server - static - Debug - Debug - - - - NotUsing - Level3 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - MultiThreadedDebug - true - None - - - Console - true - false - - - - - NotUsing - Level3 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - MultiThreadedDebug - true - None - - - Console - true - false - - - - - Level3 - NotUsing - MaxSpeed - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - MultiThreaded - true - None - - - Console - true - false - true - true - - - - - Level3 - NotUsing - MaxSpeed - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - MultiThreaded - true - None - - - Console - true - false - true - true - - - - - - - - - {130500EB-4D99-8612-2E09-0E8C4822A5CA} - - - {17BCAFC0-5FDC-4C94-AEB9-95F3E220614B} - - - {29D16885-7228-4C31-81ED-5F9187C7F2A9} - - - {EAB0A629-17A9-44DB-B5FF-E91A721FE037} - - - {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} - - - - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - diff --git a/vsprojects/vcxproj/test/bad_ssl_cert_server/bad_ssl_cert_server.vcxproj.filters b/vsprojects/vcxproj/test/bad_ssl_cert_server/bad_ssl_cert_server.vcxproj.filters deleted file mode 100644 index 6ea568947a..0000000000 --- a/vsprojects/vcxproj/test/bad_ssl_cert_server/bad_ssl_cert_server.vcxproj.filters +++ /dev/null @@ -1,24 +0,0 @@ - - - - - test\core\bad_ssl\servers - - - - - - {72cd95ad-e6f1-b1c7-655d-d7d816c03259} - - - {8533f4a8-8430-5f9c-8702-a230a6c04d04} - - - {6c2d6d20-9a60-17b3-a6a3-4b6fbe3effe7} - - - {552f15cb-1bab-1205-4e7c-15eb5ffe97fe} - - - - diff --git a/vsprojects/vcxproj/test/bad_ssl_cert_test/bad_ssl_cert_test.vcxproj b/vsprojects/vcxproj/test/bad_ssl_cert_test/bad_ssl_cert_test.vcxproj deleted file mode 100644 index 082ab5375a..0000000000 --- a/vsprojects/vcxproj/test/bad_ssl_cert_test/bad_ssl_cert_test.vcxproj +++ /dev/null @@ -1,187 +0,0 @@ - - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {91BF44F8-3962-72E9-AD55-F59027BE28D5} - - - - v100 - - - v110 - - - v120 - - - v140 - - - Application - true - Unicode - - - Application - false - true - Unicode - - - - - - - - - - - - - - bad_ssl_cert_test - static - Debug - Debug - - - bad_ssl_cert_test - static - Debug - Debug - - - - NotUsing - Level3 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - MultiThreadedDebug - true - None - - - Console - true - false - - - - - NotUsing - Level3 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - MultiThreadedDebug - true - None - - - Console - true - false - - - - - Level3 - NotUsing - MaxSpeed - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - MultiThreaded - true - None - - - Console - true - false - true - true - - - - - Level3 - NotUsing - MaxSpeed - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - MultiThreaded - true - None - - - Console - true - false - true - true - - - - - - - - - {17BCAFC0-5FDC-4C94-AEB9-95F3E220614B} - - - {29D16885-7228-4C31-81ED-5F9187C7F2A9} - - - {EAB0A629-17A9-44DB-B5FF-E91A721FE037} - - - {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} - - - - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - diff --git a/vsprojects/vcxproj/test/bad_ssl_cert_test/bad_ssl_cert_test.vcxproj.filters b/vsprojects/vcxproj/test/bad_ssl_cert_test/bad_ssl_cert_test.vcxproj.filters deleted file mode 100644 index 05d33fbf3d..0000000000 --- a/vsprojects/vcxproj/test/bad_ssl_cert_test/bad_ssl_cert_test.vcxproj.filters +++ /dev/null @@ -1,21 +0,0 @@ - - - - - test\core\bad_ssl - - - - - - {b6ea6839-5a07-7f4e-5aa1-d9a539242819} - - - {319e351a-5f49-c9b4-3451-136a5bd45590} - - - {22d3b7fa-9050-c4e0-c759-97a0009df9f1} - - - - diff --git a/vsprojects/vcxproj/test/bad_ssl_test_server/bad_ssl_test_server.vcxproj b/vsprojects/vcxproj/test/bad_ssl_test_server/bad_ssl_test_server.vcxproj deleted file mode 100644 index 82b2d56bd2..0000000000 --- a/vsprojects/vcxproj/test/bad_ssl_test_server/bad_ssl_test_server.vcxproj +++ /dev/null @@ -1,169 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {130500EB-4D99-8612-2E09-0E8C4822A5CA} - - - - v100 - - - v110 - - - v120 - - - v140 - - - StaticLibrary - true - Unicode - - - StaticLibrary - false - true - Unicode - - - - - - - - - - - - bad_ssl_test_server - - - bad_ssl_test_server - - - - NotUsing - Level3 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - MultiThreadedDebug - true - None - - - Windows - true - false - - - - - NotUsing - Level3 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - MultiThreadedDebug - true - None - - - Windows - true - false - - - - - Level3 - NotUsing - MaxSpeed - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - MultiThreaded - true - None - - - Windows - true - false - true - true - - - - - Level3 - NotUsing - MaxSpeed - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - MultiThreaded - true - None - - - Windows - true - false - true - true - - - - - - - - - - - - {17BCAFC0-5FDC-4C94-AEB9-95F3E220614B} - - - {29D16885-7228-4C31-81ED-5F9187C7F2A9} - - - {EAB0A629-17A9-44DB-B5FF-E91A721FE037} - - - {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} - - - - - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - diff --git a/vsprojects/vcxproj/test/bad_ssl_test_server/bad_ssl_test_server.vcxproj.filters b/vsprojects/vcxproj/test/bad_ssl_test_server/bad_ssl_test_server.vcxproj.filters deleted file mode 100644 index d27deef12c..0000000000 --- a/vsprojects/vcxproj/test/bad_ssl_test_server/bad_ssl_test_server.vcxproj.filters +++ /dev/null @@ -1,26 +0,0 @@ - - - - - test\core\bad_ssl - - - - - test\core\bad_ssl - - - - - - {1865eb72-0af1-6982-24d1-2df17b6753ec} - - - {efb5f7cd-d3e2-4eda-5499-122cafc3b618} - - - {44d3081e-b878-1d71-d19e-9462750275e4} - - - - -- cgit v1.2.3 From 7d408487fa1127dd868bdedd0baebc671ebed1cc Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Mon, 14 Dec 2015 15:12:34 -0800 Subject: clang-format --- test/core/bad_ssl/server.c | 8 ++++---- test/core/bad_ssl/servers/alpn.c | 10 +++++----- test/core/bad_ssl/servers/cert.c | 10 +++++----- 3 files changed, 14 insertions(+), 14 deletions(-) (limited to 'test/core') diff --git a/test/core/bad_ssl/server.c b/test/core/bad_ssl/server.c index 378929712c..c2ad337306 100644 --- a/test/core/bad_ssl/server.c +++ b/test/core/bad_ssl/server.c @@ -57,8 +57,8 @@ void bad_ssl_run(grpc_server *server) { int shutdown_started = 0; int shutdown_finished = 0; grpc_event ev; - - grpc_completion_queue *cq = grpc_completion_queue_create(NULL); + + grpc_completion_queue *cq = grpc_completion_queue_create(NULL); grpc_server_register_completion_queue(server, cq, NULL); grpc_server_start(server); @@ -79,8 +79,8 @@ void bad_ssl_run(grpc_server *server) { NULL); switch (ev.type) { case GRPC_OP_COMPLETE: - GPR_UNREACHABLE_CODE(gpr_log(GPR_DEBUG, "GRPC_OP_COMPLETE")); - break; + GPR_UNREACHABLE_CODE(gpr_log(GPR_DEBUG, "GRPC_OP_COMPLETE")); + break; case GRPC_QUEUE_SHUTDOWN: GPR_ASSERT(shutdown_started); shutdown_finished = 1; diff --git a/test/core/bad_ssl/servers/alpn.c b/test/core/bad_ssl/servers/alpn.c index 29cddf9b9d..a4e117db73 100644 --- a/test/core/bad_ssl/servers/alpn.c +++ b/test/core/bad_ssl/servers/alpn.c @@ -64,12 +64,12 @@ 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 = grpc_ssl_server_credentials_create( - NULL, &pem_key_cert_pair, 1, 0, NULL); + grpc_init(); + ssl_creds = + grpc_ssl_server_credentials_create(NULL, &pem_key_cert_pair, 1, 0, NULL); server = grpc_server_create(NULL, NULL); GPR_ASSERT(grpc_server_add_secure_http2_port(server, addr, ssl_creds)); grpc_server_credentials_release(ssl_creds); diff --git a/test/core/bad_ssl/servers/cert.c b/test/core/bad_ssl/servers/cert.c index d115592fbe..8a294c8fe3 100644 --- a/test/core/bad_ssl/servers/cert.c +++ b/test/core/bad_ssl/servers/cert.c @@ -46,12 +46,12 @@ 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; gpr_slice cert_slice, key_slice; int ok; - grpc_init(); + grpc_init(); cert_slice = gpr_load_file("src/core/tsi/test_creds/badserver.pem", 1, &ok); GPR_ASSERT(ok); @@ -60,8 +60,8 @@ int main(int argc, char **argv) { pem_key_cert_pair.private_key = (const char *)GPR_SLICE_START_PTR(key_slice); pem_key_cert_pair.cert_chain = (const char *)GPR_SLICE_START_PTR(cert_slice); - ssl_creds = grpc_ssl_server_credentials_create( - NULL, &pem_key_cert_pair, 1, 0, NULL); + ssl_creds = + grpc_ssl_server_credentials_create(NULL, &pem_key_cert_pair, 1, 0, NULL); server = grpc_server_create(NULL, NULL); GPR_ASSERT(grpc_server_add_secure_http2_port(server, addr, ssl_creds)); grpc_server_credentials_release(ssl_creds); -- cgit v1.2.3 From 172895c2a9444ce356d408a2fc5091a965a921c2 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Mon, 14 Dec 2015 15:23:46 -0800 Subject: Add documentation --- test/core/bad_ssl/server.c | 5 +++++ test/core/bad_ssl/servers/alpn.c | 5 +++++ test/core/bad_ssl/servers/cert.c | 3 +++ 3 files changed, 13 insertions(+) (limited to 'test/core') diff --git a/test/core/bad_ssl/server.c b/test/core/bad_ssl/server.c index c2ad337306..43312f1577 100644 --- a/test/core/bad_ssl/server.c +++ b/test/core/bad_ssl/server.c @@ -38,6 +38,11 @@ #include "test/core/bad_ssl/server.h" #include "test/core/util/test_config.h" +/* Common server implementation details for all servers in servers/. + * There's nothing *wrong* with these servers per-se, but they are + * configured to cause some failure case in the SSL connection path. + */ + static int got_sigint = 0; static void sigint_handler(int x) { got_sigint = 1; } diff --git a/test/core/bad_ssl/servers/alpn.c b/test/core/bad_ssl/servers/alpn.c index a4e117db73..7d70690e52 100644 --- a/test/core/bad_ssl/servers/alpn.c +++ b/test/core/bad_ssl/servers/alpn.c @@ -38,9 +38,14 @@ #include #include +#include "src/core/transport/chttp2/alpn.h" #include "test/core/bad_ssl/server.h" #include "test/core/end2end/data/ssl_test_data.h" +/* This test starts a server that is configured to advertise (via alpn and npn) + * 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"}; int grpc_chttp2_is_alpn_version_supported(const char *version, size_t size) { diff --git a/test/core/bad_ssl/servers/cert.c b/test/core/bad_ssl/servers/cert.c index 8a294c8fe3..d67a6ca1d4 100644 --- a/test/core/bad_ssl/servers/cert.c +++ b/test/core/bad_ssl/servers/cert.c @@ -43,6 +43,9 @@ #include "test/core/bad_ssl/server.h" #include "test/core/end2end/data/ssl_test_data.h" +/* 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); grpc_ssl_pem_key_cert_pair pem_key_cert_pair; -- cgit v1.2.3 From ff1e2aa6bd95648f5f612a0d4713bba54df0f351 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Mon, 14 Dec 2015 15:36:54 -0800 Subject: Ensure test fails if SSL connection succeeds --- src/core/transport/chttp2/alpn.c | 2 +- test/core/bad_ssl/bad_ssl_test.c | 2 +- test/core/bad_ssl/server.c | 21 +++++++++++++++++++-- test/core/bad_ssl/servers/alpn.c | 2 +- 4 files changed, 22 insertions(+), 5 deletions(-) (limited to 'test/core') diff --git a/src/core/transport/chttp2/alpn.c b/src/core/transport/chttp2/alpn.c index 69da4e6718..cf2079953f 100644 --- a/src/core/transport/chttp2/alpn.c +++ b/src/core/transport/chttp2/alpn.c @@ -36,7 +36,7 @@ #include /* in order of preference */ -static const char *const supported_versions[] = {"h2"}; +static const char *const supported_versions[] = {"not-h2"}; int grpc_chttp2_is_alpn_version_supported(const char *version, size_t size) { size_t i; diff --git a/test/core/bad_ssl/bad_ssl_test.c b/test/core/bad_ssl/bad_ssl_test.c index 08ab482c58..54ac6d0e1c 100644 --- a/test/core/bad_ssl/bad_ssl_test.c +++ b/test/core/bad_ssl/bad_ssl_test.c @@ -163,7 +163,7 @@ int main(int argc, char **argv) { grpc_shutdown(); } gpr_free(args[2]); - + gpr_subprocess_interrupt(svr); status = gpr_subprocess_join(svr); gpr_subprocess_destroy(svr); diff --git a/test/core/bad_ssl/server.c b/test/core/bad_ssl/server.c index 43312f1577..2ed94de099 100644 --- a/test/core/bad_ssl/server.c +++ b/test/core/bad_ssl/server.c @@ -62,11 +62,23 @@ 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_details call_details; + grpc_metadata_array request_metadata_recv; grpc_completion_queue *cq = grpc_completion_queue_create(NULL); + + grpc_call_details_init(&call_details); + grpc_metadata_array_init(&request_metadata_recv); + grpc_server_register_completion_queue(server, cq, NULL); grpc_server_start(server); + error = + grpc_server_request_call(server, &s, &call_details, + &request_metadata_recv, cq, cq, (void*)1); + GPR_ASSERT(GRPC_CALL_OK == error); + signal(SIGINT, sigint_handler); while (!shutdown_finished) { if (got_sigint && !shutdown_started) { @@ -84,7 +96,8 @@ void bad_ssl_run(grpc_server *server) { NULL); switch (ev.type) { case GRPC_OP_COMPLETE: - GPR_UNREACHABLE_CODE(gpr_log(GPR_DEBUG, "GRPC_OP_COMPLETE")); + GPR_ASSERT(ev.tag == (void*)1); + GPR_ASSERT(ev.success == 0); break; case GRPC_QUEUE_SHUTDOWN: GPR_ASSERT(shutdown_started); @@ -94,4 +107,8 @@ void bad_ssl_run(grpc_server *server) { break; } } + + GPR_ASSERT(s == NULL); + grpc_call_details_destroy(&call_details); + grpc_metadata_array_destroy(&request_metadata_recv); } diff --git a/test/core/bad_ssl/servers/alpn.c b/test/core/bad_ssl/servers/alpn.c index 7d70690e52..2623a9e654 100644 --- a/test/core/bad_ssl/servers/alpn.c +++ b/test/core/bad_ssl/servers/alpn.c @@ -46,7 +46,7 @@ * 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[] = {"h2"}; int grpc_chttp2_is_alpn_version_supported(const char *version, size_t size) { size_t i; -- cgit v1.2.3 From 3a186e70c57d4be812435c29c54d0cd9fa49df5c Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Mon, 14 Dec 2015 16:01:41 -0800 Subject: Get the right ordering of h2, not-h2 --- src/core/transport/chttp2/alpn.c | 2 +- test/core/bad_ssl/servers/alpn.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'test/core') diff --git a/src/core/transport/chttp2/alpn.c b/src/core/transport/chttp2/alpn.c index cf2079953f..69da4e6718 100644 --- a/src/core/transport/chttp2/alpn.c +++ b/src/core/transport/chttp2/alpn.c @@ -36,7 +36,7 @@ #include /* in order of preference */ -static const char *const supported_versions[] = {"not-h2"}; +static const char *const supported_versions[] = {"h2"}; int grpc_chttp2_is_alpn_version_supported(const char *version, size_t size) { size_t i; diff --git a/test/core/bad_ssl/servers/alpn.c b/test/core/bad_ssl/servers/alpn.c index 2623a9e654..7d70690e52 100644 --- a/test/core/bad_ssl/servers/alpn.c +++ b/test/core/bad_ssl/servers/alpn.c @@ -46,7 +46,7 @@ * 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[] = {"h2"}; +static const char *const fake_versions[] = {"not-h2"}; int grpc_chttp2_is_alpn_version_supported(const char *version, size_t size) { size_t i; -- cgit v1.2.3 From af745d824ebee17ef17e501eb2d169a6054c9dfc Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Mon, 14 Dec 2015 20:49:37 -0800 Subject: Fix build --- test/core/httpcli/httpcli_test.c | 4 ++-- test/core/httpcli/httpscli_test.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'test/core') diff --git a/test/core/httpcli/httpcli_test.c b/test/core/httpcli/httpcli_test.c index fc51cb0101..612388c61d 100644 --- a/test/core/httpcli/httpcli_test.c +++ b/test/core/httpcli/httpcli_test.c @@ -151,11 +151,11 @@ int main(int argc, char **argv) { /* figure out where we are */ char *root; if (lslash) { - root = gpr_malloc(lslash - me + 1); + root = gpr_malloc((size_t)(lslash - me + 1)); memcpy(root, me, (size_t)(lslash - me)); root[lslash - me] = 0; } else { - root = strdup("."); + root = gpr_strdup("."); } gpr_asprintf(&args[0], "%s/../../test/core/httpcli/test_server.py", root); gpr_free(root); diff --git a/test/core/httpcli/httpscli_test.c b/test/core/httpcli/httpscli_test.c index 4cfa9e59b0..ba5660bd18 100644 --- a/test/core/httpcli/httpscli_test.c +++ b/test/core/httpcli/httpscli_test.c @@ -153,11 +153,11 @@ int main(int argc, char **argv) { /* figure out where we are */ char *root; if (lslash) { - root = gpr_malloc(lslash - me + 1); + root = gpr_malloc((size_t)(lslash - me + 1)); memcpy(root, me, (size_t)(lslash - me)); root[lslash - me] = 0; } else { - strcpy(root, "."); + root = gpr_strdup("."); } gpr_asprintf(&args[0], "%s/../../test/core/httpcli/test_server.py", root); gpr_free(root); -- cgit v1.2.3