diff options
| author |  yang-g <yangg@google.com> | 2016-11-08 13:42:43 -0800 |
|---|---|---|
| committer | yang-g <yangg@google.com> | 2016-11-08 13:42:43 -0800 |
| commit | aa0a5a2a6bed514eace895cc0afa7d94b2c6bae7 (patch) | |
| tree | 5200342d1a5a7aebd82a2947c44a414004fd4a20 /test/core/handshake/server_ssl.c | |
| parent | aed3cb454fde496e14395ef03da971c8df686af9 (diff) | |
| parent | 3b51f0b49296513c384e189b1d26648f5c608c92 (diff) | |
Merge remote-tracking branch 'upstream/master' into ssl_fuzzer
Diffstat (limited to 'test/core/handshake/server_ssl.c')
| -rw-r--r-- | test/core/handshake/server_ssl.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test/core/handshake/server_ssl.c b/test/core/handshake/server_ssl.c index 3e89f8e265..f39b0040a6 100644 --- a/test/core/handshake/server_ssl.c +++ b/test/core/handshake/server_ssl.c @@ -84,16 +84,16 @@ static void server_thread(void *arg) { // Load key pair and establish server SSL credentials. grpc_ssl_pem_key_cert_pair pem_key_cert_pair; - gpr_slice ca_slice, cert_slice, key_slice; + grpc_slice ca_slice, cert_slice, key_slice; GPR_ASSERT(GRPC_LOG_IF_ERROR("load_file", grpc_load_file(SSL_CA_PATH, 1, &ca_slice))); GPR_ASSERT(GRPC_LOG_IF_ERROR("load_file", grpc_load_file(SSL_CERT_PATH, 1, &cert_slice))); GPR_ASSERT(GRPC_LOG_IF_ERROR("load_file", grpc_load_file(SSL_KEY_PATH, 1, &key_slice))); - const char *ca_cert = (const char *)GPR_SLICE_START_PTR(ca_slice); - 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); + const char *ca_cert = (const char *)GRPC_SLICE_START_PTR(ca_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); grpc_server_credentials *ssl_creds = grpc_ssl_server_credentials_create( ca_cert, &pem_key_cert_pair, 1, 0, NULL); @@ -129,9 +129,9 @@ static void server_thread(void *arg) { grpc_server_destroy(server); grpc_completion_queue_destroy(cq); grpc_server_credentials_release(ssl_creds); - gpr_slice_unref(cert_slice); - gpr_slice_unref(key_slice); - gpr_slice_unref(ca_slice); + grpc_slice_unref(cert_slice); + grpc_slice_unref(key_slice); + grpc_slice_unref(ca_slice); } // This test launches a gRPC server on a separate thread and then establishes a |