Skip to content

Commit 5f347d3

Browse files
Rename release_validator to validation_cleanup (#2701)
Rename release_validator to validation_cleanup. The release_validator function does not actually release the validator. On iOS is does nothing and on Android it merely detaches the JVM from the current thread. So "cleanup validation" is a better description of it's function than "release validator" and matches the existing description "to clean up after validation completion." Signed-off-by: Ryan Hamilton rch@google.com
1 parent eacd174 commit 5f347d3

4 files changed

Lines changed: 7 additions & 7 deletions

File tree

library/common/extensions/cert_validator/platform_bridge/c_types.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ typedef envoy_cert_validation_result (*envoy_validate_cert_f)(const envoy_data*
2525
const char* host_name);
2626

2727
/**
28-
* Function signature for calling into platform APIs to clean up after validation completion.
28+
* Function signature for calling into platform APIs to clean up after validation is complete.
2929
*/
30-
typedef void (*envoy_release_validator_f)();
30+
typedef void (*envoy_validation_cleanup_f)();
3131

3232
#ifdef __cplusplus
3333
} // function pointers
@@ -38,5 +38,5 @@ typedef void (*envoy_release_validator_f)();
3838
*/
3939
typedef struct {
4040
envoy_validate_cert_f validate_cert;
41-
envoy_release_validator_f release_validator;
41+
envoy_validation_cleanup_f validation_cleanup;
4242
} envoy_cert_validator;

library/common/extensions/cert_validator/platform_bridge/platform_bridge_cert_validator.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ void PlatformBridgeCertValidator::PendingValidation::postVerifyResultAndCleanUp(
141141
"Finished platform cert validation for {}, post result callback to network thread",
142142
host_name_);
143143

144-
if (parent_.platform_validator_->release_validator) {
145-
parent_.platform_validator_->release_validator();
144+
if (parent_.platform_validator_->validation_cleanup) {
145+
parent_.platform_validator_->validation_cleanup();
146146
}
147147
std::weak_ptr<size_t> weak_alive_indicator(parent_.alive_indicator_);
148148

library/common/jni/android_network_utility.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,6 @@ static envoy_cert_validation_result verify_x509_cert_chain(const envoy_data* cer
144144
envoy_cert_validator* get_android_cert_validator_api() {
145145
envoy_cert_validator* api = (envoy_cert_validator*)safe_malloc(sizeof(envoy_cert_validator));
146146
api->validate_cert = verify_x509_cert_chain;
147-
api->release_validator = jvm_detach_thread;
147+
api->validation_cleanup = jvm_detach_thread;
148148
return api;
149149
}

library/common/network/apple_platform_cert_verifier.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ extern "C" {
111111
void register_apple_platform_cert_verifier() {
112112
envoy_cert_validator* api = (envoy_cert_validator*)safe_malloc(sizeof(envoy_cert_validator));
113113
api->validate_cert = verify_cert;
114-
api->release_validator = NULL;
114+
api->validation_cleanup = NULL;
115115
register_platform_api("platform_cert_validator", api);
116116
}
117117

0 commit comments

Comments
 (0)