Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

G

Grpc
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

412e6aca

Commit 412e6aca authored 8 years ago by Mark D. Roth

Downloads
- Plain Diff

Merge branch 'security_handshaker1' into security_handshaker2

parents 86a893d5 53bd6933

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/core/ext/client_channel/http_connect_handshaker.c 3 additions, 0 deletions

src/core/ext/client_channel/http_connect_handshaker.c
src/core/ext/transport/chttp2/client/chttp2_connector.c 40 additions, 24 deletions

src/core/ext/transport/chttp2/client/chttp2_connector.c
src/core/ext/transport/chttp2/client/chttp2_connector.h 8 additions, 4 deletions

src/core/ext/transport/chttp2/client/chttp2_connector.h
src/core/ext/transport/chttp2/client/insecure/channel_create.c 1 addition, 0 deletions

...ore/ext/transport/chttp2/client/insecure/channel_create.c
src/core/ext/transport/chttp2/client/secure/secure_channel_create.c 1 addition, 0 deletions

...xt/transport/chttp2/client/secure/secure_channel_create.c
src/core/lib/channel/handshaker.h 1 addition, 1 deletion

src/core/lib/channel/handshaker.h
src/core/lib/security/transport/security_handshaker.c 3 additions, 0 deletions

src/core/lib/security/transport/security_handshaker.c

with 57 additions and 29 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment