diff options
| author | joshaber <joshaber@gmail.com> | 2015-07-22 11:33:18 -0400 |
|---|---|---|
| committer | joshaber <joshaber@gmail.com> | 2015-07-22 11:33:18 -0400 |
| commit | 9830fbba05ef66325f929a09407abc45ab85847d (patch) | |
| tree | dac363428f4705a632719e03b8b77f2d32ce2bb3 /src/openssl_stream.c | |
| parent | cf198fdf2a044d2e2f0675c2c6b1cd9cdbcf4fcf (diff) | |
| parent | 42156d561723e92ffe597885719aa63abfe0795c (diff) | |
| download | libgit2-fix-init-ordering.tar.gz | |
Merge branch 'master' into fix-init-orderingfix-init-ordering
Diffstat (limited to 'src/openssl_stream.c')
| -rw-r--r-- | src/openssl_stream.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/openssl_stream.c b/src/openssl_stream.c index 958252e9f..8ff53d4b1 100644 --- a/src/openssl_stream.c +++ b/src/openssl_stream.c @@ -324,7 +324,9 @@ int openssl_connect(git_stream *stream) SSL_set_bio(st->ssl, bio, bio); /* specify the host in case SNI is needed */ +#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME SSL_set_tlsext_host_name(st->ssl, st->host); +#endif if ((ret = SSL_connect(st->ssl)) <= 0) return ssl_set_error(st->ssl, ret); @@ -358,11 +360,12 @@ int openssl_certificate(git_cert **out, git_stream *stream) return -1; } - st->cert_info.cert_type = GIT_CERT_X509; + st->cert_info.parent.cert_type = GIT_CERT_X509; st->cert_info.data = encoded_cert; st->cert_info.len = len; - *out = (git_cert *)&st->cert_info; + *out = &st->cert_info.parent; + return 0; } |