diff options
| author |  Justin Burke <burkej@google.com> | 2017-10-03 18:09:41 -0700 |
|---|---|---|
| committer | Justin Burke <burkej@google.com> | 2017-10-23 15:08:45 -0700 |
| commit | 9b9a44e4dd1087a1cbdde3a3884cc7beea031d58 (patch) | |
| tree | 84203e2a9c563499fb3ffbda03176f5f5fb7e7d7 /src/core/lib/security/transport | |
| parent | c563b583cb9b7fecc33971581368796d2df4759d (diff) | |
Expose conversion of grpc to tsi cert pairs
Diffstat (limited to 'src/core/lib/security/transport')
| -rw-r--r-- | src/core/lib/security/transport/security_connector.cc | 7 | ||||
| -rw-r--r-- | src/core/lib/security/transport/security_connector.h | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/core/lib/security/transport/security_connector.cc b/src/core/lib/security/transport/security_connector.cc index 80d9a7b77f..b050be2129 100644 --- a/src/core/lib/security/transport/security_connector.cc +++ b/src/core/lib/security/transport/security_connector.cc @@ -942,10 +942,11 @@ grpc_security_status grpc_ssl_channel_security_connector_create( c->overridden_target_name = gpr_strdup(overridden_target_name); } - has_key_cert_pair = config->pem_key_cert_pair.private_key != NULL && - config->pem_key_cert_pair.cert_chain != NULL; + has_key_cert_pair = config->pem_key_cert_pair != NULL && + config->pem_key_cert_pair->private_key != NULL && + config->pem_key_cert_pair->cert_chain != NULL; result = tsi_create_ssl_client_handshaker_factory( - has_key_cert_pair ? &config->pem_key_cert_pair : NULL, pem_root_certs, + has_key_cert_pair ? config->pem_key_cert_pair : NULL, pem_root_certs, ssl_cipher_suites(), alpn_protocol_strings, (uint16_t)num_alpn_protocols, &c->client_handshaker_factory); if (result != TSI_OK) { diff --git a/src/core/lib/security/transport/security_connector.h b/src/core/lib/security/transport/security_connector.h index 216bb35e81..8287151f44 100644 --- a/src/core/lib/security/transport/security_connector.h +++ b/src/core/lib/security/transport/security_connector.h @@ -204,7 +204,7 @@ grpc_server_security_connector *grpc_fake_server_security_connector_create( /* Config for ssl clients. */ typedef struct { - tsi_ssl_pem_key_cert_pair pem_key_cert_pair; + tsi_ssl_pem_key_cert_pair *pem_key_cert_pair; char *pem_root_certs; } grpc_ssl_config; |