diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-04-21 17:07:36 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-04-21 17:07:36 -0700 |
| commit | 7beea147e506b57a9656976001a1360e755a2e9b (patch) | |
| tree | 57d098e53d213dfe21e1bf40b7693ff2936901d4 /include/grpc++ | |
| parent | 788a25365d022d9797de444799c57842a6fa0603 (diff) | |
| parent | 5a56891eb6b1591e97d36072ac067d762aecf07e (diff) | |
Merge github.com:grpc/grpc into strong-includes
Diffstat (limited to 'include/grpc++')
| -rw-r--r-- | include/grpc++/security/server_credentials.h | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/include/grpc++/security/server_credentials.h b/include/grpc++/security/server_credentials.h index 5a9f8a42e2..229bab8d84 100644 --- a/include/grpc++/security/server_credentials.h +++ b/include/grpc++/security/server_credentials.h @@ -39,6 +39,7 @@ #include <grpc++/security/auth_metadata_processor.h> #include <grpc++/support/config.h> +#include <grpc/grpc_security_constants.h> struct grpc_server; @@ -69,7 +70,13 @@ class ServerCredentials { /// Options to create ServerCredentials with SSL struct SslServerCredentialsOptions { - SslServerCredentialsOptions() : force_client_auth(false) {} + // Deprecated + SslServerCredentialsOptions() + : force_client_auth(false), + client_certificate_request(GRPC_SSL_DONT_REQUEST_CLIENT_CERTIFICATE) {} + SslServerCredentialsOptions( + grpc_ssl_client_certificate_request_type request_type) + : force_client_auth(false), client_certificate_request(request_type) {} struct PemKeyCertPair { grpc::string private_key; @@ -77,7 +84,13 @@ struct SslServerCredentialsOptions { }; grpc::string pem_root_certs; std::vector<PemKeyCertPair> pem_key_cert_pairs; + // Deprecated bool force_client_auth; + + // If both force_client_auth and client_certificate_request fields are set, + // force_client_auth takes effect i.e + // REQUEST_AND_REQUIRE_CLIENT_CERTIFICATE_AND_VERIFY will be enforced. + grpc_ssl_client_certificate_request_type client_certificate_request; }; /// Builds SSL ServerCredentials given SSL specific options |