diff options
| author |  Alistair Veitch <aveitch@google.com> | 2016-01-12 17:38:33 -0800 |
|---|---|---|
| committer | Alistair Veitch <aveitch@google.com> | 2016-01-12 17:38:33 -0800 |
| commit | f190601e606fb89158f671bea1676e4083bc9bb4 (patch) | |
| tree | 10fa432bd7c2b794443beb882eb04c6b6b193b84 /src/core/httpcli/httpcli_security_connector.c | |
| parent | bb30d2591fc52c5bacc309c107077d92d5afc70a (diff) | |
| parent | 69ff3d3373e985ba7deba11bd854e95623af9b54 (diff) | |
Merge branch 'master' into tag_set
Diffstat (limited to 'src/core/httpcli/httpcli_security_connector.c')
| -rw-r--r-- | src/core/httpcli/httpcli_security_connector.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/httpcli/httpcli_security_connector.c b/src/core/httpcli/httpcli_security_connector.c index ba7cba25f9..41ad1de6c0 100644 --- a/src/core/httpcli/httpcli_security_connector.c +++ b/src/core/httpcli/httpcli_security_connector.c @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -84,8 +84,7 @@ static void httpcli_ssl_do_handshake(grpc_exec_ctx *exec_ctx, } static void httpcli_ssl_check_peer(grpc_exec_ctx *exec_ctx, - grpc_security_connector *sc, - tsi_peer peer, + grpc_security_connector *sc, tsi_peer peer, grpc_security_peer_check_cb cb, void *user_data) { grpc_httpcli_ssl_channel_security_connector *c = |