From 64caf4d3dfa1aea9e299d5715b7907a7157690ac Mon Sep 17 00:00:00 2001 From: Yihua Zhang Date: Fri, 15 Mar 2019 12:57:25 -0700 Subject: [PATCH] fix clang-tidy errors --- .../tls/spiffe_security_connector.cc | 24 +++++++++---------- test/core/end2end/fixtures/h2_spiffe.cc | 6 ++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/core/lib/security/security_connector/tls/spiffe_security_connector.cc b/src/core/lib/security/security_connector/tls/spiffe_security_connector.cc index 075b1c9d53c..ebf9c905079 100644 --- a/src/core/lib/security/security_connector/tls/spiffe_security_connector.cc +++ b/src/core/lib/security/security_connector/tls/spiffe_security_connector.cc @@ -161,7 +161,7 @@ void SpiffeChannelSecurityConnector::check_peer( const grpc_tls_server_authorization_check_config* config = creds->options().server_authorization_check_config(); /* If server authorization config is not null, use it to perform - * server authorizaiton check. */ + * server authorization check. */ if (config != nullptr) { const tsi_peer_property* p = tsi_peer_get_property_by_name(&peer, TSI_X509_PEM_CERT_PROPERTY); @@ -254,17 +254,17 @@ SpiffeChannelSecurityConnector::InitializeHandshakerFactory( const SpiffeCredentials* creds = static_cast(channel_creds()); auto key_materials_config = PopulateSpiffeCredentials(creds->options()); - if (!key_materials_config.get()->pem_key_cert_pair_list().size()) { - key_materials_config.get()->Unref(); + if (key_materials_config->pem_key_cert_pair_list().empty()) { + key_materials_config->Unref(); return GRPC_SECURITY_ERROR; } tsi_ssl_pem_key_cert_pair* pem_key_cert_pair = ConvertToTsiPemKeyCertPair( - key_materials_config.get()->pem_key_cert_pair_list()); + key_materials_config->pem_key_cert_pair_list()); grpc_security_status status = grpc_ssl_tsi_client_handshaker_factory_init( - pem_key_cert_pair, key_materials_config.get()->pem_root_certs(), + pem_key_cert_pair, key_materials_config->pem_root_certs(), ssl_session_cache, &client_handshaker_factory_); // Free memory. - key_materials_config.get()->Unref(); + key_materials_config->Unref(); grpc_tsi_ssl_pem_key_cert_pairs_destroy(pem_key_cert_pair, 1); return status; } @@ -401,8 +401,8 @@ SpiffeServerSecurityConnector::RefreshServerHandshakerFactory() { auto key_materials_config = PopulateSpiffeCredentials(creds->options()); /* Credential reload does NOT take effect and we need to keep using * the existing handshaker factory. */ - if (key_materials_config.get()->pem_key_cert_pair_list().empty()) { - key_materials_config.get()->Unref(); + if (key_materials_config->pem_key_cert_pair_list().empty()) { + key_materials_config->Unref(); return GRPC_SECURITY_ERROR; } /* Credential reload takes effect and we need to free the existing @@ -411,15 +411,15 @@ SpiffeServerSecurityConnector::RefreshServerHandshakerFactory() { tsi_ssl_server_handshaker_factory_unref(server_handshaker_factory_); } tsi_ssl_pem_key_cert_pair* pem_key_cert_pairs = ConvertToTsiPemKeyCertPair( - key_materials_config.get()->pem_key_cert_pair_list()); + key_materials_config->pem_key_cert_pair_list()); size_t num_key_cert_pairs = - key_materials_config.get()->pem_key_cert_pair_list().size(); + key_materials_config->pem_key_cert_pair_list().size(); grpc_security_status status = grpc_ssl_tsi_server_handshaker_factory_init( pem_key_cert_pairs, num_key_cert_pairs, - key_materials_config.get()->pem_root_certs(), + key_materials_config->pem_root_certs(), creds->options().cert_request_type(), &server_handshaker_factory_); // Free memory. - key_materials_config.get()->Unref(); + key_materials_config->Unref(); grpc_tsi_ssl_pem_key_cert_pairs_destroy(pem_key_cert_pairs, num_key_cert_pairs); return status; diff --git a/test/core/end2end/fixtures/h2_spiffe.cc b/test/core/end2end/fixtures/h2_spiffe.cc index 3cd7c362212..9ab796ea429 100644 --- a/test/core/end2end/fixtures/h2_spiffe.cc +++ b/test/core/end2end/fixtures/h2_spiffe.cc @@ -111,7 +111,7 @@ static void server_authz_check_cb(void* user_data) { static_cast(user_data); GPR_ASSERT(check_arg != nullptr); // result = 1 indicates the server authorization check passes. - // Normally, the applicaiton code should resort to mapping information + // Normally, the application code should resort to mapping information // between server identity and target name to derive the result. // For this test, we directly return 1 for simplicity. check_arg->success = 1; @@ -143,7 +143,7 @@ static int client_cred_reload_sync(void* config_user_data, gpr_zalloc(sizeof(grpc_ssl_pem_key_cert_pair))); key_cert_pair[0]->private_key = gpr_strdup(test_server1_key); key_cert_pair[0]->cert_chain = gpr_strdup(test_server1_cert); - if (!arg->key_materials_config->pem_key_cert_pair_list().size()) { + if (arg->key_materials_config->pem_key_cert_pair_list().empty()) { grpc_tls_key_materials_config_set_key_materials( arg->key_materials_config, gpr_strdup(test_root_cert), (const grpc_ssl_pem_key_cert_pair**)key_cert_pair, 1); @@ -169,7 +169,7 @@ static int server_cred_reload_sync(void* config_user_data, GPR_ASSERT(arg->key_materials_config != nullptr); GPR_ASSERT(arg->key_materials_config->pem_key_cert_pair_list().data() != nullptr); - if (!arg->key_materials_config->pem_key_cert_pair_list().size()) { + if (arg->key_materials_config->pem_key_cert_pair_list().empty()) { grpc_tls_key_materials_config_set_key_materials( arg->key_materials_config, gpr_strdup(test_root_cert), (const grpc_ssl_pem_key_cert_pair**)key_cert_pair, 1);