From be82e64b3debcdb1d9ec6a149fc85af0d46bfb7e Mon Sep 17 00:00:00 2001 From: Noah Eisen Date: Fri, 9 Feb 2018 09:16:55 -0800 Subject: Autofix c casts to c++ casts --- .../lib/security/credentials/jwt/json_token.cc | 6 ++-- .../security/credentials/jwt/jwt_credentials.cc | 14 +++++----- .../lib/security/credentials/jwt/jwt_verifier.cc | 32 +++++++++++----------- 3 files changed, 26 insertions(+), 26 deletions(-) (limited to 'src/core/lib/security/credentials/jwt') diff --git a/src/core/lib/security/credentials/jwt/json_token.cc b/src/core/lib/security/credentials/jwt/json_token.cc index 078f04ed11..eae1be17fd 100644 --- a/src/core/lib/security/credentials/jwt/json_token.cc +++ b/src/core/lib/security/credentials/jwt/json_token.cc @@ -96,7 +96,7 @@ grpc_auth_json_key grpc_auth_json_key_create_from_json(const grpc_json* json) { } bio = BIO_new(BIO_s_mem()); success = BIO_puts(bio, prop_value); - if ((success < 0) || ((size_t)success != strlen(prop_value))) { + if ((success < 0) || (static_cast(success) != strlen(prop_value))) { gpr_log(GPR_ERROR, "Could not write into openssl BIO."); goto end; } @@ -219,7 +219,7 @@ static char* dot_concat_and_free_strings(char* str1, char* str2) { size_t str1_len = strlen(str1); size_t str2_len = strlen(str2); size_t result_len = str1_len + 1 /* dot */ + str2_len; - char* result = (char*)gpr_malloc(result_len + 1 /* NULL terminated */); + char* result = static_cast(gpr_malloc(result_len + 1 /* NULL terminated */)); char* current = result; memcpy(current, str1, str1_len); current += str1_len; @@ -271,7 +271,7 @@ char* compute_and_encode_signature(const grpc_auth_json_key* json_key, gpr_log(GPR_ERROR, "DigestFinal (get signature length) failed."); goto end; } - sig = (unsigned char*)gpr_malloc(sig_len); + sig = static_cast(gpr_malloc(sig_len)); if (EVP_DigestSignFinal(md_ctx, sig, &sig_len) != 1) { gpr_log(GPR_ERROR, "DigestFinal (signature compute) failed."); goto end; diff --git a/src/core/lib/security/credentials/jwt/jwt_credentials.cc b/src/core/lib/security/credentials/jwt/jwt_credentials.cc index 2404e860e4..44101acd78 100644 --- a/src/core/lib/security/credentials/jwt/jwt_credentials.cc +++ b/src/core/lib/security/credentials/jwt/jwt_credentials.cc @@ -42,7 +42,7 @@ static void jwt_reset_cache(grpc_service_account_jwt_access_credentials* c) { static void jwt_destruct(grpc_call_credentials* creds) { grpc_service_account_jwt_access_credentials* c = - (grpc_service_account_jwt_access_credentials*)creds; + reinterpret_cast(creds); grpc_auth_json_key_destruct(&c->key); jwt_reset_cache(c); gpr_mu_destroy(&c->cache_mu); @@ -55,7 +55,7 @@ static bool jwt_get_request_metadata(grpc_call_credentials* creds, grpc_closure* on_request_metadata, grpc_error** error) { grpc_service_account_jwt_access_credentials* c = - (grpc_service_account_jwt_access_credentials*)creds; + reinterpret_cast(creds); gpr_timespec refresh_threshold = gpr_time_from_seconds( GRPC_SECURE_TOKEN_REFRESH_THRESHOLD_SECS, GPR_TIMESPAN); @@ -123,8 +123,8 @@ grpc_service_account_jwt_access_credentials_create_from_auth_json_key( gpr_log(GPR_ERROR, "Invalid input for jwt credentials creation"); return nullptr; } - c = (grpc_service_account_jwt_access_credentials*)gpr_zalloc( - sizeof(grpc_service_account_jwt_access_credentials)); + c = static_cast(gpr_zalloc( + sizeof(grpc_service_account_jwt_access_credentials))); c->base.type = GRPC_CALL_CREDENTIALS_TYPE_JWT; gpr_ref_init(&c->base.refcount, 1); c->base.vtable = &jwt_vtable; @@ -133,7 +133,7 @@ grpc_service_account_jwt_access_credentials_create_from_auth_json_key( if (gpr_time_cmp(token_lifetime, max_token_lifetime) > 0) { gpr_log(GPR_INFO, "Cropping token lifetime to maximum allowed value (%d secs).", - (int)max_token_lifetime.tv_sec); + static_cast(max_token_lifetime.tv_sec)); token_lifetime = grpc_max_auth_token_lifetime(); } c->jwt_lifetime = token_lifetime; @@ -154,7 +154,7 @@ static char* redact_private_key(const char* json_key) { while (current) { if (current->type == GRPC_JSON_STRING && strcmp(current->key, "private_key") == 0) { - current->value = (char*)redacted; + current->value = const_cast(redacted); break; } current = current->next; @@ -177,7 +177,7 @@ grpc_call_credentials* grpc_service_account_jwt_access_credentials_create( ", tv_nsec: %d, clock_type: %d }, " "reserved=%p)", clean_json, token_lifetime.tv_sec, token_lifetime.tv_nsec, - (int)token_lifetime.clock_type, reserved); + static_cast(token_lifetime.clock_type), reserved); gpr_free(clean_json); } GPR_ASSERT(reserved == nullptr); diff --git a/src/core/lib/security/credentials/jwt/jwt_verifier.cc b/src/core/lib/security/credentials/jwt/jwt_verifier.cc index 8b22307944..3d7541f4c9 100644 --- a/src/core/lib/security/credentials/jwt/jwt_verifier.cc +++ b/src/core/lib/security/credentials/jwt/jwt_verifier.cc @@ -82,7 +82,7 @@ static grpc_json* parse_json_part_from_jwt(const char* str, size_t len, gpr_log(GPR_ERROR, "Invalid base64."); return nullptr; } - json = grpc_json_parse_string_with_len((char*)GRPC_SLICE_START_PTR(*buffer), + json = grpc_json_parse_string_with_len(reinterpret_castGRPC_SLICE_START_PTR(*buffer), GRPC_SLICE_LENGTH(*buffer)); if (json == nullptr) { grpc_slice_unref_internal(*buffer); @@ -129,7 +129,7 @@ static void jose_header_destroy(jose_header* h) { /* Takes ownership of json and buffer. */ static jose_header* jose_header_from_json(grpc_json* json, grpc_slice buffer) { grpc_json* cur; - jose_header* h = (jose_header*)gpr_zalloc(sizeof(jose_header)); + jose_header* h = static_cast(gpr_zalloc(sizeof(jose_header))); h->buffer = buffer; for (cur = json->child; cur != nullptr; cur = cur->next) { if (strcmp(cur->key, "alg") == 0) { @@ -231,7 +231,7 @@ gpr_timespec grpc_jwt_claims_not_before(const grpc_jwt_claims* claims) { grpc_jwt_claims* grpc_jwt_claims_from_json(grpc_json* json, grpc_slice buffer) { grpc_json* cur; grpc_jwt_claims* claims = - (grpc_jwt_claims*)gpr_malloc(sizeof(grpc_jwt_claims)); + static_cast(gpr_malloc(sizeof(grpc_jwt_claims))); memset(claims, 0, sizeof(grpc_jwt_claims)); claims->json = json; claims->buffer = buffer; @@ -347,7 +347,7 @@ static verifier_cb_ctx* verifier_cb_ctx_create( const char* signed_jwt, size_t signed_jwt_len, void* user_data, grpc_jwt_verification_done_cb cb) { grpc_core::ExecCtx exec_ctx; - verifier_cb_ctx* ctx = (verifier_cb_ctx*)gpr_zalloc(sizeof(verifier_cb_ctx)); + verifier_cb_ctx* ctx = static_cast(gpr_zalloc(sizeof(verifier_cb_ctx))); ctx->verifier = verifier; ctx->pollent = grpc_polling_entity_create_from_pollset(pollset); ctx->header = header; @@ -429,7 +429,7 @@ static EVP_PKEY* extract_pkey_from_x509(const char* x509_str) { BIO* bio = BIO_new(BIO_s_mem()); size_t len = strlen(x509_str); GPR_ASSERT(len < INT_MAX); - BIO_write(bio, x509_str, (int)len); + BIO_write(bio, x509_str, static_cast(len)); x509 = PEM_read_bio_X509(bio, nullptr, nullptr, nullptr); if (x509 == nullptr) { gpr_log(GPR_ERROR, "Unable to parse x509 cert."); @@ -625,7 +625,7 @@ end: } static void on_keys_retrieved(void* user_data, grpc_error* error) { - verifier_cb_ctx* ctx = (verifier_cb_ctx*)user_data; + verifier_cb_ctx* ctx = static_cast(user_data); grpc_json* json = json_from_http(&ctx->responses[HTTP_RESPONSE_KEYS]); EVP_PKEY* verification_key = nullptr; grpc_jwt_verifier_status status = GRPC_JWT_VERIFIER_GENERIC_ERROR; @@ -666,7 +666,7 @@ end: static void on_openid_config_retrieved(void* user_data, grpc_error* error) { const grpc_json* cur; - verifier_cb_ctx* ctx = (verifier_cb_ctx*)user_data; + verifier_cb_ctx* ctx = static_cast(user_data); const grpc_http_response* response = &ctx->responses[HTTP_RESPONSE_OPENID]; grpc_json* json = json_from_http(response); grpc_httpcli_request req; @@ -689,7 +689,7 @@ static void on_openid_config_retrieved(void* user_data, grpc_error* error) { jwks_uri += 8; req.handshaker = &grpc_httpcli_ssl; req.host = gpr_strdup(jwks_uri); - req.http.path = (char*)strchr(jwks_uri, '/'); + req.http.path = const_cast(strchr(jwks_uri, '/')); if (req.http.path == nullptr) { req.http.path = (char*)""; } else { @@ -754,8 +754,8 @@ const char* grpc_jwt_issuer_email_domain(const char* issuer) { if (dot == nullptr || dot == email_domain) return email_domain; GPR_ASSERT(dot > email_domain); /* There may be a subdomain, we just want the domain. */ - dot = (const char*)gpr_memrchr((void*)email_domain, '.', - (size_t)(dot - email_domain)); + dot = static_cast(gpr_memrchr((void*)email_domain, '.', + static_cast(dot - email_domain))); if (dot == nullptr) return email_domain; return dot + 1; } @@ -861,7 +861,7 @@ void grpc_jwt_verifier_verify(grpc_jwt_verifier* verifier, cb != nullptr); dot = strchr(cur, '.'); if (dot == nullptr) goto error; - json = parse_json_part_from_jwt(cur, (size_t)(dot - cur), &header_buffer); + json = parse_json_part_from_jwt(cur, static_cast(dot - cur), &header_buffer); if (json == nullptr) goto error; header = jose_header_from_json(json, header_buffer); if (header == nullptr) goto error; @@ -869,12 +869,12 @@ void grpc_jwt_verifier_verify(grpc_jwt_verifier* verifier, cur = dot + 1; dot = strchr(cur, '.'); if (dot == nullptr) goto error; - json = parse_json_part_from_jwt(cur, (size_t)(dot - cur), &claims_buffer); + json = parse_json_part_from_jwt(cur, static_cast(dot - cur), &claims_buffer); if (json == nullptr) goto error; claims = grpc_jwt_claims_from_json(json, claims_buffer); if (claims == nullptr) goto error; - signed_jwt_len = (size_t)(dot - jwt); + signed_jwt_len = static_cast(dot - jwt); cur = dot + 1; signature = grpc_base64_decode(cur, 1); if (GRPC_SLICE_IS_EMPTY(signature)) goto error; @@ -893,13 +893,13 @@ grpc_jwt_verifier* grpc_jwt_verifier_create( const grpc_jwt_verifier_email_domain_key_url_mapping* mappings, size_t num_mappings) { grpc_jwt_verifier* v = - (grpc_jwt_verifier*)gpr_zalloc(sizeof(grpc_jwt_verifier)); + static_cast(gpr_zalloc(sizeof(grpc_jwt_verifier))); grpc_httpcli_context_init(&v->http_ctx); /* We know at least of one mapping. */ v->allocated_mappings = 1 + num_mappings; - v->mappings = (email_key_mapping*)gpr_malloc(v->allocated_mappings * - sizeof(email_key_mapping)); + v->mappings = static_cast(gpr_malloc(v->allocated_mappings * + sizeof(email_key_mapping))); verifier_put_mapping(v, GRPC_GOOGLE_SERVICE_ACCOUNTS_EMAIL_DOMAIN, GRPC_GOOGLE_SERVICE_ACCOUNTS_KEY_URL_PREFIX); /* User-Provided mappings. */ -- cgit v1.2.3