diff options
author | Yash Tibrewal <yashkt@google.com> | 2017-12-08 09:30:40 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-08 09:30:40 -0800 |
commit | 94e676e10f8c739289924b8458a246699e3623ce (patch) | |
tree | e223fa15a4c6e22582771a456bfb58d844c96485 /src/core/lib/security/credentials/ssl/ssl_credentials.cc | |
parent | a25697095b39ce4014457a64c2917c5abadbe998 (diff) | |
parent | 9e5dc246eebdc3b7c7dc4d75f35d3697bee90d9a (diff) |
Merge pull request #13659 from grpc/revert-13658-revert-13058-execctx
Revert "Revert "All instances of exec_ctx being passed around in src/core removed""
Diffstat (limited to 'src/core/lib/security/credentials/ssl/ssl_credentials.cc')
-rw-r--r-- | src/core/lib/security/credentials/ssl/ssl_credentials.cc | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/src/core/lib/security/credentials/ssl/ssl_credentials.cc b/src/core/lib/security/credentials/ssl/ssl_credentials.cc index 39dd38cf88..d8546441c9 100644 --- a/src/core/lib/security/credentials/ssl/ssl_credentials.cc +++ b/src/core/lib/security/credentials/ssl/ssl_credentials.cc @@ -41,18 +41,16 @@ void grpc_tsi_ssl_pem_key_cert_pairs_destroy(tsi_ssl_pem_key_cert_pair* kp, gpr_free(kp); } -static void ssl_destruct(grpc_exec_ctx* exec_ctx, - grpc_channel_credentials* creds) { +static void ssl_destruct(grpc_channel_credentials* creds) { grpc_ssl_credentials* c = (grpc_ssl_credentials*)creds; gpr_free(c->config.pem_root_certs); grpc_tsi_ssl_pem_key_cert_pairs_destroy(c->config.pem_key_cert_pair, 1); } static grpc_security_status ssl_create_security_connector( - grpc_exec_ctx* exec_ctx, grpc_channel_credentials* creds, - grpc_call_credentials* call_creds, const char* target, - const grpc_channel_args* args, grpc_channel_security_connector** sc, - grpc_channel_args** new_args) { + grpc_channel_credentials* creds, grpc_call_credentials* call_creds, + const char* target, const grpc_channel_args* args, + grpc_channel_security_connector** sc, grpc_channel_args** new_args) { grpc_ssl_credentials* c = (grpc_ssl_credentials*)creds; grpc_security_status status = GRPC_SECURITY_OK; const char* overridden_target_name = nullptr; @@ -65,8 +63,7 @@ static grpc_security_status ssl_create_security_connector( } } status = grpc_ssl_channel_security_connector_create( - exec_ctx, creds, call_creds, &c->config, target, overridden_target_name, - sc); + creds, call_creds, &c->config, target, overridden_target_name, sc); if (status != GRPC_SECURITY_OK) { return status; } @@ -125,8 +122,7 @@ struct grpc_ssl_server_credentials_options { grpc_ssl_server_certificate_config_fetcher* certificate_config_fetcher; }; -static void ssl_server_destruct(grpc_exec_ctx* exec_ctx, - grpc_server_credentials* creds) { +static void ssl_server_destruct(grpc_server_credentials* creds) { grpc_ssl_server_credentials* c = (grpc_ssl_server_credentials*)creds; grpc_tsi_ssl_pem_key_cert_pairs_destroy(c->config.pem_key_cert_pairs, c->config.num_key_cert_pairs); @@ -134,9 +130,8 @@ static void ssl_server_destruct(grpc_exec_ctx* exec_ctx, } static grpc_security_status ssl_server_create_security_connector( - grpc_exec_ctx* exec_ctx, grpc_server_credentials* creds, - grpc_server_security_connector** sc) { - return grpc_ssl_server_security_connector_create(exec_ctx, creds, sc); + grpc_server_credentials* creds, grpc_server_security_connector** sc) { + return grpc_ssl_server_security_connector_create(creds, sc); } static grpc_server_credentials_vtable ssl_server_vtable = { |