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

Do not shadow OpenSSL-internal symbol "ssl_ok".

Browse source 
This is a backport of commit bfc44622
This commit is contained in:
William Pitcock 2016-03-19 00:57:32 -05:00 committed by Aaron Jones
parent 82d827469c
commit bc2eeb0992
No known key found for this signature in database
GPG key ID: 6E854C0FAAD4CEA4
9 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/ircd.h
View file

@ -102,8 +102,8 @@ extern int testing_conf;
extern struct ev_entry *check_splitmode_ev;
extern int ssl_ok;
extern int zlib_ok;
extern int ircd_ssl_ok;
extern int ircd_zlib_ok;
extern int maxconnections;
void ircd_shutdown(const char *reason);

4
modules/m_connect.c
View file

@ -97,7 +97,7 @@ mo_connect(struct Client *client_p, struct Client *source_p, int parc, const cha
return 0;
}
if(ServerConfSSL(server_p) && (!ssl_ok || !get_ssld_count()))
if(ServerConfSSL(server_p) && (!ircd_ssl_ok || !get_ssld_count()))
{
sendto_one_notice(source_p,
":Connect: Server %s is set to use SSL/TLS but SSL/TLS is not configured.",
@ -192,7 +192,7 @@ ms_connect(struct Client *client_p, struct Client *source_p, int parc, const cha
return 0;
}
if(ServerConfSSL(server_p) && (!ssl_ok || !get_ssld_count()))
if(ServerConfSSL(server_p) && (!ircd_ssl_ok || !get_ssld_count()))
{
sendto_one_notice(source_p,
":Connect: Server %s is set to use SSL/TLS but SSL/TLS is not configured.",

2
modules/m_starttls.c
View file

@ -58,7 +58,7 @@ mr_starttls(struct Client *client_p, struct Client *source_p, int parc, const ch
return 1;
}
if (!ssl_ok || !get_ssld_count())
if (!ircd_ssl_ok || !get_ssld_count())
{
sendto_one_numeric(client_p, ERR_STARTTLS, form_str(ERR_STARTTLS), "TLS is not configured");
return 1;

8
src/ircd.c
View file

@ -106,8 +106,8 @@ int doremotd = 0;
int kline_queued = 0;
int server_state_foreground = 0;
int opers_see_all_users = 0;
int ssl_ok = 0;
int zlib_ok = 1;
int ircd_ssl_ok = 0;
int ircd_zlib_ok = 1;
int testing_conf = 0;
time_t startup_time;
@ -712,10 +712,10 @@ main(int argc, char *argv[])
if(!rb_setup_ssl_server(ServerInfo.ssl_cert, ServerInfo.ssl_private_key, ServerInfo.ssl_dh_params, ServerInfo.ssl_cipher_list))
{
ilog(L_MAIN, "WARNING: Unable to setup SSL.");
ssl_ok = 0;
ircd_ssl_ok = 0;
}
else
ssl_ok = 1;
ircd_ssl_ok = 1;
}
if (testing_conf)

2
src/listener.c
View file

@ -525,7 +525,7 @@ accept_precallback(rb_fde_t *F, struct sockaddr *addr, rb_socklen_t addrlen, voi
static time_t last_oper_notice = 0;
int len;
if(listener->ssl && (!ssl_ok || !get_ssld_count()))
if(listener->ssl && (!ircd_ssl_ok || !get_ssld_count()))
{
rb_close(F);
return 0;

4
src/s_conf.c
View file

@ -874,9 +874,9 @@ validate_conf(void)
if(!rb_setup_ssl_server(ServerInfo.ssl_cert, ServerInfo.ssl_private_key, ServerInfo.ssl_dh_params, ServerInfo.ssl_cipher_list))
{
ilog(L_MAIN, "WARNING: Unable to setup SSL.");
ssl_ok = 0;
ircd_ssl_ok = 0;
} else {
ssl_ok = 1;
ircd_ssl_ok = 1;
send_new_ssl_certs(ServerInfo.ssl_cert, ServerInfo.ssl_private_key, ServerInfo.ssl_dh_params, ServerInfo.ssl_cipher_list);
}

2
src/s_serv.c
View file

@ -255,7 +255,7 @@ try_connections(void *unused)
continue;
/* don't allow ssl connections if ssl isn't setup */
if(ServerConfSSL(tmp_p) && (!ssl_ok || !get_ssld_count()))
if(ServerConfSSL(tmp_p) && (!ircd_ssl_ok || !get_ssld_count()))
continue;
cltmp = tmp_p->class;

14
src/sslproc.c
View file

@ -303,7 +303,7 @@ start_ssldaemon(int count, const char *ssl_cert, const char *ssl_private_key, co
rb_close(F2);
rb_close(P1);
ctl = allocate_ssl_daemon(F1, P2, pid);
if(ssl_ok)
if(ircd_ssl_ok)
{
send_init_prng(ctl, RB_PRNG_DEFAULT, NULL);
send_certfp_method(ctl, ConfigFileEntry.certfp_method);
@ -446,7 +446,7 @@ ssl_process_cmd_recv(ssl_ctl_t * ctl)
switch (*ctl_buf->buf)
{
case 'N':
ssl_ok = 0; /* ssld says it can't do ssl/tls */
ircd_ssl_ok = 0; /* ssld says it can't do ssl/tls */
break;
case 'D':
ssl_process_dead_fd(ctl, ctl_buf);
@ -461,19 +461,19 @@ ssl_process_cmd_recv(ssl_ctl_t * ctl)
ssl_process_zipstats(ctl, ctl_buf);
break;
case 'I':
ssl_ok = 0;
ircd_ssl_ok = 0;
ilog(L_MAIN, "%s", cannot_setup_ssl);
sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s", cannot_setup_ssl);
break;
case 'U':
zlib_ok = 0;
ssl_ok = 0;
ircd_zlib_ok = 0;
ircd_ssl_ok = 0;
ilog(L_MAIN, "%s", no_ssl_or_zlib);
sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s", no_ssl_or_zlib);
ssl_killall();
break;
case 'z':
zlib_ok = 0;
ircd_zlib_ok = 0;
break;
default:
ilog(L_MAIN, "Received invalid command from ssld: %s", ctl_buf->buf);
@ -679,7 +679,7 @@ send_new_ssl_certs(const char *ssl_cert, const char *ssl_private_key, const char
rb_dlink_node *ptr;
if(ssl_cert == NULL)
{
ssl_ok = 0;
ircd_ssl_ok = 0;
return;
}
RB_DLINK_FOREACH(ptr, ssl_daemons.head)

8
ssld/ssld.c
View file

@ -156,9 +156,9 @@ static const char *remote_closed = "Remote host closed the connection";
static int ssld_ssl_ok;
static int certfp_method = RB_SSL_CERTFP_METH_SHA1;
#ifdef HAVE_LIBZ
static int zlib_ok = 1;
static int ssld_zlib_ok = 1;
#else
static int zlib_ok = 0;
static int ssld_zlib_ok = 0;
#endif
@ -1242,7 +1242,7 @@ main(int argc, char **argv)
rb_event_add("check_handshake_flood", check_handshake_flood, NULL, 10);
read_pipe_ctl(mod_ctl->F_pipe, NULL);
mod_read_ctl(mod_ctl->F, mod_ctl);
if(!zlib_ok && !ssld_ssl_ok)
if(!ssld_zlib_ok && !ssld_ssl_ok)
{
/* this is really useless... */
send_i_am_useless(mod_ctl);
@ -1251,7 +1251,7 @@ main(int argc, char **argv)
exit(1);
}
if(!zlib_ok)
if(!ssld_zlib_ok)
send_nozlib_support(mod_ctl, NULL);
if(!ssld_ssl_ok)
send_nossl_support(mod_ctl, NULL);