ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/ircd-hybrid/trunk/src/server.c

Comparing ircd-hybrid-8/src/s_serv.c (file contents):
Revision 1305 by michael, Fri Mar 23 12:43:55 2012 UTC vs.
Revision 1306 by michael, Sat Mar 24 07:43:04 2012 UTC

#	Line 1421 | Line 1421 | finish_ssl_server_handshake(struct Clien
1421		}
1422
1423		static void
1424	<	ssl_server_handshake(struct Client *client_p)
1424	>	ssl_server_handshake(fde_t *fd, struct Client *client_p)
1425		{
1426		int ret;
1427		int err;
#	Line 1450 | Line 1450 | ssl_server_handshake(struct Client *clie
1450		}
1451
1452		static void
1453	<	ssl_connect_init(struct Client *client_p, fde_t *fd)
1453	>	ssl_connect_init(struct Client *client_p, struct AccessItem *aconf, fde_t *fd)
1454		{
1455		if ((client_p->localClient->fd.ssl = SSL_new(ServerInfo.client_ctx)) == NULL)
1456		{
#	Line 1462 | Line 1462 | ssl_connect_init(struct Client *client_p
1462		}
1463
1464		SSL_set_fd(fd->ssl, fd->fd);
1465	<	ssl_server_handshake(client_p);
1465	>
1466	>	if (!EmptyString(aconf->cipher_list))
1467	>	SSL_set_cipher_list(client_p->localClient->fd.ssl, aconf->cipher_list);
1468	>
1469	>	ssl_server_handshake(NULL, client_p);
1470		}
1471		#endif
1472
#	Line 1536 | Line 1540 | serv_connect_callback(fde_t *fd, int sta
1540		#ifdef HAVE_LIBCRYPTO
1541		if (IsConfSSL(aconf))
1542		{
1543	<	ssl_connect_init(client_p, fd);
1543	>	ssl_connect_init(client_p, aconf, fd);
1544		return;
1545		}
1546		#endif

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)