diff options
author | yang-g <yangg@google.com> | 2017-01-11 11:10:43 -0800 |
---|---|---|
committer | yang-g <yangg@google.com> | 2017-01-11 11:10:43 -0800 |
commit | cc5910228d84561d40cd8f0513faddc1e0100275 (patch) | |
tree | 930e2290e83bdaa04187ddc866982db354723801 /test/cpp/interop/server_helper.cc | |
parent | 3c42128a350f4e153cd3f098fa6b928addb99c58 (diff) |
manual revert of #8901
Diffstat (limited to 'test/cpp/interop/server_helper.cc')
-rw-r--r-- | test/cpp/interop/server_helper.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/test/cpp/interop/server_helper.cc b/test/cpp/interop/server_helper.cc index 8b0b511bcb..d395f50fa5 100644 --- a/test/cpp/interop/server_helper.cc +++ b/test/cpp/interop/server_helper.cc @@ -39,23 +39,23 @@ #include <grpc++/security/server_credentials.h> #include "src/core/lib/surface/call_test_only.h" -#include "test/core/end2end/data/ssl_test_data.h" +#include "test/cpp/util/test_credentials_provider.h" DECLARE_bool(use_tls); +DECLARE_string(custom_credentials_type); namespace grpc { namespace testing { std::shared_ptr<ServerCredentials> CreateInteropServerCredentials() { - if (FLAGS_use_tls) { - SslServerCredentialsOptions::PemKeyCertPair pkcp = {test_server1_key, - test_server1_cert}; - SslServerCredentialsOptions ssl_opts; - ssl_opts.pem_root_certs = ""; - ssl_opts.pem_key_cert_pairs.push_back(pkcp); - return SslServerCredentials(ssl_opts); + if (!FLAGS_custom_credentials_type.empty()) { + return GetCredentialsProvider()->GetServerCredentials( + FLAGS_custom_credentials_type); + } else if (FLAGS_use_tls) { + return GetCredentialsProvider()->GetServerCredentials(kTlsCredentialsType); } else { - return InsecureServerCredentials(); + return GetCredentialsProvider()->GetServerCredentials( + kInsecureCredentialsType); } } |