diff options
| author |  Mark D. Roth <roth@google.com> | 2018-06-19 10:00:16 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-06-19 10:00:16 -0700 |
| commit | 9e3e64604d9a3bb4bea9202ede844e6f7b592eeb (patch) | |
| tree | 94096871d2c5367e98bed42d2205a139fa99c711 /src/objective-c | |
| parent | ddef0f6aed8c2093a0b1ec68e9e3487e1d1d5faf (diff) | |
| parent | 68eff58df61bfde1b438d109c197f1a260230a68 (diff) | |
Merge pull request #15274 from JackOfMostTrades/verify-callback-core
Create verify_peer_options when creating ssl credentials to support a peer verification callback
Diffstat (limited to 'src/objective-c')
| -rw-r--r-- | src/objective-c/GRPCClient/private/GRPCHost.m | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/objective-c/GRPCClient/private/GRPCHost.m b/src/objective-c/GRPCClient/private/GRPCHost.m index f4b933751f..348989904a 100644 --- a/src/objective-c/GRPCClient/private/GRPCHost.m +++ b/src/objective-c/GRPCClient/private/GRPCHost.m @@ -183,14 +183,14 @@ static NSMutableDictionary *kHostCache; grpc_channel_credentials *creds; if (pemPrivateKey == nil && pemCertChain == nil) { - creds = grpc_ssl_credentials_create(rootsASCII.bytes, NULL, NULL); + creds = grpc_ssl_credentials_create(rootsASCII.bytes, NULL, NULL, NULL); } else { grpc_ssl_pem_key_cert_pair key_cert_pair; NSData *privateKeyASCII = [self nullTerminatedDataWithString:pemPrivateKey]; NSData *certChainASCII = [self nullTerminatedDataWithString:pemCertChain]; key_cert_pair.private_key = privateKeyASCII.bytes; key_cert_pair.cert_chain = certChainASCII.bytes; - creds = grpc_ssl_credentials_create(rootsASCII.bytes, &key_cert_pair, NULL); + creds = grpc_ssl_credentials_create(rootsASCII.bytes, &key_cert_pair, NULL, NULL); } @synchronized(self) { |