From c2fdfcf0cdc47827f0ae4be80e5e2b5c77e0a508 Mon Sep 17 00:00:00 2001 From: murgatroid99 Date: Wed, 19 Aug 2015 14:57:19 -0700 Subject: Modified server SSL certs to allow multiple pairs and force_client_auth flag --- src/node/interop/interop_server.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/node/interop/interop_server.js') diff --git a/src/node/interop/interop_server.js b/src/node/interop/interop_server.js index 1242a0f939..09d594d150 100644 --- a/src/node/interop/interop_server.js +++ b/src/node/interop/interop_server.js @@ -169,8 +169,8 @@ function getServer(port, tls) { var key_data = fs.readFileSync(key_path); var pem_data = fs.readFileSync(pem_path); server_creds = grpc.ServerCredentials.createSsl(null, - key_data, - pem_data); + {private_key: key_data, + cert_chain: pem_data}); } else { server_creds = grpc.ServerCredentials.createInsecure(); } -- cgit v1.2.3 From 6b3737d4a7db49a6dc043bed11d915b1bb485dab Mon Sep 17 00:00:00 2001 From: murgatroid99 Date: Wed, 19 Aug 2015 15:02:15 -0700 Subject: Fixed tests --- src/node/interop/interop_server.js | 4 ++-- src/node/test/server_test.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/node/interop/interop_server.js') diff --git a/src/node/interop/interop_server.js b/src/node/interop/interop_server.js index 09d594d150..99155e9958 100644 --- a/src/node/interop/interop_server.js +++ b/src/node/interop/interop_server.js @@ -169,8 +169,8 @@ function getServer(port, tls) { var key_data = fs.readFileSync(key_path); var pem_data = fs.readFileSync(pem_path); server_creds = grpc.ServerCredentials.createSsl(null, - {private_key: key_data, - cert_chain: pem_data}); + [{private_key: key_data, + cert_chain: pem_data}]); } else { server_creds = grpc.ServerCredentials.createInsecure(); } diff --git a/src/node/test/server_test.js b/src/node/test/server_test.js index 3d2f55041f..78bac8da29 100644 --- a/src/node/test/server_test.js +++ b/src/node/test/server_test.js @@ -71,8 +71,8 @@ describe('server', function() { var key_data = fs.readFileSync(key_path); var pem_data = fs.readFileSync(pem_path); var creds = grpc.ServerCredentials.createSsl(null, - {private_key: key_data, - cert_chain: pem_data}); + [{private_key: key_data, + cert_chain: pem_data}]); assert.doesNotThrow(function() { port = server.addHttp2Port('0.0.0.0:0', creds); }); -- cgit v1.2.3