diff options
author | Jan Tattermusch <jtattermusch@google.com> | 2015-10-02 13:50:24 -0700 |
---|---|---|
committer | Jan Tattermusch <jtattermusch@google.com> | 2015-10-02 13:50:24 -0700 |
commit | 28bf559ee2c80486b837a9bd6bdff1713d07cb26 (patch) | |
tree | 430039fdd26879af82e76d6e3a1013a588e295d2 /src/core/tsi | |
parent | 91ad018c0026dc231e73ede1db17ef5e329d453c (diff) | |
parent | 1f8efa266d585dc5a4d450da3b27e758e71d3250 (diff) |
Merge remote-tracking branch 'upstream/master' into interop_improvements
Diffstat (limited to 'src/core/tsi')
-rw-r--r-- | src/core/tsi/fake_transport_security.c | 6 | ||||
-rw-r--r-- | src/core/tsi/ssl_transport_security.c | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/core/tsi/fake_transport_security.c b/src/core/tsi/fake_transport_security.c index 9ef4b163be..cbb6f17ae1 100644 --- a/src/core/tsi/fake_transport_security.c +++ b/src/core/tsi/fake_transport_security.c @@ -493,10 +493,8 @@ static void fake_handshaker_destroy(tsi_handshaker *self) { static const tsi_handshaker_vtable handshaker_vtable = { fake_handshaker_get_bytes_to_send_to_peer, - fake_handshaker_process_bytes_from_peer, - fake_handshaker_get_result, - fake_handshaker_extract_peer, - fake_handshaker_create_frame_protector, + fake_handshaker_process_bytes_from_peer, fake_handshaker_get_result, + fake_handshaker_extract_peer, fake_handshaker_create_frame_protector, fake_handshaker_destroy, }; diff --git a/src/core/tsi/ssl_transport_security.c b/src/core/tsi/ssl_transport_security.c index ad6b2d7684..05789f07d4 100644 --- a/src/core/tsi/ssl_transport_security.c +++ b/src/core/tsi/ssl_transport_security.c @@ -976,10 +976,8 @@ static void ssl_handshaker_destroy(tsi_handshaker *self) { static const tsi_handshaker_vtable handshaker_vtable = { ssl_handshaker_get_bytes_to_send_to_peer, - ssl_handshaker_process_bytes_from_peer, - ssl_handshaker_get_result, - ssl_handshaker_extract_peer, - ssl_handshaker_create_frame_protector, + ssl_handshaker_process_bytes_from_peer, ssl_handshaker_get_result, + ssl_handshaker_extract_peer, ssl_handshaker_create_frame_protector, ssl_handshaker_destroy, }; |