Add files to previous restore commit

pull/19778/head
Matthew Stevenson 5 years ago
parent b95e70ee1b
commit 853f95a7d5
  1. 2
      include/grpc/grpc_security.h
  2. 10
      include/grpcpp/security/tls_credentials_options.h
  3. 4
      src/core/lib/security/security_connector/ssl_utils.h

@ -819,6 +819,7 @@ struct grpc_tls_credential_reload_arg {
grpc_tls_key_materials_config* key_materials_config;
grpc_ssl_certificate_config_reload_status status;
const char* error_details;
grpc_tls_credential_reload_config* config;
};
/** Create a grpc_tls_credential_reload_config instance.
@ -881,6 +882,7 @@ struct grpc_tls_server_authorization_check_arg {
const char* peer_cert;
grpc_status_code status;
const char* error_details;
grpc_tls_server_authorization_check_arg* config;
};
/** Create a grpc_tls_server_authorization_check_config instance.

@ -75,7 +75,7 @@ class TlsCredentialReloadArg {
void* cb_user_data() const;
::std::shared_ptr<TlsKeyMaterialsConfig> key_materials_config() const;
grpc_ssl_certificate_config_reload_status status() const;
grpc::string error_details() const;
::std::shared_ptr<grpc::string> error_details() const;
/** Setters for member fields. **/
void set_cb_user_data(void* cb_user_data);
@ -144,10 +144,10 @@ class TlsServerAuthorizationCheckArg {
/** Getters for member fields. **/
void* cb_user_data() const;
int success() const;
grpc::string target_name() const;
grpc::string peer_cert() const;
::std::shared_ptr<grpc::string> target_name() const;
::std::shared_ptr<grpc::string> peer_cert() const;
grpc_status_code status() const;
grpc::string error_details() const;
::std::shared_ptr<grpc::string> error_details() const;
/** Setters for member fields. **/
void set_cb_user_data(void* cb_user_data);
@ -216,7 +216,7 @@ class TlsCredentialsOptions {
grpc_ssl_client_certificate_request_type cert_request_type() const {
return cert_request_type_;
}
std::shared_ptr<TlsKeyMaterialsConfig> key_materials_config() const {
::std::shared_ptr<TlsKeyMaterialsConfig> key_materials_config() const {
return key_materials_config_;
}
::std::shared_ptr<TlsCredentialReloadConfig> credential_reload_config()

@ -137,10 +137,6 @@ class PemKeyCertPair {
cert_chain_(const_cast<char*>(pair->cert_chain)) {
gpr_free(pair);
}
// Construct directly from the two strings.
explicit PemKeyCertPair(const char* private_key, const char* cert_chain)
: private_key_(grpc_core::UniquePtr<char>(gpr_strdup(private_key))),
cert_chain_(grpc_core::UniquePtr<char>(gpr_strdup(cert_chain))) {}
// Movable.
PemKeyCertPair(PemKeyCertPair&& other) {

Loading…
Cancel
Save