9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ssld: send cipher/certfp before proxying any plaintext traffic

Browse source
This commit is contained in:
Simon Arlott 2016-04-24 10:39:16 +01:00
parent 3085734104
commit fbbc6aeb00
No known key found for this signature in database
GPG key ID: C8975F2043CA5D24
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ssld/ssld.c
View file

@ -706,10 +706,10 @@ ssl_process_accept_cb(rb_fde_t *F, int status, struct sockaddr *addr, rb_socklen
if(status == RB_OK) if(status == RB_OK)
{ {
conn_mod_read_cb(conn->mod_fd, conn);
conn_plain_read_cb(conn->plain_fd, conn);
ssl_send_cipher(conn); ssl_send_cipher(conn);
ssl_send_certfp(conn); ssl_send_certfp(conn);
conn_mod_read_cb(conn->mod_fd, conn);
conn_plain_read_cb(conn->plain_fd, conn);
return; return;
} }
/* ircd doesn't care about the reason for this */ /* ircd doesn't care about the reason for this */
@ -724,10 +724,10 @@ ssl_process_connect_cb(rb_fde_t *F, int status, void *data)
if(status == RB_OK) if(status == RB_OK)
{ {
conn_mod_read_cb(conn->mod_fd, conn);
conn_plain_read_cb(conn->plain_fd, conn);
ssl_send_cipher(conn); ssl_send_cipher(conn);
ssl_send_certfp(conn); ssl_send_certfp(conn);
conn_mod_read_cb(conn->mod_fd, conn);
conn_plain_read_cb(conn->plain_fd, conn);
} }
else if(status == RB_ERR_TIMEOUT) else if(status == RB_ERR_TIMEOUT)
close_conn(conn, WAIT_PLAIN, "SSL handshake timed out"); close_conn(conn, WAIT_PLAIN, "SSL handshake timed out");