grpc
/
grpc-node
mirror of https://github.com/grpc/grpc-node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update usage of modifed core credentials API

This commit is contained in:
murgatroid99 2018-06-20 12:43:09 -07:00
parent ad9b9dc8d7
commit 9fed412727
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/grpc-native-core/binding.gyp
View File

@ -65,6 +65,8 @@
'-Wno-unused-parameter',
'-DOSATOMIC_USE_INLINED=1',
'-Wno-deprecated-declarations',
'-Ithird_party/nanopb',
'-DPB_FIELD_32BIT',
'-fvisibility=hidden',
],
'ldflags': [
@ -191,6 +193,8 @@
'-Wno-unused-parameter',
'-DOSATOMIC_USE_INLINED=1',
'-Wno-deprecated-declarations',
'-Ithird_party/nanopb',
'-DPB_FIELD_32BIT',
'-fvisibility=hidden',
],
'OTHER_CPLUSPLUSFLAGS': [
@ -202,6 +206,8 @@
'-Wno-unused-parameter',
'-DOSATOMIC_USE_INLINED=1',
'-Wno-deprecated-declarations',
'-Ithird_party/nanopb',
'-DPB_FIELD_32BIT',
'-fvisibility=hidden',
'-stdlib=libc++',
'-std=c++11',
@ -623,6 +629,7 @@
'deps/grpc/src/core/lib/channel/channel_stack.cc',
'deps/grpc/src/core/lib/channel/channel_stack_builder.cc',
'deps/grpc/src/core/lib/channel/channel_trace.cc',
'deps/grpc/src/core/lib/channel/channelz.cc',
'deps/grpc/src/core/lib/channel/channelz_registry.cc',
'deps/grpc/src/core/lib/channel/connected_channel.cc',
'deps/grpc/src/core/lib/channel/handshaker.cc',
@ -904,6 +911,7 @@
'deps/grpc/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc',
'deps/grpc/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc',
'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc',
'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.cc',
'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc',
'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc',
'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc',
@ -911,7 +919,7 @@
'deps/grpc/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc',
'deps/grpc/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc',
'deps/grpc/src/core/ext/filters/load_reporting/server_load_reporting_plugin.cc',
'deps/grpc/src/core/ext/census/grpc_context.cc',
'deps/grpc/src/cpp/ext/filters/census/grpc_context.cc',
'deps/grpc/src/core/ext/filters/max_age/max_age_filter.cc',
'deps/grpc/src/core/ext/filters/message_size/message_size_filter.cc',
'deps/grpc/src/core/ext/filters/http/client_authority_filter.cc',

2
packages/grpc-native-core/deps/grpc

@ -1 +1 @@
Subproject commit 6a2aaf096fc8baf1f73d4d531518cdefd3374c76
Subproject commit 05628719f1c8d21969ddb700df05b4c63982b66a

2
packages/grpc-native-core/ext/channel_credentials.cc
View File

@ -150,7 +150,7 @@ NAN_METHOD(ChannelCredentials::CreateSsl) {
}
grpc_channel_credentials *creds = grpc_ssl_credentials_create(
root_certs.get(), private_key.isAssigned() ? &key_cert_pair : NULL,
NULL);
NULL, NULL);
if (creds == NULL) {
info.GetReturnValue().SetNull();
} else {

2
packages/grpc-native-core/package.json
View File

@ -1,6 +1,6 @@
{
"name": "grpc",
"version": "1.13.0-dev",
"version": "1.14.0-dev",
"author": "Google Inc.",
"description": "gRPC Library for Node",
"homepage": "https://grpc.io/",