diff options
author | Michael Lumish <mlumish@google.com> | 2015-10-22 13:32:53 -0700 |
---|---|---|
committer | Michael Lumish <mlumish@google.com> | 2015-10-22 13:32:53 -0700 |
commit | c66b90168b161f262e399be095f3c539575b3bdf (patch) | |
tree | 2d258e141d700eb34dabd1325481ed54816eba6f /src | |
parent | def77a5235b389af3e76fe7fc8699d70f426f957 (diff) | |
parent | cc19b94ba23470bc21edd5afa619a36baaeb1102 (diff) |
Merge pull request #3921 from murgatroid99/node_interop_default_credentials
Make Node interop client use default roots file path
Diffstat (limited to 'src')
-rw-r--r-- | src/node/interop/interop_client.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/node/interop/interop_client.js b/src/node/interop/interop_client.js index b5061895cf..53ffa385bd 100644 --- a/src/node/interop/interop_client.js +++ b/src/node/interop/interop_client.js @@ -562,11 +562,11 @@ function runTest(address, host_override, test_case, tls, test_ca, done, extra) { var ca_path; if (test_ca) { ca_path = path.join(__dirname, '../test/data/ca.pem'); + var ca_data = fs.readFileSync(ca_path); + creds = grpc.credentials.createSsl(ca_data); } else { - ca_path = process.env.SSL_CERT_FILE; + creds = grpc.credentials.createSsl(); } - var ca_data = fs.readFileSync(ca_path); - creds = grpc.credentials.createSsl(ca_data); if (host_override) { options['grpc.ssl_target_name_override'] = host_override; options['grpc.default_authority'] = host_override; |