Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Forgot to run clang_format after previous build changes.

Browse Source
pull/19778/head
Matthew Stevenson 6 years ago
parent 78e27bc141
commit 65c9ece139
2 changed files with 15 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      include/grpcpp/security/tls_credentials_options.h
  2. 2
      src/cpp/common/tls_credentials_options.cc

22
include/grpcpp/security/tls_credentials_options.h
Unescape View File

@ -27,9 +27,12 @@
#include <grpcpp/support/config.h> #include <grpcpp/support/config.h>
typedef struct grpc_tls_credential_reload_arg grpc_tls_credential_reload_arg; typedef struct grpc_tls_credential_reload_arg grpc_tls_credential_reload_arg;
typedef struct grpc_tls_credential_reload_config grpc_tls_credential_reload_config; typedef struct grpc_tls_credential_reload_config
typedef struct grpc_tls_server_authorization_check_arg grpc_tls_server_authorization_check_arg; grpc_tls_credential_reload_config;
typedef struct grpc_tls_server_authorization_check_config grpc_tls_server_authorization_check_config; typedef struct grpc_tls_server_authorization_check_arg
grpc_tls_server_authorization_check_arg;
typedef struct grpc_tls_server_authorization_check_config
grpc_tls_server_authorization_check_config;
typedef struct grpc_tls_credentials_options grpc_tls_credentials_options; typedef struct grpc_tls_credentials_options grpc_tls_credentials_options;
namespace grpc_impl { namespace grpc_impl {
@ -63,7 +66,7 @@ class TlsKeyMaterialsConfig {
grpc::string pem_root_certs_; grpc::string pem_root_certs_;
}; };
//typedef struct grpc_tls_credential_reload_arg grpc_tls_credential_reload_arg; // typedef struct grpc_tls_credential_reload_arg grpc_tls_credential_reload_arg;
/** TLS credential reload arguments, wraps grpc_tls_credential_reload_arg. It is /** TLS credential reload arguments, wraps grpc_tls_credential_reload_arg. It is
* used for experimental purposes for now and it is subject to change. * used for experimental purposes for now and it is subject to change.
@ -109,7 +112,8 @@ class TlsCredentialReloadArg {
grpc_tls_credential_reload_arg* c_arg_; grpc_tls_credential_reload_arg* c_arg_;
}; };
//typedef struct grpc_tls_credential_reload_config grpc_tls_credential_reload_config; // typedef struct grpc_tls_credential_reload_config
// grpc_tls_credential_reload_config;
/** TLS credential reloag config, wraps grpc_tls_credential_reload_config. It is /** TLS credential reloag config, wraps grpc_tls_credential_reload_config. It is
* used for experimental purposes for now and it is subject to change. * used for experimental purposes for now and it is subject to change.
@ -157,7 +161,8 @@ class TlsCredentialReloadConfig {
void (*destruct_)(void* config_user_data); void (*destruct_)(void* config_user_data);
}; };
//typedef struct grpc_tls_server_authorization_check_arg grpc_tls_server_authorization_check_arg; // typedef struct grpc_tls_server_authorization_check_arg
// grpc_tls_server_authorization_check_arg;
/** TLS server authorization check arguments, wraps /** TLS server authorization check arguments, wraps
* grpc_tls_server_authorization_check_arg. It is used for experimental * grpc_tls_server_authorization_check_arg. It is used for experimental
@ -206,7 +211,8 @@ class TlsServerAuthorizationCheckArg {
grpc_tls_server_authorization_check_arg* c_arg_; grpc_tls_server_authorization_check_arg* c_arg_;
}; };
//typedef struct ::grpc_tls_server_authorization_check_config grpc_tls_server_authorization_check_config; // typedef struct ::grpc_tls_server_authorization_check_config
// grpc_tls_server_authorization_check_config;
/** TLS server authorization check config, wraps /** TLS server authorization check config, wraps
* grps_tls_server_authorization_check_config. It is used for experimental * grps_tls_server_authorization_check_config. It is used for experimental
@ -260,7 +266,7 @@ class TlsServerAuthorizationCheckConfig {
void (*destruct_)(void* config_user_data); void (*destruct_)(void* config_user_data);
}; };
//typedef struct ::grpc_tls_credentials_options grpc_tls_credentials_options; // typedef struct ::grpc_tls_credentials_options grpc_tls_credentials_options;
/** TLS credentials options, wrapper for grpc_tls_credentials_options. It is /** TLS credentials options, wrapper for grpc_tls_credentials_options. It is
* used for experimental purposes for now and it is subject to change. See the * used for experimental purposes for now and it is subject to change. See the

2
src/cpp/common/tls_credentials_options.cc
Unescape View File

@ -16,8 +16,8 @@
* *
*/ */
#include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h"
#include <grpcpp/security/tls_credentials_options.h> #include <grpcpp/security/tls_credentials_options.h>
#include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h"
#include "src/cpp/common/tls_credentials_options_util.h" #include "src/cpp/common/tls_credentials_options_util.h"

Write Preview
Loading…
Cancel
Save