diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2015-03-03 09:30:55 -0800 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2015-03-09 16:05:05 -0700 |
| commit | b0829ebaf174216787c9a9557cf4a40afa2c8023 (patch) | |
| tree | f392cff9c5341a9e765aec6a161c8d4025a7dff5 /src/csharp/Grpc.IntegrationTesting/InteropClient.cs | |
| parent | 874e53ad2d61ae3846a4a9672eb871cc51bb0c84 (diff) | |
C# server side TLS support
Diffstat (limited to 'src/csharp/Grpc.IntegrationTesting/InteropClient.cs')
| -rw-r--r-- | src/csharp/Grpc.IntegrationTesting/InteropClient.cs | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/csharp/Grpc.IntegrationTesting/InteropClient.cs b/src/csharp/Grpc.IntegrationTesting/InteropClient.cs index 30301f165b..2992c42ae9 100644 --- a/src/csharp/Grpc.IntegrationTesting/InteropClient.cs +++ b/src/csharp/Grpc.IntegrationTesting/InteropClient.cs @@ -51,7 +51,7 @@ namespace Grpc.IntegrationTesting { public bool help; public string serverHost= "127.0.0.1"; - public string serverHostOverride = "foo.test.google.fr"; + public string serverHostOverride = TestCredentials.DefaultHostOverride; public int? serverPort; public string testCase = "large_unary"; public bool useTls; @@ -103,16 +103,7 @@ namespace Grpc.IntegrationTesting Credentials credentials = null; if (options.useTls) { - string caPath = "data/ca.pem"; // Default testing CA - if (!options.useTestCa) - { - caPath = Environment.GetEnvironmentVariable("SSL_CERT_FILE"); - if (string.IsNullOrEmpty(caPath)) - { - throw new ArgumentException("CA path environment variable is not set."); - } - } - credentials = new SslCredentials(File.ReadAllText(caPath)); + credentials = TestCredentials.CreateTestClientCredentials(options.useTestCa); } ChannelArgs channelArgs = null; |