diff options
| author |  yang-g <yangg@google.com> | 2015-07-28 09:20:08 -0700 |
|---|---|---|
| committer | yang-g <yangg@google.com> | 2015-07-28 09:20:08 -0700 |
| commit | e8afb2338f4d8ebb5cdab093aac342a4378604ab (patch) | |
| tree | faafdf066ca220466cf98500a1656292fb24188b /src/node/ext/server_credentials.cc | |
| parent | 60b653bf35fad97f9b0187922ccea9cfb04f635d (diff) | |
| parent | 8e06c2e62e0be2606598dd1f2a6582b585364520 (diff) | |
Merge remote-tracking branch 'upstream/master' into jitter
Diffstat (limited to 'src/node/ext/server_credentials.cc')
| -rw-r--r-- | src/node/ext/server_credentials.cc | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/node/ext/server_credentials.cc b/src/node/ext/server_credentials.cc index d2b63cdc4e..c4a93a6465 100644 --- a/src/node/ext/server_credentials.cc +++ b/src/node/ext/server_credentials.cc @@ -73,8 +73,6 @@ void ServerCredentials::Init(Handle<Object> exports) { Handle<Function> ctr = tpl->GetFunction(); ctr->Set(NanNew("createSsl"), NanNew<FunctionTemplate>(CreateSsl)->GetFunction()); - ctr->Set(NanNew("createFake"), - NanNew<FunctionTemplate>(CreateFake)->GetFunction()); constructor = new NanCallback(ctr); exports->Set(NanNew("ServerCredentials"), ctr); } @@ -140,14 +138,10 @@ NAN_METHOD(ServerCredentials::CreateSsl) { return NanThrowTypeError("createSsl's third argument must be a Buffer"); } key_cert_pair.cert_chain = ::node::Buffer::Data(args[2]); + // TODO Add a force_client_auth parameter and pass it as the last parameter + // here. NanReturnValue(WrapStruct( - grpc_ssl_server_credentials_create(root_certs, &key_cert_pair, 1))); -} - -NAN_METHOD(ServerCredentials::CreateFake) { - NanScope(); - NanReturnValue( - WrapStruct(grpc_fake_transport_security_server_credentials_create())); + grpc_ssl_server_credentials_create(root_certs, &key_cert_pair, 1, 0))); } } // namespace node |