diff options
author | 2016-11-22 16:49:33 -0800 | |
---|---|---|
committer | 2016-11-22 23:12:49 -0800 | |
commit | 8e9fc9bd0ee120a9270ac4107e3de9845086d5d9 (patch) | |
tree | c15e6dff9e0a5dac277ffee50cd1fc96f2fccde6 /test/cpp/interop/server_helper.cc | |
parent | 01eda53c817fe766c6d63cb486f70284d9e3ee4d (diff) |
Test credentials provider update
Diffstat (limited to 'test/cpp/interop/server_helper.cc')
-rw-r--r-- | test/cpp/interop/server_helper.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/test/cpp/interop/server_helper.cc b/test/cpp/interop/server_helper.cc index 8b0b511bcb..af3171bf13 100644 --- a/test/cpp/interop/server_helper.cc +++ b/test/cpp/interop/server_helper.cc @@ -39,7 +39,7 @@ #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); @@ -48,14 +48,10 @@ 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); + return GetCredentialsProvider()->GetServerCredentials(kTlsCredentialsType); } else { - return InsecureServerCredentials(); + return GetCredentialsProvider()->GetServerCredentials( + kInsecureCredentialsType); } } |