aniani/icecast-server
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2024-09-22 04:15:54 -04:00
Code

Renamed config file SSL references to TLS.

Browse Source 
As we do not support any SSL version but TLS this renames
all TLS related config options. Docs still need to be updated.
Close still uses 'ssl' internally e.g. for variable names.
This should be changed on a later patch.
This commit is contained in:
Philipp Schafft 2015-03-27 11:08:50 +00:00
parent 99e11adac3
commit 5dac23adda
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conf/icecast.xml.in
View File

@ -82,7 +82,7 @@
<!-- <!--
<listen-socket> <listen-socket>
<port>8443</port> <port>8443</port>
<ssl>1</ssl> <tls>1</tls>
</listen-socket> </listen-socket>
--> -->
@ -221,7 +221,7 @@
<alias source="/" destination="/status.xsl"/> <alias source="/" destination="/status.xsl"/>
<!-- The certificate file needs to contain both public and private part. <!-- The certificate file needs to contain both public and private part.
Both should be PEM encoded. Both should be PEM encoded.
<ssl-certificate>@pkgdatadir@/icecast.pem</ssl-certificate> <tls-certificate>@pkgdatadir@/icecast.pem</tls-certificate>
--> -->
</paths> </paths>

9
src/cfgfile.c
View File

@ -1683,7 +1683,8 @@ static void _parse_listen_socket(xmlDocPtr doc,
} else { } else {
ICECAST_LOG_WARN("<port> setting must not be empty."); ICECAST_LOG_WARN("<port> setting must not be empty.");
} }
} else if (xmlStrcmp (node->name, XMLSTR("ssl")) == 0) { } else if (xmlStrcmp(node->name, XMLSTR("tls")) == 0 ||
xmlStrcmp(node->name, XMLSTR("ssl")) == 0) {
tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1); tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
listener->ssl = util_str_to_bool(tmp); listener->ssl = util_str_to_bool(tmp);
if(tmp) if(tmp)
@ -1899,11 +1900,13 @@ static void _parse_paths(xmlDocPtr doc,
if (configuration->allowfile) if (configuration->allowfile)
xmlFree(configuration->allowfile); xmlFree(configuration->allowfile);
configuration->allowfile = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1); configuration->allowfile = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
} else if (xmlStrcmp(node->name, XMLSTR("ssl-certificate")) == 0) { } else if (xmlStrcmp(node->name, XMLSTR("tls-certificate")) == 0 ||
xmlStrcmp(node->name, XMLSTR("ssl-certificate")) == 0) {
if (configuration->cert_file) if (configuration->cert_file)
xmlFree(configuration->cert_file); xmlFree(configuration->cert_file);
configuration->cert_file = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1); configuration->cert_file = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
} else if (xmlStrcmp(node->name, XMLSTR("ssl-allowed-ciphers")) == 0) { } else if (xmlStrcmp(node->name, XMLSTR("tls-allowed-ciphers")) == 0 ||
xmlStrcmp(node->name, XMLSTR("ssl-allowed-ciphers")) == 0) {
if (configuration->cipher_list) if (configuration->cipher_list)
xmlFree(configuration->cipher_list); xmlFree(configuration->cipher_list);
configuration->cipher_list = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1); configuration->cipher_list = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);