xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

webfs: send servername in tls client hello (SNI)

Browse source
This commit is contained in:
cinap_lenrek 2015-05-21 02:28:06 +02:00
parent 40360a992d
commit 890c459567
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sys/src/cmd/webfs/http.c
View file

@ -73,19 +73,22 @@ tlstrace(char *fmt, ...)
}
static int
tlswrap(int fd)
tlswrap(int fd, char *servername)
{
TLSconn conn;
memset(&conn, 0, sizeof(conn));
if(debug)
conn.trace = tlstrace;
if(servername != nil)
conn.serverName = smprint("%H", servername);
if((fd = tlsClient(fd, &conn)) < 0){
if(debug) fprint(2, "tlsClient: %r\n");
return -1;
}
free(conn.cert);
free(conn.sessionID);
free(conn.serverName);
return fd;
}
@ -123,10 +126,10 @@ hdial(Url *u)
if((fd = dial(addr, 0, 0, &ctl)) >= 0){
if(proxy){
if(strcmp(proxy->scheme, "https") == 0)
fd = tlswrap(fd);
fd = tlswrap(fd, proxy->host);
} else {
if(strcmp(u->scheme, "https") == 0)
fd = tlswrap(fd);
fd = tlswrap(fd, u->host);
}
}
if(fd < 0){
@ -905,7 +908,7 @@ http(char *m, Url *u, Key *shdr, Buq *qbody, Buq *qpost)
* then the proxy server has established the connection.
*/
if(h->tunnel && !retry && (i/100) == 2){
if((h->fd = tlswrap(h->fd)) < 0)
if((h->fd = tlswrap(h->fd, host)) < 0)
break;
/* proceed to the original request */