diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-09-10 11:46:52 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-09-10 11:46:52 -0700 |
| commit | be947697d7c5edb1f67c9df5ef024e3eaf98e9e6 (patch) | |
| tree | 774f0d333b48de97236fdb3e9382765a575a75ce /src/node/ext/server_credentials.cc | |
| parent | 3121fd4d757991e7ef95a7b6b370b83c23ba61b6 (diff) | |
| parent | 374cd9b0abbcd0dc3f1e65777e0dd37a9d5c447f (diff) | |
Merge github.com:grpc/grpc into immolating-conversion
Diffstat (limited to 'src/node/ext/server_credentials.cc')
| -rw-r--r-- | src/node/ext/server_credentials.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/node/ext/server_credentials.cc b/src/node/ext/server_credentials.cc index 6e17197e16..b1201eb664 100644 --- a/src/node/ext/server_credentials.cc +++ b/src/node/ext/server_credentials.cc @@ -178,11 +178,8 @@ NAN_METHOD(ServerCredentials::CreateSsl) { key_cert_pairs[i].cert_chain = ::node::Buffer::Data( pair_obj->Get(cert_key)); } - grpc_server_credentials *creds = - grpc_ssl_server_credentials_create(root_certs, - key_cert_pairs, - key_cert_pair_count, - force_client_auth); + grpc_server_credentials *creds = grpc_ssl_server_credentials_create( + root_certs, key_cert_pairs, key_cert_pair_count, force_client_auth, NULL); delete key_cert_pairs; if (creds == NULL) { NanReturnNull(); |