diff options
| author |  murgatroid99 <mlumish@google.com> | 2016-01-08 12:56:44 -0800 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2016-01-08 12:56:44 -0800 |
| commit | 9fa6a10743f07bbff4186ee7c802780d753dc4eb (patch) | |
| tree | 5d2656a2fadf735ee84d766f2133f792ed07f302 | |
| parent | 207b07165e6e6cec776aa32059df1d2f21a22203 (diff) | |
Finished merge
| -rw-r--r-- | src/core/security/security_connector.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/core/security/security_connector.c b/src/core/security/security_connector.c index c7b6aa16c4..61336a1057 100644 --- a/src/core/security/security_connector.c +++ b/src/core/security/security_connector.c @@ -499,16 +499,10 @@ static grpc_security_status ssl_check_peer(grpc_security_connector *sc, return GRPC_SECURITY_OK; } -<<<<<<< HEAD -static void ssl_channel_check_peer( - grpc_exec_ctx *exec_ctx, grpc_security_connector *sc, tsi_peer peer, - grpc_security_peer_check_cb cb, void *user_data) { -======= static void ssl_channel_check_peer(grpc_exec_ctx *exec_ctx, grpc_security_connector *sc, tsi_peer peer, grpc_security_peer_check_cb cb, void *user_data) { ->>>>>>> master grpc_ssl_channel_security_connector *c = (grpc_ssl_channel_security_connector *)sc; grpc_security_status status; @@ -522,16 +516,10 @@ static void ssl_channel_check_peer(grpc_exec_ctx *exec_ctx, tsi_peer_destruct(&peer); } -<<<<<<< HEAD -static void ssl_server_check_peer( - grpc_exec_ctx *exec_ctx, grpc_security_connector *sc, tsi_peer peer, - grpc_security_peer_check_cb cb, void *user_data) { -======= static void ssl_server_check_peer(grpc_exec_ctx *exec_ctx, grpc_security_connector *sc, tsi_peer peer, grpc_security_peer_check_cb cb, void *user_data) { ->>>>>>> master grpc_auth_context *auth_context = NULL; grpc_security_status status = ssl_check_peer(sc, NULL, &peer, &auth_context); tsi_peer_destruct(&peer); |